projects
/
brisk.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
load_data return allways, all exit() calls removed, all load_data calls are protected
[brisk.git]
/
web
/
Obj
/
auth.phh
diff --git
a/web/Obj/auth.phh
b/web/Obj/auth.phh
index
963755a
..
8e74ffd
100644
(file)
--- a/
web/Obj/auth.phh
+++ b/
web/Obj/auth.phh
@@
-47,6
+47,8
@@
class Challenge {
}
class Challenges {
}
class Challenges {
+ static $delta_t;
+
var $item;
var $item_n;
var $mod;
var $item;
var $item_n;
var $mod;
@@
-163,11
+165,9
@@
class Challenges {
function load_data()
{
GLOBAL $sess;
function load_data()
{
GLOBAL $sess;
- $doexit = FALSE;
do {
if (($tok = @ftok(FTOK_PATH."/challenges", "B")) == -1) {
log_main("ftok failed");
do {
if (($tok = @ftok(FTOK_PATH."/challenges", "B")) == -1) {
log_main("ftok failed");
- $doexit = TRUE;
break;
}
break;
}
@@
-202,9
+202,6
@@
class Challenges {
return ($chals);
} while (0);
return ($chals);
} while (0);
- if ($doexit)
- exit();
-
return (FALSE);
}
return (FALSE);
}
@@
-255,7
+252,8
@@
class Challenges {
return (FALSE);
}
if (sem_acquire($res)) {
return (FALSE);
}
if (sem_acquire($res)) {
- log_lock("LOCK challenges");
+ self::$delta_t = microtime(TRUE);
+ log_lock("LOCK challenges [".self::$delta_t."]");
return ($res);
}
else
return ($res);
}
else
@@
-266,7
+264,7
@@
class Challenges {
{
GLOBAL $sess;
{
GLOBAL $sess;
- log_lock("UNLOCK challenges");
+ log_lock("UNLOCK challenges
[".(microtime(TRUE) - (self::$delta_t))."]
");
return (sem_release($res));
}
return (sem_release($res));
}