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

ckdb - fix for pplns when payout is only in workmarkers

master
kanoi 10 years ago
parent
93b8bf0071
commit
58be2ed29f
2 changed files with 14 additions and 11 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. 23
      src/ckdb_cmd.c

2
src/ckdb.h
Unescape View File

@ -52,7 +52,7 @@
#define DB_VLOCK "1" #define DB_VLOCK "1"
#define DB_VERSION "0.9.6" #define DB_VERSION "0.9.6"
#define CKDB_VERSION DB_VERSION"-0.664" #define CKDB_VERSION DB_VERSION"-0.665"
#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__

23
src/ckdb_cmd.c
Unescape View File

@ -2969,7 +2969,7 @@ static char *cmd_pplns(__maybe_unused PGconn *conn, char *cmd, char *id,
K_STORE *mu_store; K_STORE *mu_store;
USERS *users; USERS *users;
int32_t height; int32_t height;
int64_t workinfoid, end_workinfoid = 0; int64_t block_workinfoid, end_workinfoid;
int64_t begin_workinfoid; int64_t begin_workinfoid;
int64_t total_share_count, acc_share_count; int64_t total_share_count, acc_share_count;
int64_t ss_count, wm_count, ms_count; int64_t ss_count, wm_count, ms_count;
@ -3054,10 +3054,10 @@ static char *cmd_pplns(__maybe_unused PGconn *conn, char *cmd, char *id,
block_extra = EMPTY; block_extra = EMPTY;
break; break;
} }
workinfoid = blocks->workinfoid; block_workinfoid = blocks->workinfoid;
w_item = find_workinfo(workinfoid); w_item = find_workinfo(block_workinfoid);
if (!w_item) { if (!w_item) {
snprintf(reply, siz, "ERR.missing workinfo %"PRId64, workinfoid); snprintf(reply, siz, "ERR.missing workinfo %"PRId64, block_workinfoid);
return strdup(reply); return strdup(reply);
} }
DATA_WORKINFO(workinfo, w_item); DATA_WORKINFO(workinfo, w_item);
@ -3072,7 +3072,7 @@ static char *cmd_pplns(__maybe_unused PGconn *conn, char *cmd, char *id,
return strdup(reply); return strdup(reply);
} }
begin_workinfoid = 0; begin_workinfoid = end_workinfoid = 0;
total_share_count = acc_share_count = 0; total_share_count = acc_share_count = 0;
total_diff = 0; total_diff = 0;
ss_count = wm_count = ms_count = 0; ss_count = wm_count = ms_count = 0;
@ -3080,7 +3080,7 @@ static char *cmd_pplns(__maybe_unused PGconn *conn, char *cmd, char *id,
mu_store = k_new_store(miningpayouts_free); mu_store = k_new_store(miningpayouts_free);
mu_root = new_ktree(); mu_root = new_ktree();
looksharesummary.workinfoid = workinfoid; looksharesummary.workinfoid = block_workinfoid;
looksharesummary.userid = MAXID; looksharesummary.userid = MAXID;
looksharesummary.workername = EMPTY; looksharesummary.workername = EMPTY;
INIT_SHARESUMMARY(&ss_look); INIT_SHARESUMMARY(&ss_look);
@ -3150,7 +3150,10 @@ static char *cmd_pplns(__maybe_unused PGconn *conn, char *cmd, char *id,
if (total_diff < diff_want) { if (total_diff < diff_want) {
lookworkmarkers.expirydate.tv_sec = default_expiry.tv_sec; lookworkmarkers.expirydate.tv_sec = default_expiry.tv_sec;
lookworkmarkers.expirydate.tv_usec = default_expiry.tv_usec; lookworkmarkers.expirydate.tv_usec = default_expiry.tv_usec;
lookworkmarkers.workinfoidend = begin_workinfoid; if (begin_workinfoid != 0)
lookworkmarkers.workinfoidend = begin_workinfoid;
else
lookworkmarkers.workinfoidend = block_workinfoid + 1;
INIT_WORKMARKERS(&wm_look); INIT_WORKMARKERS(&wm_look);
wm_look.data = (void *)(&lookworkmarkers); wm_look.data = (void *)(&lookworkmarkers);
wm_item = find_before_in_ktree(workmarkers_workinfoid_root, &wm_look, wm_item = find_before_in_ktree(workmarkers_workinfoid_root, &wm_look,
@ -3196,13 +3199,13 @@ static char *cmd_pplns(__maybe_unused PGconn *conn, char *cmd, char *id,
if (total_diff == 0.0) { if (total_diff == 0.0) {
snprintf(reply, siz, snprintf(reply, siz,
"ERR.total share diff 0 before workinfo %"PRId64, "ERR.total share diff 0 before workinfo %"PRId64,
workinfoid); block_workinfoid);
goto shazbot; goto shazbot;
} }
wb_item = find_workinfo(begin_workinfoid); wb_item = find_workinfo(begin_workinfoid);
if (!wb_item) { if (!wb_item) {
snprintf(reply, siz, "ERR.missing begin workinfo record! %"PRId64, workinfoid); snprintf(reply, siz, "ERR.missing begin workinfo record! %"PRId64, block_workinfoid);
goto shazbot; goto shazbot;
} }
DATA_WORKINFO(workinfo, wb_item); DATA_WORKINFO(workinfo, wb_item);
@ -3238,7 +3241,7 @@ static char *cmd_pplns(__maybe_unused PGconn *conn, char *cmd, char *id,
APPEND_REALLOC(buf, off, len, tmp); APPEND_REALLOC(buf, off, len, tmp);
snprintf(tmp, sizeof(tmp), "begin_workinfoid=%"PRId64"%c", begin_workinfoid, FLDSEP); snprintf(tmp, sizeof(tmp), "begin_workinfoid=%"PRId64"%c", begin_workinfoid, FLDSEP);
APPEND_REALLOC(buf, off, len, tmp); APPEND_REALLOC(buf, off, len, tmp);
snprintf(tmp, sizeof(tmp), "block_workinfoid=%"PRId64"%c", workinfoid, FLDSEP); snprintf(tmp, sizeof(tmp), "block_workinfoid=%"PRId64"%c", block_workinfoid, FLDSEP);
APPEND_REALLOC(buf, off, len, tmp); APPEND_REALLOC(buf, off, len, tmp);
snprintf(tmp, sizeof(tmp), "end_workinfoid=%"PRId64"%c", end_workinfoid, FLDSEP); snprintf(tmp, sizeof(tmp), "end_workinfoid=%"PRId64"%c", end_workinfoid, FLDSEP);
APPEND_REALLOC(buf, off, len, tmp); APPEND_REALLOC(buf, off, len, tmp);

Write Preview
Loading…
Cancel
Save