markow
/
ckpool
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

ckdb - remove the lock warning when using exclusive access to the transfer tree

master
kanoi 9 years ago
parent
2b03be2af7
commit
b5cdf0974e
2 changed files with 3 additions and 3 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      src/ckdb.h
  2. 4
      src/ckdb_cmd.c

2
src/ckdb.h
Unescape View File

@ -55,7 +55,7 @@
#define DB_VLOCK "1" #define DB_VLOCK "1"
#define DB_VERSION "1.0.4" #define DB_VERSION "1.0.4"
#define CKDB_VERSION DB_VERSION"-1.601" #define CKDB_VERSION DB_VERSION"-1.602"
#define WHERE_FFL " - from %s %s() line %d" #define WHERE_FFL " - from %s %s() line %d"
#define WHERE_FFL_HERE __FILE__, __func__, __LINE__ #define WHERE_FFL_HERE __FILE__, __func__, __LINE__

4
src/ckdb_cmd.c
Unescape View File

@ -3595,7 +3595,7 @@ static char *cmd_setatts(PGconn *conn, char *cmd, char *id,
goto bats; goto bats;
} else { } else {
DATA_USERS(users, u_item); DATA_USERS(users, u_item);
t_item = first_in_ktree(trf_root, ctx); t_item = first_in_ktree_nolock(trf_root, ctx);
while (t_item) { while (t_item) {
DATA_TRANSFER(transfer, t_item); DATA_TRANSFER(transfer, t_item);
if (strncmp(transfer->name, "ua_", 3) == 0) { if (strncmp(transfer->name, "ua_", 3) == 0) {
@ -3907,7 +3907,7 @@ static char *cmd_setopts(PGconn *conn, char *cmd, char *id,
LOGDEBUG("%s(): cmd '%s'", __func__, cmd); LOGDEBUG("%s(): cmd '%s'", __func__, cmd);
t_item = first_in_ktree(trf_root, ctx); t_item = first_in_ktree_nolock(trf_root, ctx);
while (t_item) { while (t_item) {
DATA_TRANSFER(transfer, t_item); DATA_TRANSFER(transfer, t_item);
if (strncmp(transfer->name, "oc_", 3) == 0) { if (strncmp(transfer->name, "oc_", 3) == 0) {

Write Preview
Loading…
Cancel
Save