@ -141,6 +141,7 @@ int longpoll_thr_id;
struct work_restart * work_restart = NULL ;
struct work_restart * work_restart = NULL ;
pthread_mutex_t time_lock ;
pthread_mutex_t time_lock ;
static pthread_mutex_t hash_lock ;
static pthread_mutex_t hash_lock ;
static pthread_mutex_t get_lock ;
static double total_mhashes_done ;
static double total_mhashes_done ;
static struct timeval total_tv_start , total_tv_end ;
static struct timeval total_tv_start , total_tv_end ;
static int accepted , rejected ;
static int accepted , rejected ;
@ -591,35 +592,67 @@ static void hashmeter(int thr_id, struct timeval *diff,
total_mhashes_done / total_secs , accepted , rejected ) ;
total_mhashes_done / total_secs , accepted , rejected ) ;
}
}
static bool get_work ( struct thr_info * thr , struct work * work )
/* Since we always have one extra work item queued, set the thread id to 0
* for all the work and just give the work to the first thread that requests
* work */
static bool get_work ( struct work * work )
{
{
static struct work * work_heap = NULL ;
struct thr_info * thr = & thr_info [ 0 ] ;
struct workio_cmd * wc ;
struct workio_cmd * wc ;
struct work * work_heap ;
bool ret = false ;
/* fill out work request message */
/* fill out work request message */
wc = calloc ( 1 , sizeof ( * wc ) ) ;
wc = calloc ( 1 , sizeof ( * wc ) ) ;
if ( ! wc )
if ( unlikely ( ! wc ) )
return false ;
goto out ;
wc - > cmd = WC_GET_WORK ;
wc - > cmd = WC_GET_WORK ;
wc - > thr = thr ;
wc - > thr = thr ;
/* send work request to workio thread */
/* send work request to workio thread */
if ( ! tq_push ( thr_info [ work_thr_id ] . q , wc ) ) {
if ( unlikely ( ! tq_push ( thr_info [ work_thr_id ] . q , wc ) ) ) {
workio_cmd_free ( wc ) ;
workio_cmd_free ( wc ) ;
return false ;
goto out ;
}
}
/* wait for response, a unit of work */
/* work_heap is a static var so it is protected by get_lock */
work_heap = tq_pop ( thr - > q , NULL ) ;
pthread_mutex_lock ( & get_lock ) ;
if ( ! work_heap )
if ( likely ( work_heap ) ) {
return false ;
memcpy ( work , work_heap , sizeof ( * work ) ) ;
/* Wait for next response, a unit of work - it should be queued */
free ( work_heap ) ;
work_heap = tq_pop ( thr - > q , NULL ) ;
} else {
/* wait for 1st response, or 1st response after failure */
work_heap = tq_pop ( thr - > q , NULL ) ;
if ( unlikely ( ! work_heap ) )
goto out_unlock ;
/* send for another work request for the next time get_work
* is called . */
wc = calloc ( 1 , sizeof ( * wc ) ) ;
if ( unlikely ( ! wc ) ) {
free ( work_heap ) ;
work_heap = NULL ;
goto out_unlock ;
}
/* copy returned work into storage provided by caller */
wc - > cmd = WC_GET_WORK ;
memcpy ( work , work_heap , sizeof ( * work ) ) ;
wc - > thr = thr ;
free ( work_heap ) ;
return true ;
if ( unlikely ( ! tq_push ( thr_info [ work_thr_id ] . q , wc ) ) ) {
workio_cmd_free ( wc ) ;
free ( work_heap ) ;
work_heap = NULL ;
goto out_unlock ;
}
}
ret = true ;
out_unlock :
pthread_mutex_unlock ( & get_lock ) ;
out :
return ret ;
}
}
static bool submit_work ( struct thr_info * thr , const struct work * work_in )
static bool submit_work ( struct thr_info * thr , const struct work * work_in )
@ -689,7 +722,7 @@ static void *miner_thread(void *userdata)
bool rc ;
bool rc ;
/* obtain new work from internal workio thread */
/* obtain new work from internal workio thread */
if ( unlikely ( ! get_work ( mythr , & work ) ) ) {
if ( unlikely ( ! get_work ( & work ) ) ) {
applog ( LOG_ERR , " work retrieval failed, exiting "
applog ( LOG_ERR , " work retrieval failed, exiting "
" mining thread %d " , mythr - > id ) ;
" mining thread %d " , mythr - > id ) ;
goto out ;
goto out ;
@ -875,7 +908,7 @@ static void *gpuminer_thread(void *userdata)
if ( need_work ) {
if ( need_work ) {
gettimeofday ( & tv_workstart , NULL ) ;
gettimeofday ( & tv_workstart , NULL ) ;
/* obtain new work from internal workio thread */
/* obtain new work from internal workio thread */
if ( unlikely ( ! get_work ( mythr , work ) ) ) {
if ( unlikely ( ! get_work ( work ) ) ) {
applog ( LOG_ERR , " work retrieval failed, exiting "
applog ( LOG_ERR , " work retrieval failed, exiting "
" gpu mining thread %d " , mythr - > id ) ;
" gpu mining thread %d " , mythr - > id ) ;
goto out ;
goto out ;
@ -1238,6 +1271,8 @@ int main (int argc, char *argv[])
return 1 ;
return 1 ;
if ( unlikely ( pthread_mutex_init ( & hash_lock , NULL ) ) )
if ( unlikely ( pthread_mutex_init ( & hash_lock , NULL ) ) )
return 1 ;
return 1 ;
if ( unlikely ( pthread_mutex_init ( & get_lock , NULL ) ) )
return 1 ;
# ifdef HAVE_SYSLOG_H
# ifdef HAVE_SYSLOG_H
if ( use_syslog )
if ( use_syslog )