projects
/
brisk.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
all mkdir now recursive and with explicit permissions
[brisk.git]
/
web
/
briskin5
/
Obj
/
briskin5.phh
diff --git
a/web/briskin5/Obj/briskin5.phh
b/web/briskin5/Obj/briskin5.phh
index
718fabd
..
78d5766
100644
(file)
--- a/
web/briskin5/Obj/briskin5.phh
+++ b/
web/briskin5/Obj/briskin5.phh
@@
-528,7
+528,7
@@
class Bin5_user extends User {
break;
if (file_exists(BIN5_PROXY_PATH) == FALSE)
break;
if (file_exists(BIN5_PROXY_PATH) == FALSE)
- mkdir(BIN5_PROXY_PATH);
+ mkdir(BIN5_PROXY_PATH
, 0775, TRUE
);
if (($fp = @fopen(BIN5_PROXY_PATH."/".$sess.".step", 'rb')) == FALSE)
break;
if (($s = fread($fp, 8)) == FALSE)
if (($fp = @fopen(BIN5_PROXY_PATH."/".$sess.".step", 'rb')) == FALSE)
break;
if (($s = fread($fp, 8)) == FALSE)
@@
-679,6
+679,8
@@
class Bin5_user extends User {
class Bin5 {
class Bin5 {
+ static $delta_t = array();
+
var $user;
var $table;
var $comm; // commands for many people
var $user;
var $table;
var $comm; // commands for many people
@@
-945,7
+947,7
@@
class Bin5 {
{
GLOBAL $sess;
{
GLOBAL $sess;
- log_
lock("LOCK_
DATA ".FTOK_PATH."/bin5/table".$table_idx."/table");
+ log_
main("lockinfo:
DATA ".FTOK_PATH."/bin5/table".$table_idx."/table");
// echo "LOCK: ".FTOK_PATH."/main";
// exit;
// WARNING monitor this step
// echo "LOCK: ".FTOK_PATH."/main";
// exit;
// WARNING monitor this step
@@
-957,20
+959,25
@@
class Bin5 {
return (FALSE);
}
if (sem_acquire($res)) {
return (FALSE);
}
if (sem_acquire($res)) {
- log_lock("LOCK table ".$table_idx."[res: ".$res."]");
- return ($res);
+ self::$delta_t[$table_idx] = microtime(TRUE);
+ log_lock("LOCK table [".$table_idx."] [".self::$delta_t[$table_idx]."]");
+
+ return (new Vect(array('res' => $res, 'tab' => $table_idx)));
}
else {
}
else {
- log_lock("LOCK table ".$table_idx.":FAILED");
- return (FALSE);
+
log_lock("LOCK table ".$table_idx.":FAILED");
+
return (FALSE);
}
}
}
}
- function unlock_data($res)
+ function unlock_data($res
_vect
)
{
GLOBAL $sess;
{
GLOBAL $sess;
-
- log_lock("UNLOCK table [res: ".$res."]");
+
+ $res = $res_vect->getbyid('res');
+ $tab = $res_vect->getbyid('tab');
+
+ log_lock("UNLOCK table [".$tab."] [".(microtime(TRUE) - (self::$delta_t[$tab]))."]");
return (sem_release($res));
}
return (sem_release($res));
}
@@
-1153,7
+1160,7
@@
class Bin5 {
$fp = FALSE;
do {
if (file_exists(BIN5_PROXY_PATH) == FALSE)
$fp = FALSE;
do {
if (file_exists(BIN5_PROXY_PATH) == FALSE)
- mkdir(BIN5_PROXY_PATH);
+ mkdir(BIN5_PROXY_PATH
, 0775, TRUE
);
if (($fp = @fopen(BIN5_PROXY_PATH."/garbage_time.expired", 'rb')) == FALSE)
break;
if (($s = fread($fp, 4)) == FALSE)
if (($fp = @fopen(BIN5_PROXY_PATH."/garbage_time.expired", 'rb')) == FALSE)
break;
if (($s = fread($fp, 4)) == FALSE)
@@
-1177,7
+1184,7
@@
class Bin5 {
{
do {
if (file_exists(BIN5_PROXY_PATH) == FALSE)
{
do {
if (file_exists(BIN5_PROXY_PATH) == FALSE)
- mkdir(BIN5_PROXY_PATH);
+ mkdir(BIN5_PROXY_PATH
, 0775, TRUE
);
if (($fp = @fopen(BIN5_PROXY_PATH."/garbage_time.expired", 'wb')) == FALSE)
break;
fwrite($fp, pack("L",$tm));
if (($fp = @fopen(BIN5_PROXY_PATH."/garbage_time.expired", 'wb')) == FALSE)
break;
fwrite($fp, pack("L",$tm));