Replace elist.h with uthash.h for work lists (share submission and bitforce bqueue)

driver-bitforce.c

@@ -383,20 +383,17 @@ void bitforce_reinit(struct cgpu_info *bitforce)
 	
 	if (bitforce->drv == &bitforce_queue_api)
 	{
-		struct list_head *pos, *npos;
-		struct work *work;
+		struct work *work, *tmp;
 		
 		timer_set_delay_from_now(&thr->tv_poll, 0);
 		notifier_wake(thr->notifier);
 		
 		bitforce_cmd1(fdDev, data->xlink_id, pdevbuf, sizeof(pdevbuf), "ZQX");
-		for (pos = thr->work_list.prev; pos != &thr->work_list; pos = npos)
+		DL_FOREACH_SAFE(thr->work_list, work, tmp)
 		{
-			npos = pos->next;
-			work = list_entry(pos, typeof(*work), list);
 			free_work(work);
+			DL_DELETE(thr->work_list, work);
 		}
-		INIT_LIST_HEAD(&thr->work_list);
 		data->queued = 0;
 		data->ready_to_queue = 0;
 		data->already_have_results = false;
@@ -1175,7 +1172,6 @@ static bool bitforce_thread_init(struct thr_info *thr)
 			
 			if (bitforce->drv == &bitforce_queue_api)
 			{
-				INIT_LIST_HEAD(&thr->work_list);
 				bitforce_change_mode(bitforce, BFP_BQUEUE);
 				bitforce->sleep_ms = data->sleep_ms_default = 100;
 				timer_set_delay_from_now(&thr->tv_poll, 0);
@@ -1332,7 +1328,6 @@ bool bitforce_send_queue(struct thr_info *thr)
 	pthread_mutex_t *mutexp = &bitforce->device->device_mutex;
 	int fd = bitforce->device->device_fd;
 	struct work *work;
-	struct list_head *pos;
 	
 	if (unlikely(!(fd && data->ready_to_queue)))
 		return false;
@@ -1348,10 +1343,9 @@ bool bitforce_send_queue(struct thr_info *thr)
 	qjp[qjp_sz - 1] = 0xfe;
 	qjs = &qjp[qjp_sz - 1];
 	
-	pos = thr->work_list.prev;
-	for (int i = data->ready_to_queue; i > 0; --i, pos = pos->prev)
+	work = thr->work_list->prev;
+	for (int i = data->ready_to_queue; i > 0; --i, work = work->prev)
 	{
-		work = list_entry(pos, typeof(*work), list);
 		*(--qjs) = 0xaa;
 		memcpy(qjs -= 12, work->data + 64, 12);
 		memcpy(qjs -= 32, work->midstate, 32);
@@ -1396,12 +1390,9 @@ bool bitforce_send_queue(struct thr_info *thr)
 	return true;
 }
 
-void work_list_del(struct list_head *pos)
+void work_list_del(struct work **head, struct work *work)
 {
-	struct work *work;
-	
-	work = list_entry(pos, typeof(*work), list);
-	list_del(pos);
+	DL_DELETE(*head, work);
 	free_work(work);
 }
 
@@ -1414,8 +1405,7 @@ bool bitforce_queue_do_results(struct thr_info *thr)
 	int count;
 	char *noncebuf = &data->noncebuf[0], *buf, *end;
 	unsigned char midstate[32], datatail[12];
-	struct work *work;
-	struct list_head *pos, *next_pos;
+	struct work *work, *tmpwork, *thiswork;
 	struct timeval tv_now, tv_elapsed;
 	
 	if (unlikely(!fd))
@@ -1437,7 +1427,7 @@ bool bitforce_queue_do_results(struct thr_info *thr)
 		return false;
 	}
 	
-	if (unlikely(list_empty(&thr->work_list)))
+	if (unlikely(!thr->work_list))
 	{
 		applog(LOG_ERR, "%"PRIpreprv": Received %d queued results when there was no queue", bitforce->proc_repr, count);
 		++bitforce->hw_errors;
@@ -1463,23 +1453,23 @@ bool bitforce_queue_do_results(struct thr_info *thr)
 		hex2bin(midstate, buf, 32);
 		hex2bin(datatail, &buf[65], 12);
 		
-		for (pos = thr->work_list.next; ; pos = pos->next)
+		thiswork = NULL;
+		DL_FOREACH(thr->work_list, work)
 		{
-			if (unlikely(pos == &thr->work_list))
-			{
-				applog(LOG_ERR, "%"PRIpreprv": Failed to find work for queue results", bitforce->proc_repr);
-				++bitforce->hw_errors;
-				++hw_errors;
-				goto next_qline;
-			}
-			
-			work = list_entry(pos, typeof(*work), list);
 			if (unlikely(memcmp(work->midstate, midstate, 32)))
 				continue;
 			if (unlikely(memcmp(&work->data[64], datatail, 12)))
 				continue;
+			thiswork = work;
 			break;
 		}
+		if (unlikely(!thiswork))
+		{
+			applog(LOG_ERR, "%"PRIpreprv": Failed to find work for queue results", bitforce->proc_repr);
+			++bitforce->hw_errors;
+			++hw_errors;
+			goto next_qline;
+		}
 		
 		++count;
 		if (strtol(&buf[90], &end, 10))
@@ -1487,11 +1477,12 @@ bool bitforce_queue_do_results(struct thr_info *thr)
 		
 		// Queue results are in order, so anything queued prior this is lost
 		// Delete all queued work up to, and including, this one
-		for ( ; pos != &thr->work_list; pos = next_pos)
+		DL_FOREACH_SAFE(thr->work_list, work, tmpwork)
 		{
-			next_pos = pos->prev;
-			work_list_del(pos);
+			DL_DELETE(thr->work_list, work);
 			--data->queued;
+			if (work == thiswork)
+				break;
 		}
 next_qline: (void)0;
 	}
@@ -1530,7 +1521,7 @@ bool bitforce_queue_append(struct thr_info *thr, struct work *work)
 	rv = !thr->queue_full;
 	if (rv)
 	{
-		list_add_tail(&work->list, &thr->work_list);
+		DL_APPEND(thr->work_list, work);
 		++data->ready_to_queue;
 		applog(LOG_DEBUG, "%"PRIpreprv": Appending to driver queue (max=%u, ready=%d, queued<=%d)",
 		       bitforce->proc_repr,
@@ -1581,7 +1572,7 @@ void bitforce_queue_flush(struct thr_info *thr)
 	flushed += data->ready_to_queue;
 	data->ready_to_queue = 0;
 	while (flushed--)
-		work_list_del(thr->work_list.prev);
+		work_list_del(&thr->work_list, thr->work_list->prev);
 	bitforce_set_queue_full(thr);
 	data->just_flushed = true;
 	

miner.c

@@ -238,7 +238,7 @@ pthread_mutex_t stats_lock;
 
 static pthread_mutex_t submitting_lock;
 static int total_submitting;
-static struct list_head submit_waiting;
+static struct work *submit_waiting;
 notifier_t submit_waiting_notifier;
 
 int hw_errors;
@@ -4153,9 +4153,9 @@ static void *submit_work_thread(__maybe_unused void *userdata)
 		}
 		
 		// Receive any new submissions
-		while (!list_empty(&submit_waiting)) {
-			struct work *work = list_entry(submit_waiting.next, struct work, list);
-			list_del(&work->list);
+		while (submit_waiting) {
+			struct work *work = submit_waiting;
+			DL_DELETE(submit_waiting, work);
 			if ( (sws = begin_submission(work)) ) {
 				if (sws->ce)
 					curl_multi_add_handle(curlm, sws->ce->curl);
@@ -6179,7 +6179,7 @@ static void resubmit_stratum_shares(struct pool *pool)
 		HASH_DEL(stratum_shares, sshare);
 		
 		work = sshare->work;
-		list_add_tail(&work->list, &submit_waiting);
+		DL_APPEND(submit_waiting, work);
 		
 		free(sshare);
 		++resubmitted;
@@ -6954,7 +6954,7 @@ void _submit_work_async(struct work *work)
 
 	mutex_lock(&submitting_lock);
 	++total_submitting;
-	list_add_tail(&work->list, &submit_waiting);
+	DL_APPEND(submit_waiting, work);
 	mutex_unlock(&submitting_lock);
 
 	notifier_wake(submit_waiting_notifier);
@@ -8507,7 +8507,6 @@ int main(int argc, char *argv[])
 	strcpy(current_block, block->hash);
 
 	mutex_init(&submitting_lock);
-	INIT_LIST_HEAD(&submit_waiting);
 
 #ifdef HAVE_OPENCL
 	memset(gpus, 0, sizeof(gpus));

miner.h

@@ -616,7 +616,7 @@ struct thr_info {
 	notifier_t mutex_request;
 
 	// Used by minerloop_queue
-	struct list_head work_list;
+	struct work *work_list;
 	bool queue_full;
 	bool _last_sbr_state;
 
@@ -1229,7 +1229,8 @@ struct work {
 	char		getwork_mode;
 
 	/* Used to queue shares in submit_waiting */
-	struct list_head list;
+	struct work *prev;
+	struct work *next;
 };
 
 extern void get_datestamp(char *, struct timeval *);