Changeset 751 for trunk/server/source3/lib/pthreadpool

Timestamp:

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

Author:

Silvan Scherrer

Message:

Samba Server: updated trunk to 3.6.9

Location:

trunk/server/source3/lib/pthreadpool

Files:

• pthreadpool.c (modified) (3 diffs)
• pthreadpool.h (modified) (1 diff)
• tests.c (modified) (3 diffs)

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

@@ -288 +288 @@
  */
 
-int pthreadpool_finished_job(struct pthreadpool *pool)
-{
-        int result;
+int pthreadpool_finished_job(struct pthreadpool *pool, int *jobid)
+{
+        int ret_jobid;
         ssize_t nread;
 
@@ -297 +297 @@
 
         while ((nread == -1) && (errno == EINTR)) {
-                nread = read(pool->sig_pipe[0], &result, sizeof(int));
+                nread = read(pool->sig_pipe[0], &ret_jobid, sizeof(int));
         }
         if (nread == -1) {
@@ -305 +305 @@
                 return EINVAL;
         }
-        return result;
+        *jobid = ret_jobid;
+        return 0;
 }
 

trunk/server/source3/lib/pthreadpool/pthreadpool.h

@@ -91 +91 @@
  *
  * @param[in]   pool            The pool to query for finished jobs
- * @return                      The job_id of the finished job
+ * @param[out]  pjobid          The job_id of the finished job
+ * @return                      success: 0, failure: errno
  */
-int pthreadpool_finished_job(struct pthreadpool *pool);
+int pthreadpool_finished_job(struct pthreadpool *pool, int *jobid);
 
 #endif

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;
                 }