sql/benchs: add new columns to store the plimit and real freqs

also drop the mem amount column, unused and kinda useless...
This commit is contained in:
Tanguy Pruvot 2017-02-05 12:45:46 +01:00
parent b425096b8f
commit 81a5552386
2 changed files with 20 additions and 5 deletions

View file

@ -0,0 +1,10 @@
-- Recent additions to add after db init (.gz)
-- mysql yaamp -p < file.sql
-- don't forget to restart memcached service to refresh the db structure
ALTER TABLE `benchmarks` ADD `realfreq` INT(8) UNSIGNED NULL AFTER `freq`;
ALTER TABLE `benchmarks` ADD `realmemf` INT(8) UNSIGNED NULL AFTER `memf`;
ALTER TABLE `benchmarks` ADD `plimit` INT(5) UNSIGNED NULL AFTER `power`;
ALTER TABLE `benchmarks` DROP COLUMN `mem`;

View file

@ -505,7 +505,7 @@ void db_store_stats(YAAMP_DB *db, YAAMP_CLIENT *client, json_value *stats)
char sdev[80], stype[8], svid[12], sarch[8]; char sdev[80], stype[8], svid[12], sarch[8];
char salgo[32], sclient[48], sdriver[32], sos[8]; char salgo[32], sclient[48], sdriver[32], sos[8];
double khashes, intensity, throughput; double khashes, intensity, throughput;
int power, mem, freq, memf; int power, freq, memf, realfreq, realmemf, plimit;
if (!db) return; if (!db) return;
@ -524,17 +524,22 @@ void db_store_stats(YAAMP_DB *db, YAAMP_CLIENT *client, json_value *stats)
json_str_safe(stats, "driver", sdriver); // or cpu compiler json_str_safe(stats, "driver", sdriver); // or cpu compiler
power = json_int_safe(stats, "power"); power = json_int_safe(stats, "power");
mem = json_int_safe(stats, "mem");
freq = json_int_safe(stats, "freq"); freq = json_int_safe(stats, "freq");
memf = json_int_safe(stats, "memf"); memf = json_int_safe(stats, "memf");
realfreq = json_int_safe(stats, "curr_freq");
realmemf = json_int_safe(stats, "curr_memf");
plimit = json_int_safe(stats, "plimit");
intensity = json_double_safe(stats, "intensity"); intensity = json_double_safe(stats, "intensity");
throughput = json_double_safe(stats, "throughput"); throughput = json_double_safe(stats, "throughput");
khashes = json_double_safe(stats, "khashes"); khashes = json_double_safe(stats, "khashes");
db_query(db, "INSERT INTO benchmarks(" db_query(db, "INSERT INTO benchmarks("
"time, algo, type, device, arch, vendorid, os, driver," "time, algo, type, device, arch, vendorid, os, driver,"
"client, khps, freq, memf, power, mem, intensity, throughput, userid" "client, khps, freq, memf, realfreq, realmemf, power, plimit, "
") VALUES (%d,'%s','%s','%s','%s','%s','%s','%s', '%s',%f,%d,%d,%d,%d,%.2f,%.0f,%d)", "intensity, throughput, userid )"
"VALUES (%d,'%s','%s','%s','%s','%s','%s','%s',"
"'%s',%f,%d,%d,%d,%d,%d,%d, %.2f,%.0f,%d)",
t, g_current_algo->name, stype, sdev, sarch, svid, sos, sdriver, t, g_current_algo->name, stype, sdev, sarch, svid, sos, sdriver,
sclient, khashes, freq, memf, power, mem, intensity, throughput, client->userid); sclient, khashes, freq, memf, realfreq, realmemf, power, plimit,
intensity, throughput, client->userid);
} }