return (TRUE);
}
- static function load_step($sess)
+ static function load_step($tab_id, $sess)
{
$fp = FALSE;
do {
if (file_exists(BIN5_PROXY_PATH) == FALSE)
mkdir(BIN5_PROXY_PATH, 0775, TRUE);
- if (($fp = @fopen(BIN5_PROXY_PATH."/".$sess.".step", 'rb')) == FALSE)
+ if (($fp = @fopen(BIN5_PROXY_PATH."/table".$tab_id."/".$sess.".step", 'rb')) == FALSE)
break;
if (($s = fread($fp, 8)) == FALSE)
break;
break;
if (file_exists(BIN5_PROXY_PATH) == FALSE)
mkdir(BIN5_PROXY_PATH, 0775, TRUE);
- if (($fp = @fopen(BIN5_PROXY_PATH."/".$this->sess.".step", 'w')) == FALSE)
+ if (($fp = @fopen(BIN5_PROXY_PATH."/table".$this->table_orig."/".$this->sess.".step", 'w')) == FALSE)
break;
fwrite($fp, pack("LL",$this->step, $this->idx));
fclose($fp);
static function load_data($tab_id, $id, $sess)
{
- log_main("Bin5_user::load_data: tab_id [".$tab_id."] id [".$id."] sess [".($sess == FALSE ? "FALSE" : $sess)."] ");
+ log_load("Bin5_user::load_data: tab_id [".$tab_id."] id [".$id."] sess [".($sess == FALSE ? "FALSE" : $sess)."] ");
do {
if (($tok = @ftok(FTOK_PATH."/bin5/table".$tab_id."/user".$id, "B")) == -1) {
// This part isn't strictly required but is good to verify
// the coerence of cached and User class saved value of step field.
$old_step = $user->step;
- $arr = Bin5_user::load_step($sess);
+ $arr = Bin5_user::load_step($tab_id, $sess);
$user->step = $arr['s'];
if ($old_step != $user->step) {
log_crit("Bin5:: steps are diffetents User->step ".$user->step." Old_step: ".$old_step);
$this->table_idx = $table_idx;
$this->table_token = $table_token;
- Bin5::garbage_time_expire_set(0);
+ Bin5::garbage_time_expire_set($table_idx, 0);
log_wr("Bin5 constructor end");
}
$ismod = FALSE;
$curtime = time();
// externalized if ($force || $this->garbage_timeout < $curtime) {
- if ($force || Bin5::garbage_time_is_expired($curtime)) {
+ if ($force || Bin5::garbage_time_is_expired($this->table_idx, $curtime)) {
for ($i = 0 ; $i < BIN5_MAX_PLAYERS ; $i++) {
$user_cur = $this->user[$i];
if ($user_cur->sess == "" ||
log_rd2($user_cur->sess." GARBAGE UPDATED!");
// externalized $this->garbage_timeout = $curtime + GARBAGE_TIMEOUT;
- Bin5::garbage_time_expire_set($curtime + GARBAGE_TIMEOUT);
+ Bin5::garbage_time_expire_set($this->table_idx, $curtime + GARBAGE_TIMEOUT);
$ismod = TRUE;
}
return ($ret);
}
- function lock_data($table_idx)
+ static function lock_data($is_exclusive, $table_idx)
{
GLOBAL $sess;
return (FALSE);
}
// WARNING monitor this step
- if (($res = @sem_get($tok)) == FALSE) {
+ if (($res = @sem_get($tok, ($is_exclusive ? 1 : LOCK_SHARE_MAX) )) == FALSE) {
return (FALSE);
}
if (sem_acquire($res)) {
}
}
- function unlock_data($res_vect)
+ static function unlock_data($res_vect)
{
GLOBAL $sess;
}
- static function garbage_time_is_expired($tm)
+ static function garbage_time_is_expired($tab_id, $tm)
{
$ret = TRUE;
$fp = FALSE;
do {
if (file_exists(BIN5_PROXY_PATH) == FALSE)
mkdir(BIN5_PROXY_PATH, 0775, TRUE);
- if (($fp = @fopen(BIN5_PROXY_PATH."/garbage_time.expired", 'rb')) == FALSE)
+ if (($fp = @fopen(BIN5_PROXY_PATH."/table".$tab_id."/garbage_time.expired", 'rb')) == FALSE)
break;
if (($s = fread($fp, 4)) == FALSE)
break;
return ($ret);
}
- static function garbage_time_expire_set($tm)
+ static function garbage_time_expire_set($tab_id, $tm)
{
do {
if (file_exists(BIN5_PROXY_PATH) == FALSE)
mkdir(BIN5_PROXY_PATH, 0775, TRUE);
- if (($fp = @fopen(BIN5_PROXY_PATH."/garbage_time.expired", 'wb')) == FALSE)
+ if (($fp = @fopen(BIN5_PROXY_PATH."/table".$tab_id."/garbage_time.expired", 'wb')) == FALSE)
break;
fwrite($fp, pack("L",$tm));
fclose($fp);