diff options
| author | Jeremy Allison <jra@samba.org> | 2011-12-21 20:38:32 -0800 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2011-12-22 12:12:33 +0100 |
| commit | 711c18c2301d1bea35cac1144080a94e6b89be27 (patch) | |
| tree | 0ead0dba686289a6a6ffb92a58d9120d8d97deb3 /source3/lib/pthreadpool/pthreadpool.c | |
| parent | 8303d163cf34d0b61bfbbc62e497f7b444a17e10 (diff) | |
| download | samba-711c18c2301d1bea35cac1144080a94e6b89be27.tar.gz samba-711c18c2301d1bea35cac1144080a94e6b89be27.tar.bz2 samba-711c18c2301d1bea35cac1144080a94e6b89be27.zip | |
Change the signature of pthreadpool_finished_job() to return 0
on success, errno on fail and return the jobid in a separate variable.
I need this fix for my vfs_aio_pthread.c module.
Autobuild-User: Jeremy Allison <jra@samba.org>
Autobuild-Date: Thu Dec 22 12:12:33 CET 2011 on sn-devel-104
Diffstat (limited to 'source3/lib/pthreadpool/pthreadpool.c')
| -rw-r--r-- | source3/lib/pthreadpool/pthreadpool.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/source3/lib/pthreadpool/pthreadpool.c b/source3/lib/pthreadpool/pthreadpool.c index c916dc0f8d..fffbd050df 100644 --- a/source3/lib/pthreadpool/pthreadpool.c +++ b/source3/lib/pthreadpool/pthreadpool.c @@ -285,16 +285,16 @@ static void pthreadpool_join_children(struct pthreadpool *pool) * Fetch a finished job number from the signal pipe */ -int pthreadpool_finished_job(struct pthreadpool *pool) +int pthreadpool_finished_job(struct pthreadpool *pool, int *jobid) { - int result; + int ret_jobid; ssize_t nread; nread = -1; errno = EINTR; 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) { return errno; @@ -302,7 +302,8 @@ int pthreadpool_finished_job(struct pthreadpool *pool) if (nread != sizeof(int)) { return EINVAL; } - return result; + *jobid = ret_jobid; + return 0; } /* |