GOSTSec/sgminer
1
0
Fork 0
mirror of https://github.com/GOSTSec/sgminer synced 2025-08-26 13:52:02 +00:00
Code Issues Releases Wiki Activity

Merge branch 'master' of git://github.com/ckolivas/cgminer.git

Browse Source 
Conflicts:
	driver-bitforce.c
This commit is contained in:
Paul Sheppard 2012-07-01 23:39:09 -07:00
commit ce850883e7
2 changed files with 20 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
cgminer.c
View File

@ -339,25 +339,35 @@ static FILE *sharelog_file = NULL;
static void sharelog(const char*disposition, const struct work*work) static void sharelog(const char*disposition, const struct work*work)
{ {
char *target, *hash, *data;
struct cgpu_info *cgpu;
unsigned long int t;
struct pool *pool;
int thr_id, rv;
char s[1024];
size_t ret;
if (!sharelog_file) if (!sharelog_file)
return; return;
int thr_id = work->thr_id; thr_id = work->thr_id;
struct cgpu_info *cgpu = thr_info[thr_id].cgpu; cgpu = thr_info[thr_id].cgpu;
struct pool *pool = work->pool; pool = work->pool;
unsigned long int t = (unsigned long int)work->share_found_time; t = (unsigned long int)work->share_found_time;
char *target = bin2hex(work->target, sizeof(work->target)); target = bin2hex(work->target, sizeof(work->target));
if (unlikely(!target)) { if (unlikely(!target)) {
applog(LOG_ERR, "sharelog target OOM"); applog(LOG_ERR, "sharelog target OOM");
return; return;
} }
char *hash = bin2hex(work->hash, sizeof(work->hash));
hash = bin2hex(work->hash, sizeof(work->hash));
if (unlikely(!hash)) { if (unlikely(!hash)) {
free(target); free(target);
applog(LOG_ERR, "sharelog hash OOM"); applog(LOG_ERR, "sharelog hash OOM");
return; return;
} }
char *data = bin2hex(work->data, sizeof(work->data));
data = bin2hex(work->data, sizeof(work->data));
if (unlikely(!data)) { if (unlikely(!data)) {
free(target); free(target);
free(hash); free(hash);
@ -366,26 +376,22 @@ static void sharelog(const char*disposition, const struct work*work)
} }
// timestamp,disposition,target,pool,dev,thr,sharehash,sharedata // timestamp,disposition,target,pool,dev,thr,sharehash,sharedata
char s[1024];
int rv;
rv = snprintf(s, sizeof(s), "%lu,%s,%s,%s,%s%u,%u,%s,%s\n", t, disposition, target, pool->rpc_url, cgpu->api->name, cgpu->device_id, thr_id, hash, data); rv = snprintf(s, sizeof(s), "%lu,%s,%s,%s,%s%u,%u,%s,%s\n", t, disposition, target, pool->rpc_url, cgpu->api->name, cgpu->device_id, thr_id, hash, data);
free(target); free(target);
free(hash); free(hash);
free(data); free(data);
if (rv >= (int)(sizeof(s))) if (rv >= (int)(sizeof(s)))
s[sizeof(s) - 1] = '\0'; s[sizeof(s) - 1] = '\0';
else else if (rv < 0) {
if (rv < 0) {
applog(LOG_ERR, "sharelog printf error"); applog(LOG_ERR, "sharelog printf error");
return; return;
} }
size_t ret;
mutex_lock(&sharelog_lock); mutex_lock(&sharelog_lock);
ret = fwrite(s, rv, 1, sharelog_file); ret = fwrite(s, rv, 1, sharelog_file);
fflush(sharelog_file); fflush(sharelog_file);
mutex_unlock(&sharelog_lock); mutex_unlock(&sharelog_lock);
if (1 != ret) if (ret != 1)
applog(LOG_ERR, "sharelog fwrite error"); applog(LOG_ERR, "sharelog fwrite error");
} }
@ -1013,8 +1019,8 @@ static int fileconf_load;
static char *parse_config(json_t *config, bool fileconf) static char *parse_config(json_t *config, bool fileconf)
{ {
static char err_buf[200]; static char err_buf[200];
json_t *val;
struct opt_table *opt; struct opt_table *opt;
json_t *val;
if (fileconf && !fileconf_load) if (fileconf && !fileconf_load)
fileconf_load = 1; fileconf_load = 1;

2
driver-bitforce.c
View File

@ -365,8 +365,6 @@ static void biforce_thread_enable(struct thr_info *thr)
bitforce_init(bitforce); bitforce_init(bitforce);
} }
static uint64_t bitforce_scanhash(struct thr_info *thr, struct work *work, uint64_t __maybe_unused max_nonce) static uint64_t bitforce_scanhash(struct thr_info *thr, struct work *work, uint64_t __maybe_unused max_nonce)
{ {
struct cgpu_info *bitforce = thr->cgpu; struct cgpu_info *bitforce = thr->cgpu;