GOSTSec/ccminer
1
0
Fork 0
mirror of https://github.com/GOSTSec/ccminer synced 2025-01-22 04:24:29 +00:00
Code Issues Releases Wiki Activity

stats: simplify the storage filter

Browse Source 
the gpu id key filter was useless, use thread ids...
This commit is contained in:
Tanguy Pruvot 2015-05-12 02:32:05 +02:00
parent 7c769211a8
commit ff27ccb80e
3 changed files with 26 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
api.cpp
View File

@ -130,7 +130,7 @@ static void gpustatus(int thr_id)
cgpu->accepted = accepted_count; cgpu->accepted = accepted_count;
cgpu->rejected = rejected_count; cgpu->rejected = rejected_count;
cgpu->khashes = stats_get_speed(cgpu->gpu_id, 0.0) / 1000.0; cgpu->khashes = stats_get_speed(thr_id, 0.0) / 1000.0;
card = device_name[gpuid]; card = device_name[gpuid];

1
miner.h
View File

@ -635,6 +635,7 @@ void hashlog_getmeminfo(uint64_t *mem, uint32_t *records);
void stats_remember_speed(int thr_id, uint32_t hashcount, double hashrate, uint8_t found, uint32_t height); void stats_remember_speed(int thr_id, uint32_t hashcount, double hashrate, uint8_t found, uint32_t height);
double stats_get_speed(int thr_id, double def_speed); double stats_get_speed(int thr_id, double def_speed);
double stats_get_gpu_speed(int gpu_id);
int stats_get_history(int thr_id, struct stats_data *data, int max_records); int stats_get_history(int thr_id, struct stats_data *data, int max_records);
void stats_purge_old(void); void stats_purge_old(void);
void stats_purge_all(void); void stats_purge_all(void);

33
stats.cpp
View File

@ -25,8 +25,7 @@ extern int opt_statsavg;
*/ */
void stats_remember_speed(int thr_id, uint32_t hashcount, double hashrate, uint8_t found, uint32_t height) void stats_remember_speed(int thr_id, uint32_t hashcount, double hashrate, uint8_t found, uint32_t height)
{ {
const uint8_t gpu = (uint8_t) device_map[thr_id]; const uint64_t key = uid++;
const uint64_t key = ((uid++ % UINT32_MAX) << 32) + gpu;
stats_data data; stats_data data;
// to enough hashes to give right stats // to enough hashes to give right stats
if (hashcount < 1000 || hashrate < 0.01) if (hashcount < 1000 || hashrate < 0.01)
@ -38,7 +37,7 @@ void stats_remember_speed(int thr_id, uint32_t hashcount, double hashrate, uint8
memset(&data, 0, sizeof(data)); memset(&data, 0, sizeof(data));
data.uid = (uint32_t) uid; data.uid = (uint32_t) uid;
data.gpu_id = gpu; data.gpu_id = device_map[thr_id];
data.thr_id = (uint8_t)thr_id; data.thr_id = (uint8_t)thr_id;
data.tm_stat = (uint32_t) time(NULL); data.tm_stat = (uint32_t) time(NULL);
data.height = height; data.height = height;
@ -61,15 +60,13 @@ void stats_remember_speed(int thr_id, uint32_t hashcount, double hashrate, uint8
*/ */
double stats_get_speed(int thr_id, double def_speed) double stats_get_speed(int thr_id, double def_speed)
{ {
const uint64_t gpu = device_map[thr_id];
const uint64_t keymsk = 0xffULL; // last u8 is the gpu
double speed = 0.0; double speed = 0.0;
int records = 0; int records = 0;
std::map<uint64_t, stats_data>::reverse_iterator i = tlastscans.rbegin(); std::map<uint64_t, stats_data>::reverse_iterator i = tlastscans.rbegin();
while (i != tlastscans.rend() && records < opt_statsavg) { while (i != tlastscans.rend() && records < opt_statsavg) {
if (!i->second.ignored) if (!i->second.ignored)
if (thr_id == -1 || (keymsk & i->first) == gpu) { if (thr_id == -1 || i->second.thr_id == thr_id) {
if (i->second.hashcount > 1000) { if (i->second.hashcount > 1000) {
speed += i->second.hashrate; speed += i->second.hashrate;
records++; records++;
@ -90,19 +87,37 @@ double stats_get_speed(int thr_id, double def_speed)
return speed; return speed;
} }
/**
* Get the gpu average speed
* @param gpu_id int (-1 for all threads)
*/
double stats_get_gpu_speed(int gpu_id)
{
double speed = 0.0;
double speeds[MAX_GPUS] = { 0 };
int records[MAX_GPUS] = { 0 };
int count = 0;
for (int thr_id=0; thr_id<opt_n_threads; thr_id++) {
int dev_id = device_map[thr_id];
if (gpu_id == -1 || dev_id == gpu_id)
speed += stats_get_speed(thr_id, 0.0);
}
return speed;
}
/** /**
* Export data for api calls * Export data for api calls
*/ */
int stats_get_history(int thr_id, struct stats_data *data, int max_records) int stats_get_history(int thr_id, struct stats_data *data, int max_records)
{ {
const uint64_t gpu = device_map[thr_id];
const uint64_t keymsk = 0xffULL; // last u8 is the gpu
int records = 0; int records = 0;
std::map<uint64_t, stats_data>::reverse_iterator i = tlastscans.rbegin(); std::map<uint64_t, stats_data>::reverse_iterator i = tlastscans.rbegin();
while (i != tlastscans.rend() && records < max_records) { while (i != tlastscans.rend() && records < max_records) {
if (!i->second.ignored) if (!i->second.ignored)
if (thr_id == -1 || (keymsk & i->first) == gpu) { if (thr_id == -1 || i->second.thr_id == thr_id) {
memcpy(&data[records], &(i->second), sizeof(struct stats_data)); memcpy(&data[records], &(i->second), sizeof(struct stats_data));
records++; records++;
} }