GOSTSec/ccminer-gostd-lite
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

reduce crashes on debug tests

Browse Source
This commit is contained in:
Tanguy Pruvot 2015-11-06 19:19:47 +01:00
parent d7c2168f2b
commit e4476a5eee
3 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
api.cpp
View File

@ -995,7 +995,7 @@ void *api_thread(void *userdata)
/* to be able to report the default value set in each algo */ /* to be able to report the default value set in each algo */
void api_set_throughput(int thr_id, uint32_t throughput) void api_set_throughput(int thr_id, uint32_t throughput)
{ {
if (thr_id < MAX_GPUS) { if (thr_id < MAX_GPUS && thr_info) {
struct cgpu_info *cgpu = &thr_info[thr_id].gpu; struct cgpu_info *cgpu = &thr_info[thr_id].gpu;
uint32_t ws = throughput; uint32_t ws = throughput;
uint8_t i = 0; uint8_t i = 0;
@ -1007,9 +1007,8 @@ void api_set_throughput(int thr_id, uint32_t throughput)
if (i && (1U << i) < throughput) { if (i && (1U << i) < throughput) {
cgpu->intensity += ((float) (throughput-(1U << i)) / (1U << i)); cgpu->intensity += ((float) (throughput-(1U << i)) / (1U << i));
} }
// to display in bench results
if (opt_benchmark)
bench_set_throughput(thr_id, throughput);
} }
// to display in bench results
if (opt_benchmark)
bench_set_throughput(thr_id, throughput);
} }

13
ccminer.cpp
View File

@ -167,7 +167,7 @@ pthread_mutex_t stratum_work_lock;
char *opt_cert; char *opt_cert;
char *opt_proxy; char *opt_proxy;
long opt_proxy_type; long opt_proxy_type;
struct thr_info *thr_info; struct thr_info *thr_info = NULL;
static int work_thr_id; static int work_thr_id;
struct thr_api *thr_api; struct thr_api *thr_api;
int longpoll_thr_id = -1; int longpoll_thr_id = -1;
@ -473,6 +473,7 @@ void get_currentalgo(char* buf, int sz)
*/ */
void proper_exit(int reason) void proper_exit(int reason)
{ {
restart_threads();
if (abort_flag) /* already called */ if (abort_flag) /* already called */
return; return;
@ -3042,10 +3043,13 @@ int main(int argc, char *argv[])
rpc_user = strdup(""); rpc_user = strdup("");
rpc_pass = strdup(""); rpc_pass = strdup("");
rpc_url = strdup(""); rpc_url = strdup("");
jane_params = strdup(""); jane_params = strdup("");
pthread_mutex_init(&applog_lock, NULL); pthread_mutex_init(&applog_lock, NULL);
pthread_mutex_init(&stratum_sock_lock, NULL);
pthread_mutex_init(&stratum_work_lock, NULL);
pthread_mutex_init(&stats_lock, NULL);
pthread_mutex_init(&g_work_lock, NULL);
// number of cpus for thread affinity // number of cpus for thread affinity
#if defined(WIN32) #if defined(WIN32)
@ -3114,11 +3118,6 @@ int main(int argc, char *argv[])
/* init stratum data.. */ /* init stratum data.. */
memset(&stratum.url, 0, sizeof(stratum)); memset(&stratum.url, 0, sizeof(stratum));
pthread_mutex_init(&stratum_sock_lock, NULL);
pthread_mutex_init(&stratum_work_lock, NULL);
pthread_mutex_init(&stats_lock, NULL);
pthread_mutex_init(&g_work_lock, NULL);
// ensure default params are set // ensure default params are set
pool_init_defaults(); pool_init_defaults();

2
cuda.cpp
View File

@ -229,6 +229,8 @@ typedef struct { double value[8]; } tsumarray;
cudaError_t MyStreamSynchronize(cudaStream_t stream, int situation, int thr_id) cudaError_t MyStreamSynchronize(cudaStream_t stream, int situation, int thr_id)
{ {
cudaError_t result = cudaSuccess; cudaError_t result = cudaSuccess;
if (abort_flag)
return result;
if (situation >= 0) if (situation >= 0)
{ {
static std::map<int, tsumarray> tsum; static std::map<int, tsumarray> tsum;