Browse Source

Convert remaining modminer and bfl uses of usleep to nmsleep.

nfactor-troky
Con Kolivas 12 years ago
parent
commit
86fd23a305
  1. 6
      driver-bitforce.c
  2. 2
      driver-modminer.c

6
driver-bitforce.c

@ -55,7 +55,7 @@ enum {
#define BITFORCE_LONG_TIMEOUT_MS (BITFORCE_LONG_TIMEOUT_S * 1000) #define BITFORCE_LONG_TIMEOUT_MS (BITFORCE_LONG_TIMEOUT_S * 1000)
#define BITFORCE_CHECK_INTERVAL_MS 10 #define BITFORCE_CHECK_INTERVAL_MS 10
#define WORK_CHECK_INTERVAL_MS 50 #define WORK_CHECK_INTERVAL_MS 50
#define MAX_START_DELAY_US 100000 #define MAX_START_DELAY_MS 100
#define tv_to_ms(tval) (tval.tv_sec * 1000 + tval.tv_usec / 1000) #define tv_to_ms(tval) (tval.tv_sec * 1000 + tval.tv_usec / 1000)
#define TIME_AVG_CONSTANT 8 #define TIME_AVG_CONSTANT 8
@ -691,9 +691,9 @@ static bool bitforce_thread_init(struct thr_info *thr)
/* Pause each new thread at least 100ms between initialising /* Pause each new thread at least 100ms between initialising
* so the devices aren't making calls all at the same time. */ * so the devices aren't making calls all at the same time. */
wait = thr->id * MAX_START_DELAY_US; wait = thr->id * MAX_START_DELAY_MS;
applog(LOG_DEBUG, "BFL%i: Delaying start by %dms", bitforce->device_id, wait / 1000); applog(LOG_DEBUG, "BFL%i: Delaying start by %dms", bitforce->device_id, wait / 1000);
usleep(wait); nmsleep(wait);
return true; return true;
} }

2
driver-modminer.c

@ -604,7 +604,7 @@ static uint64_t modminer_process_results(struct thr_info *thr)
if (work_restart(thr)) if (work_restart(thr))
break; break;
usleep(10000); nmsleep(10);
if (work_restart(thr) || !--iter) if (work_restart(thr) || !--iter)
break; break;
mutex_lock(&modminer->device_mutex); mutex_lock(&modminer->device_mutex);

Loading…
Cancel
Save