Changeset 751 for trunk/server/source3/lib/pthreadpool/tests.c

Timestamp:

Nov 29, 2012, 1:59:04 PM (13 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: updated trunk to 3.6.9

File:

• trunk/server/source3/lib/pthreadpool/tests.c (modified) (3 diffs)

trunk/server/source3/lib/pthreadpool/tests.c

@@ -69 +69 @@
 
         for (i=0; i<num_jobs; i++) {
-                ret = pthreadpool_finished_job(p);
-                if ((ret < 0) || (ret >= num_jobs)) {
-                        fprintf(stderr, "invalid job number %d\n", ret);
-                        return -1;
-                }
-                finished[ret] += 1;
+                int jobid = -1;
+                ret = pthreadpool_finished_job(p, &jobid);
+                if ((ret != 0) || (jobid >= num_jobs)) {
+                        fprintf(stderr, "invalid job number %d\n", jobid);
+                        return -1;
+                }
+                finished[jobid] += 1;
         }
 
@@ -276 +277 @@
 
                 for (j=0; j<num_pools; j++) {
+                        int jobid = -1;
 
                         if ((pfds[j].revents & (POLLIN|POLLHUP)) == 0) {
@@ -281 +283 @@
                         }
 
-                        ret = pthreadpool_finished_job(pools[j]);
-                        if ((ret < 0) || (ret >= num_jobs * num_threads)) {
+                        ret = pthreadpool_finished_job(pools[j], &jobid);
+                        if ((ret != 0) || (jobid >= num_jobs * num_threads)) {
                                 fprintf(stderr, "invalid job number %d\n",
-                                        ret);
+                                        jobid);
                                 return -1;
                         }
-                        finished[ret] += 1;
+                        finished[jobid] += 1;
                         received += 1;
                 }