Commit 063efb1996a57d0c1e965624f7e8bc597d010122

Con Kolivas 2011-09-02T10:37:00

Rename localgen occasions to getwork fail occasions since localgen is unrelated now.

diff --git a/README b/README
index 3b616c7..060b72c 100644
--- a/README
+++ b/README
@@ -205,19 +205,19 @@ The number of requested work items
 The number of accepted shares
 The number of rejected shares
 The number of hardware erorrs
-The efficiency defined as the accepted shares / requested work
+The efficiency defined as the accepted shares / requested work and can be >100
 The utility defines as the number of shares / minute
 
 The cgminer status line shows:
- TQ: 1  ST: 1  SS: 0  DW: 0  NB: 1  LW: 8  LO: 1  RF: 1  I: 2
+ TQ: 1  ST: 1  SS: 0  DW: 0  NB: 1  LW: 8  GF: 1  RF: 1  I: 2
 
 TQ is Total Queued work items.
 ST is STaged work items (ready to use).
 SS is Stale Shares discarded (detected and not submitted so don't count as rejects)
 DW is Discarded Work items (work from block no longer valid to work on)
 NB is New Blocks detected on the network
-LW is Locally generated Work items (during slow server providing work)
-LO is Local generation Occasions (server slow to provide work)
+LW is Locally generated Work items
+GF is Getwork Fail Occasions (server slow to provide work)
 RF is Remote Fail occasions (server slow to accept work)
 I is current Intensity (changes in dynamic mode).
 
diff --git a/main.c b/main.c
index 98edf71..7967e99 100644
--- a/main.c
+++ b/main.c
@@ -262,7 +262,7 @@ enum block_change {
 
 static enum block_change block_changed = BLOCK_FIRST;
 static unsigned int local_work;
-static unsigned int total_lo, total_ro;
+static unsigned int total_go, total_ro;
 
 #define MAX_POOLS (32)
 
@@ -1510,9 +1510,9 @@ static void curses_print_status(int thr_id)
 	wprintw(statuswin, " %s", statusline);
 	wclrtoeol(statuswin);
 	wmove(statuswin, 3,0);
-	wprintw(statuswin, " TQ: %d  ST: %d  SS: %d  DW: %d  NB: %d  LW: %d  LO: %d  RF: %d  I: %d",
+	wprintw(statuswin, " TQ: %d  ST: %d  SS: %d  DW: %d  NB: %d  LW: %d  GF: %d  RF: %d  I: %d",
 		total_queued, requests_staged(), total_stale, total_discarded, new_blocks,
-		local_work, total_lo, total_ro, scan_intensity);
+		local_work, total_go, total_ro, scan_intensity);
 	wclrtoeol(statuswin);
 	wmove(statuswin, 4, 0);
 	if (pool_strategy == POOL_LOADBALANCE && total_pools > 1)
@@ -2415,7 +2415,7 @@ static void display_pool_summary(struct pool *pool)
 
 		wlog(" Discarded work due to new blocks: %d\n", pool->discarded_work);
 		wlog(" Stale submissions discarded due to new blocks: %d\n", pool->stale_shares);
-		wlog(" Unable to get work from server occasions: %d\n", pool->localgen_occasions);
+		wlog(" Unable to get work from server occasions: %d\n", pool->getfail_occasions);
 		wlog(" Submitting work remotely delay occasions: %d\n\n", pool->remotefail_occasions);
 		wrefresh(logwin);
 		unlock_curses();
@@ -3261,8 +3261,8 @@ retry:
 		    !pool_tset(pool, &pool->lagging)) {
 			applog(LOG_WARNING, "Pool %d not providing work fast enough",
 				pool->pool_no);
-			pool->localgen_occasions++;
-			total_lo++;
+			pool->getfail_occasions++;
+			total_go++;
 		}
 	}
 
@@ -4401,7 +4401,7 @@ static void print_summary(void)
 
 	applog(LOG_WARNING, "Discarded work due to new blocks: %d", total_discarded);
 	applog(LOG_WARNING, "Stale submissions discarded due to new blocks: %d", total_stale);
-	applog(LOG_WARNING, "Unable to get work from server occasions: %d", total_lo);
+	applog(LOG_WARNING, "Unable to get work from server occasions: %d", total_go);
 	applog(LOG_WARNING, "Work items generated locally: %d", local_work);
 	applog(LOG_WARNING, "Submitting work remotely delay occasions: %d", total_ro);
 	applog(LOG_WARNING, "New blocks detected on network: %d\n", new_blocks);
@@ -4422,7 +4422,7 @@ static void print_summary(void)
 
 			applog(LOG_WARNING, " Discarded work due to new blocks: %d", pool->discarded_work);
 			applog(LOG_WARNING, " Stale submissions discarded due to new blocks: %d", pool->stale_shares);
-			applog(LOG_WARNING, " Unable to get work from server occasions: %d", pool->localgen_occasions);
+			applog(LOG_WARNING, " Unable to get work from server occasions: %d", pool->getfail_occasions);
 			applog(LOG_WARNING, " Submitting work remotely delay occasions: %d\n", pool->remotefail_occasions);
 		}
 	}
diff --git a/miner.h b/miner.h
index 3a6267f..3d8ab95 100644
--- a/miner.h
+++ b/miner.h
@@ -368,7 +368,7 @@ struct pool {
 	unsigned int getwork_requested;
 	unsigned int stale_shares;
 	unsigned int discarded_work;
-	unsigned int localgen_occasions;
+	unsigned int getfail_occasions;
 	unsigned int remotefail_occasions;
 	struct timeval tv_idle;