Browse Source

Iterate over each thread belonging to each device in the hashmeter instead of searching for them now that they're a list.

Con Kolivas 13 years ago
parent
commit
44f5d55d51
1 changed files with 2 additions and 5 deletions
  1. 2 5
      cgminer.c

+ 2 - 5
cgminer.c

@@ -3302,12 +3302,9 @@ static void hashmeter(int thr_id, struct timeval *diff,
 
 		/* Rolling average for each thread and each device */
 		decay_time(&thr->rolling, local_mhashes / secs);
-		for (i = 0; i < mining_threads; i++) {
-			struct thr_info *th = &thr_info[i];
+		for (i = 0; i < cgpu->threads; i++)
+			thread_rolling += cgpu->thr[i]->rolling;
 
-			if (th->cgpu == cgpu)
-				thread_rolling += th->rolling;
-		}
 		mutex_lock(&hash_lock);
 		decay_time(&cgpu->rolling, thread_rolling);
 		cgpu->total_mhashes += local_mhashes;