Commit 0909facfaf9f32c23b1e7675a560e98b2adca0fa
2011-07-22T15:00:57
Clean up the messy way the staging thread communicates with the longpoll thread to determine who found the block first.
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122
diff --git a/main.c b/main.c
index 8374068..0c65bb3 100644
--- a/main.c
+++ b/main.c
@@ -198,6 +198,15 @@ static int total_accepted, total_rejected;
static int total_getworks, total_stale, total_discarded;
static int total_queued, total_staged, lp_staged;
static unsigned int new_blocks;
+
+enum block_change {
+ BLOCK_NONE,
+ BLOCK_LP,
+ BLOCK_DETECT,
+ BLOCK_FIRST,
+};
+
+static enum block_change block_changed = BLOCK_FIRST;
static unsigned int local_work;
static unsigned int total_lo, total_ro;
@@ -213,8 +222,6 @@ static int total_urls, total_users, total_passes, total_userpasses;
static bool curses_active = false;
static char current_block[37];
-static char longpoll_block[37];
-static char blank[37];
static char datestamp[40];
static char blockdate[40];
@@ -1112,9 +1119,6 @@ static bool stale_work(struct work *work)
if (work->pool != current_pool())
return ret;
- if (!strncmp(blank, current_block, 36))
- return ret;
-
hexstr = bin2hex(work->data, 36);
if (unlikely(!hexstr)) {
applog(LOG_ERR, "submit_work_thread OOM");
@@ -1336,8 +1340,9 @@ static void test_work_current(struct work *work)
}
/* current_block is blanked out on successful longpoll */
- if (likely(strncmp(current_block, blank, 36))) {
- if (unlikely(strncmp(hexstr, current_block, 36))) {
+ if (unlikely(strncmp(hexstr, current_block, 36))) {
+ if (block_changed != BLOCK_LP && block_changed != BLOCK_FIRST) {
+ block_changed = BLOCK_DETECT;
new_blocks++;
if (have_longpoll)
applog(LOG_WARNING, "New block detected on network before longpoll, waiting on fresh work");
@@ -1346,12 +1351,11 @@ static void test_work_current(struct work *work)
/* As we can't flush the work from here, signal the
* wakeup thread to restart all the threads */
work_restart[watchdog_thr_id].restart = 1;
- set_curblock(hexstr);
- }
- } else {
+ } else
+ block_changed = BLOCK_NONE;
set_curblock(hexstr);
- memcpy(longpoll_block, hexstr, 36);
}
+
free(hexstr);
}
@@ -2448,6 +2452,9 @@ static void restart_threads(void)
{
int i;
+ if (block_changed == BLOCK_DETECT)
+ block_changed = BLOCK_NONE;
+
/* Discard old queued requests and get new ones */
flush_requests();
@@ -2537,14 +2544,15 @@ next_path:
if (likely(val)) {
/* Keep track of who ordered a restart_threads to make
* sure it's only done once per new block */
- if (likely(!strncmp(longpoll_block, blank, 36) ||
- !strncmp(longpoll_block, current_block, 36))) {
- new_blocks++;
- applog(LOG_WARNING, "LONGPOLL detected new block on network, waiting on fresh work");
- memcpy(current_block, blank, 36);
- restart_threads();
- } else
+ if (block_changed != BLOCK_DETECT) {
+ block_changed = BLOCK_LP;
+ new_blocks++;
+ applog(LOG_WARNING, "LONGPOLL detected new block on network, waiting on fresh work");
+ restart_threads();
+ } else {
applog(LOG_WARNING, "LONGPOLL received after new block already detected");
+ block_changed = BLOCK_NONE;
+ }
convert_to_work(val);
failures = 0;
@@ -2567,7 +2575,7 @@ next_path:
goto out;
}
}
- memcpy(longpoll_block, current_block, 36);
+
if (pool != current_pool()) {
applog(LOG_WARNING, "Attempting to change longpoll servers");
pool = current_pool();
@@ -2969,11 +2977,8 @@ int main (int argc, char *argv[])
tm.tm_min,
tm.tm_sec);
- for (i = 0; i < 36; i++) {
- strcat(blank, "0");
+ for (i = 0; i < 36; i++)
strcat(current_block, "0");
- strcat(longpoll_block, "0");
- }
#ifdef WIN32
opt_n_threads = num_processors = 1;