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

Merge branch 'master' into ztex

Browse Source
This commit is contained in:
Con Kolivas 2012-04-21 18:28:51 +10:00
commit 7f107fb928
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
api.c
View File

@ -2029,7 +2029,7 @@ static void send_result(SOCKETTYPE c, bool isjson)
} }
static void tidyup() static void tidyup(void *arg)
{ {
bye = 1; bye = 1;
@ -2182,6 +2182,7 @@ void api(int api_thr_id)
bool did; bool did;
int i; int i;
pthread_cleanup_push(tidyup, NULL);
my_thr_id = api_thr_id; my_thr_id = api_thr_id;
/* This should be done first to ensure curl has already called WSAStartup() in windows */ /* This should be done first to ensure curl has already called WSAStartup() in windows */
@ -2392,5 +2393,5 @@ void api(int api_thr_id)
CLOSESOCKET(c); CLOSESOCKET(c);
} }
die: die:
tidyup(); pthread_cleanup_pop(true);
} }

1
driver-opencl.c
View File

@ -1180,6 +1180,7 @@ static bool opencl_thread_prepare(struct thr_info *thr)
return false; return false;
} }
strcpy(name, "");
applog(LOG_INFO, "Init GPU thread %i GPU %i virtual GPU %i", i, gpu, virtual_gpu); applog(LOG_INFO, "Init GPU thread %i GPU %i virtual GPU %i", i, gpu, virtual_gpu);
clStates[i] = initCl(virtual_gpu, name, sizeof(name)); clStates[i] = initCl(virtual_gpu, name, sizeof(name));
if (!clStates[i]) { if (!clStates[i]) {