Merge branch 'master' of bitbucket.org:ckolivas/ckpool
This commit is contained in:
Con Kolivas
commit
7e00e19a72
@ -18,6 +18,41 @@ function adddbg($str)
|
||||
}
|
||||
}
|
||||
#
|
||||
function howlongago($sec)
|
||||
{
|
||||
if ($sec < 60)
|
||||
$des = $sec.'s';
|
||||
else
|
||||
{
|
||||
$sec = round($sec/60);
|
||||
if ($sec < 60)
|
||||
$des = $sec.'min';
|
||||
else
|
||||
{
|
||||
$sec = round($sec/60);
|
||||
if ($sec < 24)
|
||||
{
|
||||
$des = $sec.'hr';
|
||||
if ($sec != 1)
|
||||
$des .= 's';
|
||||
}
|
||||
else
|
||||
{
|
||||
$sec = round($sec/24);
|
||||
if ($sec < 9999)
|
||||
{
|
||||
$des = $sec.'day';
|
||||
if ($sec != 1)
|
||||
$des .= 's';
|
||||
}
|
||||
else
|
||||
$des = 'never';
|
||||
}
|
||||
}
|
||||
}
|
||||
return $des;
|
||||
}
|
||||
#
|
||||
function btcfmt($amt)
|
||||
{
|
||||
$amt /= 100000000;
|
||||
@ -240,7 +275,7 @@ function validUserPass($user, $pass)
|
||||
{
|
||||
$rep = checkPass($user, $pass);
|
||||
if ($rep != null)
|
||||
$ans = repDecode($rep);
|
||||
$ans = repDecode($rep);
|
||||
usleep(100000); // Max 10x per second
|
||||
if ($rep != null && $ans['STATUS'] == 'ok')
|
||||
{
|
||||
|
||||
@ -306,10 +306,10 @@ function pgtop($dotop, $user, $douser)
|
||||
$top .= "<td class=topdat> $nlb</td></tr></table>";
|
||||
$top .= '</td><td>';
|
||||
$top .= '<table cellpadding=1 cellspacing=0 border=0 width=100%>';
|
||||
$top .= '<tr><td class=topdes>Users:</td>';
|
||||
$top .= '<td class=topdat>'.$info['users'].'</td></tr>';
|
||||
$top .= '<tr><td class=topdes>Workers:</td>';
|
||||
$top .= '<td class=topdat>'.$info['workers'].'</td></tr></table>';
|
||||
$top .= '<tr><td class=topdes>Users: </td>';
|
||||
$top .= '<td class=topdat> '.$info['users'].'</td></tr>';
|
||||
$top .= '<tr><td class=topdes>Workers: </td>';
|
||||
$top .= '<td class=topdat> '.$info['workers'].'</td></tr></table>';
|
||||
$top .= '</td><td>';
|
||||
|
||||
if ($douser === true)
|
||||
@ -361,6 +361,9 @@ function pgmenu($menus)
|
||||
$side = '';
|
||||
foreach ($menus as $menu => $submenus)
|
||||
{
|
||||
if ($menu == 'Admin' && $submenus == null)
|
||||
continue;
|
||||
|
||||
if ($menu == 'gap')
|
||||
{
|
||||
$side = 'r';
|
||||
|
||||
@ -42,37 +42,7 @@ function workuser($data, $user, &$offset, &$totshare, &$totdiff,
|
||||
$ld = ' ';
|
||||
$pg .= "<td class=dr>$ld</td>";
|
||||
|
||||
if ($lst < 60)
|
||||
$lstdes = $lst.'s';
|
||||
else
|
||||
{
|
||||
$lst = round($lst/60);
|
||||
if ($lst < 60)
|
||||
$lstdes = $lst.'min';
|
||||
else
|
||||
{
|
||||
$lst = round($lst/60);
|
||||
if ($lst < 24)
|
||||
{
|
||||
$lstdes = $lst.'hr';
|
||||
if ($lst != 1)
|
||||
$lstdes .= 's';
|
||||
}
|
||||
else
|
||||
{
|
||||
$lst = round($lst/24);
|
||||
if ($lst < 9999)
|
||||
{
|
||||
$lstdes = $lst.'day';
|
||||
if ($lst != 1)
|
||||
$lstdes .= 's';
|
||||
}
|
||||
else
|
||||
$lstdes = 'never';
|
||||
}
|
||||
}
|
||||
}
|
||||
$pg .= "<td class=dr>$lstdes</td>";
|
||||
$pg .= '<td class=dr>'.howlongago($lst).'</td>';
|
||||
|
||||
$shareacc = number_format($ans['w_shareacc:'.$i], 0);
|
||||
$totshare += $ans['w_shareacc:'.$i];
|
||||
|
||||
@ -14,11 +14,6 @@ function process($p, $user, $menu)
|
||||
$menu['Admin']['PPLNS'] = 'pplns';
|
||||
$menu['Admin']['AllWork'] = 'allwork';
|
||||
}
|
||||
else
|
||||
{
|
||||
if (isset($menu['Admin']))
|
||||
unset($menu['Admin']);
|
||||
}
|
||||
$page = '';
|
||||
$n = '';
|
||||
foreach ($menu as $item => $options)
|
||||
|
||||
129
src/ckdb.c
129
src/ckdb.c
@ -49,7 +49,7 @@
|
||||
|
||||
#define DB_VLOCK "1"
|
||||
#define DB_VERSION "0.9.2"
|
||||
#define CKDB_VERSION DB_VERSION"-0.320"
|
||||
#define CKDB_VERSION DB_VERSION"-0.325"
|
||||
|
||||
#define WHERE_FFL " - from %s %s() line %d"
|
||||
#define WHERE_FFL_HERE __FILE__, __func__, __LINE__
|
||||
@ -233,6 +233,9 @@ typedef struct loadstatus {
|
||||
} LOADSTATUS;
|
||||
static LOADSTATUS dbstatus;
|
||||
|
||||
// So cmd_getopts works on a new empty pool
|
||||
#define START_POOL_HEIGHT 2
|
||||
|
||||
// Share stats since last block
|
||||
typedef struct poolstatus {
|
||||
int64_t workinfoid; // Last block
|
||||
@ -243,7 +246,7 @@ typedef struct poolstatus {
|
||||
double shareinv; // Non-acc
|
||||
double best_sdiff; // TODO (maybe)
|
||||
} POOLSTATUS;
|
||||
static POOLSTATUS pool;
|
||||
static POOLSTATUS pool = { 0, START_POOL_HEIGHT, 0, 0, 0, 0, 0 };
|
||||
/* TODO: when we know about orphans, the count reset to zero
|
||||
* will need to be undone - i.e. recalculate this data from
|
||||
* the memory tables - maybe ... */
|
||||
@ -1156,7 +1159,12 @@ typedef struct optioncontrol {
|
||||
#define DATA_OPTIONCONTROL_NULL(_var, _item) DATA_GENERIC(_var, _item, optioncontrol, false)
|
||||
|
||||
// Value it must default to (to work properly)
|
||||
#define OPTIONCONTROL_HEIGHT 1
|
||||
#define OPTIONCONTROL_HEIGHT 1
|
||||
|
||||
// Test it here rather than obscuring the #define elsewhere
|
||||
#if ((OPTIONCONTROL_HEIGHT+1) != START_POOL_HEIGHT)
|
||||
#error "START_POOL_HEIGHT must = (OPTIONCONTROL_HEIGHT+1)"
|
||||
#endif
|
||||
|
||||
static K_TREE *optioncontrol_root;
|
||||
static K_LIST *optioncontrol_free;
|
||||
@ -1557,8 +1565,16 @@ typedef struct workerstatus {
|
||||
// Below gets reset on each block
|
||||
double diffacc;
|
||||
double diffinv; // Non-acc
|
||||
double diffsta;
|
||||
double diffdup;
|
||||
double diffhi;
|
||||
double diffrej;
|
||||
double shareacc;
|
||||
double shareinv; // Non-acc
|
||||
double sharesta;
|
||||
double sharedup;
|
||||
double sharehi;
|
||||
double sharerej;
|
||||
} WORKERSTATUS;
|
||||
|
||||
#define ALLOC_WORKERSTATUS 1000
|
||||
@ -2453,7 +2469,11 @@ static void zero_on_new_block()
|
||||
while (ws_item) {
|
||||
DATA_WORKERSTATUS(workerstatus, ws_item);
|
||||
workerstatus->diffacc = workerstatus->diffinv =
|
||||
workerstatus->shareacc = workerstatus->shareinv = 0.0;
|
||||
workerstatus->diffsta = workerstatus->diffdup =
|
||||
workerstatus->diffhi = workerstatus->diffrej =
|
||||
workerstatus->shareacc = workerstatus->shareinv =
|
||||
workerstatus->sharesta = workerstatus->sharedup =
|
||||
workerstatus->sharehi = workerstatus->sharerej = 0.0;
|
||||
ws_item = next_in_ktree(ctx);
|
||||
}
|
||||
K_WUNLOCK(workerstatus_free);
|
||||
@ -2522,9 +2542,17 @@ static void set_block_share_counters()
|
||||
workerstatus->diffacc += sharesummary->diffacc;
|
||||
workerstatus->diffinv += sharesummary->diffsta + sharesummary->diffdup +
|
||||
sharesummary->diffhi + sharesummary->diffrej;
|
||||
workerstatus->diffsta += sharesummary->diffsta;
|
||||
workerstatus->diffdup += sharesummary->diffdup;
|
||||
workerstatus->diffhi += sharesummary->diffhi;
|
||||
workerstatus->diffrej += sharesummary->diffrej;
|
||||
workerstatus->shareacc += sharesummary->shareacc;
|
||||
workerstatus->shareinv += sharesummary->sharesta + sharesummary->sharedup +
|
||||
sharesummary->sharehi + sharesummary->sharerej;
|
||||
workerstatus->sharesta += sharesummary->sharesta;
|
||||
workerstatus->sharedup += sharesummary->sharedup;
|
||||
workerstatus->sharehi += sharesummary->sharehi;
|
||||
workerstatus->sharerej += sharesummary->sharerej;
|
||||
|
||||
ss_item = prev_in_ktree(ctx);
|
||||
}
|
||||
@ -2628,12 +2656,35 @@ static void _workerstatus_update(AUTHS *auths, SHARES *shares,
|
||||
copy_tv(&(row->last_share), &(shares->createdate));
|
||||
row->last_diff = shares->diff;
|
||||
}
|
||||
if (shares->errn == SE_NONE) {
|
||||
row->diffacc += shares->diff;
|
||||
row->shareacc++;
|
||||
} else {
|
||||
row->diffinv += shares->diff;
|
||||
row->shareinv++;
|
||||
switch (shares->errn) {
|
||||
case SE_NONE:
|
||||
row->diffacc += shares->diff;
|
||||
row->shareacc++;
|
||||
break;
|
||||
case SE_STALE:
|
||||
row->diffinv += shares->diff;
|
||||
row->shareinv++;
|
||||
row->diffsta += shares->diff;
|
||||
row->sharesta++;
|
||||
break;
|
||||
case SE_DUPE:
|
||||
row->diffinv += shares->diff;
|
||||
row->shareinv++;
|
||||
row->diffdup += shares->diff;
|
||||
row->sharedup++;
|
||||
break;
|
||||
case SE_HIGH_DIFF:
|
||||
row->diffinv += shares->diff;
|
||||
row->shareinv++;
|
||||
row->diffhi += shares->diff;
|
||||
row->sharehi++;
|
||||
break;
|
||||
default:
|
||||
row->diffinv += shares->diff;
|
||||
row->shareinv++;
|
||||
row->diffrej += shares->diff;
|
||||
row->sharerej++;
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -9715,13 +9766,21 @@ static char *cmd_workers(__maybe_unused PGconn *conn, char *cmd, char *id,
|
||||
int64_t w_elapsed;
|
||||
tv_t w_lastshare;
|
||||
double w_lastdiff, w_diffacc, w_diffinv;
|
||||
double w_diffsta, w_diffdup;
|
||||
double w_diffhi, w_diffrej;
|
||||
double w_shareacc, w_shareinv;
|
||||
double w_sharesta, w_sharedup;
|
||||
double w_sharehi, w_sharerej;
|
||||
|
||||
w_hashrate5m = w_hashrate1hr = 0.0;
|
||||
w_elapsed = -1;
|
||||
w_lastshare.tv_sec = 0;
|
||||
w_lastdiff = w_diffacc = w_diffinv =
|
||||
w_shareacc = w_shareinv = 0;
|
||||
w_diffsta = w_diffdup =
|
||||
w_diffhi = w_diffrej =
|
||||
w_shareacc = w_shareinv =
|
||||
w_sharesta = w_sharedup =
|
||||
w_sharehi = w_sharerej = 0;
|
||||
|
||||
ws_item = find_workerstatus(users->userid, workers->workername,
|
||||
__FILE__, __func__, __LINE__);
|
||||
@ -9731,8 +9790,16 @@ static char *cmd_workers(__maybe_unused PGconn *conn, char *cmd, char *id,
|
||||
w_lastdiff = workerstatus->last_diff;
|
||||
w_diffacc = workerstatus->diffacc;
|
||||
w_diffinv = workerstatus->diffinv;
|
||||
w_diffsta = workerstatus->diffsta;
|
||||
w_diffdup = workerstatus->diffdup;
|
||||
w_diffhi = workerstatus->diffhi;
|
||||
w_diffrej = workerstatus->diffrej;
|
||||
w_shareacc = workerstatus->shareacc;
|
||||
w_shareinv = workerstatus->shareinv;
|
||||
w_sharesta = workerstatus->sharesta;
|
||||
w_sharedup = workerstatus->sharedup;
|
||||
w_sharehi = workerstatus->sharehi;
|
||||
w_sharerej = workerstatus->sharerej;
|
||||
}
|
||||
|
||||
// find last stored userid record
|
||||
@ -9796,6 +9863,22 @@ static char *cmd_workers(__maybe_unused PGconn *conn, char *cmd, char *id,
|
||||
snprintf(tmp, sizeof(tmp), "w_diffinv:%d=%s%c", rows, reply, FLDSEP);
|
||||
APPEND_REALLOC(buf, off, len, tmp);
|
||||
|
||||
double_to_buf(w_diffsta, reply, sizeof(reply));
|
||||
snprintf(tmp, sizeof(tmp), "w_diffsta:%d=%s%c", rows, reply, FLDSEP);
|
||||
APPEND_REALLOC(buf, off, len, tmp);
|
||||
|
||||
double_to_buf(w_diffdup, reply, sizeof(reply));
|
||||
snprintf(tmp, sizeof(tmp), "w_diffdup:%d=%s%c", rows, reply, FLDSEP);
|
||||
APPEND_REALLOC(buf, off, len, tmp);
|
||||
|
||||
double_to_buf(w_diffhi, reply, sizeof(reply));
|
||||
snprintf(tmp, sizeof(tmp), "w_diffhi:%d=%s%c", rows, reply, FLDSEP);
|
||||
APPEND_REALLOC(buf, off, len, tmp);
|
||||
|
||||
double_to_buf(w_diffrej, reply, sizeof(reply));
|
||||
snprintf(tmp, sizeof(tmp), "w_diffrej:%d=%s%c", rows, reply, FLDSEP);
|
||||
APPEND_REALLOC(buf, off, len, tmp);
|
||||
|
||||
double_to_buf(w_shareacc, reply, sizeof(reply));
|
||||
snprintf(tmp, sizeof(tmp), "w_shareacc:%d=%s%c", rows, reply, FLDSEP);
|
||||
APPEND_REALLOC(buf, off, len, tmp);
|
||||
@ -9804,6 +9887,22 @@ static char *cmd_workers(__maybe_unused PGconn *conn, char *cmd, char *id,
|
||||
snprintf(tmp, sizeof(tmp), "w_shareinv:%d=%s%c", rows, reply, FLDSEP);
|
||||
APPEND_REALLOC(buf, off, len, tmp);
|
||||
|
||||
double_to_buf(w_sharesta, reply, sizeof(reply));
|
||||
snprintf(tmp, sizeof(tmp), "w_sharesta:%d=%s%c", rows, reply, FLDSEP);
|
||||
APPEND_REALLOC(buf, off, len, tmp);
|
||||
|
||||
double_to_buf(w_sharedup, reply, sizeof(reply));
|
||||
snprintf(tmp, sizeof(tmp), "w_sharedup:%d=%s%c", rows, reply, FLDSEP);
|
||||
APPEND_REALLOC(buf, off, len, tmp);
|
||||
|
||||
double_to_buf(w_sharehi, reply, sizeof(reply));
|
||||
snprintf(tmp, sizeof(tmp), "w_sharehi:%d=%s%c", rows, reply, FLDSEP);
|
||||
APPEND_REALLOC(buf, off, len, tmp);
|
||||
|
||||
double_to_buf(w_sharerej, reply, sizeof(reply));
|
||||
snprintf(tmp, sizeof(tmp), "w_sharerej:%d=%s%c", rows, reply, FLDSEP);
|
||||
APPEND_REALLOC(buf, off, len, tmp);
|
||||
|
||||
userstats_workername_root = free_ktree(userstats_workername_root, NULL);
|
||||
K_RUNLOCK(userstats_free);
|
||||
}
|
||||
@ -9819,7 +9918,10 @@ static char *cmd_workers(__maybe_unused PGconn *conn, char *cmd, char *id,
|
||||
"workername,difficultydefault,idlenotificationenabled,"
|
||||
"idlenotificationtime",
|
||||
stats ? ",w_hashrate5m,w_hashrate1hr,w_elapsed,w_lastshare,"
|
||||
"w_lastdiff,w_diffacc,w_diffinv,w_shareacc,w_shareinv" : "",
|
||||
"w_lastdiff,w_diffacc,w_diffinv,"
|
||||
"w_diffsta,w_diffdup,w_diffhi,w_diffrej,"
|
||||
"w_shareacc,w_shareinv,"
|
||||
"w_sharesta,w_sharedup,w_sharehi,w_sharerej" : "",
|
||||
FLDSEP);
|
||||
APPEND_REALLOC(buf, off, len, tmp);
|
||||
|
||||
@ -11853,15 +11955,18 @@ static char *cmd_stats(__maybe_unused PGconn *conn, char *cmd, char *id,
|
||||
rows++;
|
||||
|
||||
USEINFO(users, 1, 2);
|
||||
USEINFO(useratts, 1, 1);
|
||||
USEINFO(workers, 1, 1);
|
||||
USEINFO(paymentaddresses, 1, 1);
|
||||
USEINFO(payments, 1, 1);
|
||||
USEINFO(idcontrol, 1, 0);
|
||||
USEINFO(optioncontrol, 1, 1);
|
||||
USEINFO(workinfo, 1, 1);
|
||||
USEINFO(shares, 1, 1);
|
||||
USEINFO(shareerrors, 1, 1);
|
||||
USEINFO(sharesummary, 1, 2);
|
||||
USEINFO(blocks, 1, 1);
|
||||
USEINFO(miningpayouts, 1, 1);
|
||||
USEINFO(auths, 1, 1);
|
||||
USEINFO(poolstats, 1, 1);
|
||||
USEINFO(userstats, 4, 2);
|
||||
|
||||
@ -353,6 +353,12 @@ bool extract_sockaddr(char *url, char **sockaddr_url, char **sockaddr_port)
|
||||
} else
|
||||
url_len = strlen(url_begin);
|
||||
|
||||
/* Get rid of the [] */
|
||||
if (ipv6_begin && ipv6_end && ipv6_end > ipv6_begin){
|
||||
url_len -= 2;
|
||||
url_begin++;
|
||||
}
|
||||
|
||||
if (url_len < 1) {
|
||||
LOGWARNING("Null length URL passed to extract_sockaddr");
|
||||
return false;
|
||||
|
||||
Loading…
Reference in New Issue
Block a user