GOSTSec/sgminer
1
0
Fork 0
mirror of https://github.com/GOSTSec/sgminer synced 2025-09-09 12:42:05 +00:00
Code Issues Releases Wiki Activity

Keep the local block number in the blocks structs stored and sort them by number to guarantee we delete the oldest when ageing the block struct entries.

Browse Source
This commit is contained in:
Con Kolivas 2012-08-28 20:16:50 +10:00
parent d91af893c8
commit f97bf2e2ac
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
cgminer.c
View File

@ -218,6 +218,7 @@ struct timeval block_timeval;
struct block { struct block {
char hash[37]; char hash[37];
UT_hash_handle hh; UT_hash_handle hh;
int block_no;
}; };
static struct block *blocks = NULL; static struct block *blocks = NULL;
@ -2811,6 +2812,11 @@ static inline bool from_existing_block(struct work *work)
return ret; return ret;
} }
static int block_sort(struct block *blocka, struct block *blockb)
{
return blockb->block_no - blocka->block_no;
}
static void test_work_current(struct work *work) static void test_work_current(struct work *work)
{ {
char *hexstr; char *hexstr;
@ -2832,6 +2838,7 @@ static void test_work_current(struct work *work)
if (unlikely(!s)) if (unlikely(!s))
quit (1, "test_work_current OOM"); quit (1, "test_work_current OOM");
strcpy(s->hash, hexstr); strcpy(s->hash, hexstr);
s->block_no = new_blocks++;
wr_lock(&blk_lock); wr_lock(&blk_lock);
/* Only keep the last 6 blocks in memory since work from blocks /* Only keep the last 6 blocks in memory since work from blocks
* before this is virtually impossible and we want to prevent * before this is virtually impossible and we want to prevent
@ -2840,6 +2847,7 @@ static void test_work_current(struct work *work)
struct block *blocka, *blockb; struct block *blocka, *blockb;
int count = 0; int count = 0;
HASH_SORT(blocks, block_sort);
HASH_ITER(hh, blocks, blocka, blockb) { HASH_ITER(hh, blocks, blocka, blockb) {
if (count++ < 6) if (count++ < 6)
continue; continue;
@ -2850,7 +2858,7 @@ static void test_work_current(struct work *work)
HASH_ADD_STR(blocks, hash, s); HASH_ADD_STR(blocks, hash, s);
wr_unlock(&blk_lock); wr_unlock(&blk_lock);
set_curblock(hexstr, work->data); set_curblock(hexstr, work->data);
if (unlikely(++new_blocks == 1)) if (unlikely(new_blocks == 1))
goto out_free; goto out_free;
work_block++; work_block++;