GOSTSec/sgminer
1
0
Fork 0
mirror of https://github.com/GOSTSec/sgminer synced 2025-01-22 20:44:19 +00:00
Code Issues Releases Wiki Activity

Only display as many device rows as the maximum live existed at any time.

Browse Source
This commit is contained in:
Con Kolivas 2013-06-15 01:28:00 +10:00
parent 326116f6ed
commit cd9ff7f6b8
3 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
cgminer.c
View File

@ -115,6 +115,8 @@ static int opt_devs_enabled;
static bool opt_display_devs; static bool opt_display_devs;
static bool opt_removedisabled; static bool opt_removedisabled;
int total_devices; int total_devices;
int zombie_devs;
static int most_devices;
struct cgpu_info **devices; struct cgpu_info **devices;
bool have_opencl; bool have_opencl;
int mining_threads; int mining_threads;
@ -2219,7 +2221,7 @@ static void switch_logsize(void)
logstart = devcursor + 1; logstart = devcursor + 1;
logcursor = logstart + 1; logcursor = logstart + 1;
} else { } else {
logstart = devcursor + total_devices + 1; logstart = devcursor + most_devices + 1;
logcursor = logstart + 1; logcursor = logstart + 1;
} }
unlock_curses(); unlock_curses();
@ -7134,6 +7136,12 @@ struct _cgpu_devid_counter {
UT_hash_handle hh; UT_hash_handle hh;
}; };
static void adjust_mostdevs(void)
{
if (total_devices - zombie_devs > most_devices)
most_devices = total_devices - zombie_devs;
}
bool add_cgpu(struct cgpu_info *cgpu) bool add_cgpu(struct cgpu_info *cgpu)
{ {
static struct _cgpu_devid_counter *devids = NULL; static struct _cgpu_devid_counter *devids = NULL;
@ -7161,6 +7169,8 @@ bool add_cgpu(struct cgpu_info *cgpu)
devices[total_devices + new_devices++] = cgpu; devices[total_devices + new_devices++] = cgpu;
else else
devices[total_devices++] = cgpu; devices[total_devices++] = cgpu;
adjust_mostdevs();
return true; return true;
} }
@ -7245,6 +7255,7 @@ static void hotplug_process()
applog(LOG_WARNING, "Hotplug: %s added %s %i", cgpu->drv->dname, cgpu->drv->name, cgpu->device_id); applog(LOG_WARNING, "Hotplug: %s added %s %i", cgpu->drv->dname, cgpu->drv->name, cgpu->device_id);
} }
adjust_mostdevs();
switch_logsize(); switch_logsize();
} }

1
miner.h
View File

@ -970,6 +970,7 @@ extern bool opt_scrypt;
extern double total_secs; extern double total_secs;
extern int mining_threads; extern int mining_threads;
extern int total_devices; extern int total_devices;
extern int zombie_devs;
extern struct cgpu_info **devices; extern struct cgpu_info **devices;
extern int total_pools; extern int total_pools;
extern struct pool **pools; extern struct pool **pools;

1
usbutils.c
View File

@ -1363,6 +1363,7 @@ static void release_cgpu(struct cgpu_info *cgpu)
if (cgpu->usbinfo.nodev) if (cgpu->usbinfo.nodev)
return; return;
zombie_devs++;
total_count--; total_count--;
drv_count[cgpu->drv->drv_id].count--; drv_count[cgpu->drv->drv_id].count--;