Revision: 90 http://trac.macosforge.org/projects/libdispatch/changeset/90 Author: robert@fledge.watson.org Date: 2009-11-02 14:58:03 -0800 (Mon, 02 Nov 2009) Log Message: ----------- When calling dispatch_assume_zero() without using the return value, cast to (void) to silence clang warnings. Suggested by: Kevin Van Vechten <kvv@apple.com> Modified Paths: -------------- trunk/src/queue.c trunk/src/queue_kevent.c trunk/src/semaphore.c trunk/src/shims/time.h trunk/src/source.c trunk/src/time.c Modified: trunk/src/queue.c =================================================================== --- trunk/src/queue.c 2009-11-02 21:17:40 UTC (rev 89) +++ trunk/src/queue.c 2009-11-02 22:58:03 UTC (rev 90) @@ -447,17 +447,17 @@ ret = sysctlbyname("hw.activecpu", &_dispatch_hw_config.cc_max_active, &valsz, NULL, 0); - dispatch_assume_zero(ret); + (void)dispatch_assume_zero(ret); dispatch_assume(valsz == sizeof(uint32_t)); ret = sysctlbyname("hw.logicalcpu_max", &_dispatch_hw_config.cc_max_logical, &valsz, NULL, 0); - dispatch_assume_zero(ret); + (void)dispatch_assume_zero(ret); dispatch_assume(valsz == sizeof(uint32_t)); ret = sysctlbyname("hw.physicalcpu_max", &_dispatch_hw_config.cc_max_physical, &valsz, NULL, 0); - dispatch_assume_zero(ret); + (void)dispatch_assume_zero(ret); dispatch_assume(valsz == sizeof(uint32_t)); #elif defined(__FreeBSD__) size_t valsz = sizeof(uint32_t); @@ -465,8 +465,8 @@ ret = sysctlbyname("kern.smp.cpus", &_dispatch_hw_config.cc_max_active, &valsz, NULL, 0); - dispatch_assume_zero(ret); - dispatch_assume(valsz == sizeof(uint32_t)); + (void)dispatch_assume_zero(ret); + (void)dispatch_assume(valsz == sizeof(uint32_t)); _dispatch_hw_config.cc_max_logical = _dispatch_hw_config.cc_max_physical = @@ -861,10 +861,10 @@ kr = mach_port_allocate(mach_task_self(), MACH_PORT_RIGHT_RECEIVE, &main_q_port); DISPATCH_VERIFY_MIG(kr); - dispatch_assume_zero(kr); + (void)dispatch_assume_zero(kr); kr = mach_port_insert_right(mach_task_self(), main_q_port, main_q_port, MACH_MSG_TYPE_MAKE_SEND); DISPATCH_VERIFY_MIG(kr); - dispatch_assume_zero(kr); + (void)dispatch_assume_zero(kr); _dispatch_program_is_probably_callback_driven = true; _dispatch_safe_fork = false; @@ -943,10 +943,10 @@ if (mp) { kr = mach_port_deallocate(mach_task_self(), mp); DISPATCH_VERIFY_MIG(kr); - dispatch_assume_zero(kr); + (void)dispatch_assume_zero(kr); kr = mach_port_mod_refs(mach_task_self(), mp, MACH_PORT_RIGHT_RECEIVE, -1); DISPATCH_VERIFY_MIG(kr); - dispatch_assume_zero(kr); + (void)dispatch_assume_zero(kr); } #endif } @@ -1071,7 +1071,7 @@ case MACH_SEND_INVALID_DEST: break; default: - dispatch_assume_zero(kr); + (void)dispatch_assume_zero(kr); break; } @@ -1120,15 +1120,15 @@ #ifdef HAVE_PTHREAD_WORKQUEUES r = pthread_workqueue_attr_init_np(&pwq_attr); - dispatch_assume_zero(r); + (void)dispatch_assume_zero(r); #endif for (i = 0; i < DISPATCH_ROOT_QUEUE_COUNT; i++) { #ifdef HAVE_PTHREAD_WORKQUEUES r = pthread_workqueue_attr_setqueuepriority_np(&pwq_attr, _dispatch_rootq2wq_pri(i)); - dispatch_assume_zero(r); + (void)dispatch_assume_zero(r); r = pthread_workqueue_attr_setovercommit_np(&pwq_attr, i & 1); - dispatch_assume_zero(r); + (void)dispatch_assume_zero(r); // some software hangs if the non-overcommitting queues do not overcommit when threads block #if 0 if (!(i & 1)) { @@ -1139,20 +1139,20 @@ r = 0; if (disable_wq || (r = pthread_workqueue_create_np(&_dispatch_root_queue_contexts[i].dgq_kworkqueue, &pwq_attr))) { if (r != ENOTSUP) { - dispatch_assume_zero(r); + (void)dispatch_assume_zero(r); } #endif /* HAVE_PTHREAD_WORKQUEUES */ #if USE_MACH_SEM // override the default FIFO behavior for the pool semaphores kr = semaphore_create(mach_task_self(), &_dispatch_thread_mediator[i].dsema_port, SYNC_POLICY_LIFO, 0); DISPATCH_VERIFY_MIG(kr); - dispatch_assume_zero(kr); + (void)dispatch_assume_zero(kr); dispatch_assume(_dispatch_thread_mediator[i].dsema_port); #endif #if USE_POSIX_SEM /* XXXRW: POSIX semaphores don't support LIFO? */ ret = sem_init(&_dispatch_thread_mediator[i].dsema_sem, 0, 0); - dispatch_assume_zero(ret); + (void)dispatch_assume_zero(ret); #endif #ifdef HAVE_PTHREAD_WORKQUEUES } else { @@ -1163,7 +1163,7 @@ #ifdef HAVE_PTHREAD_WORKQUEUES r = pthread_workqueue_attr_destroy_np(&pwq_attr); - dispatch_assume_zero(r); + (void)dispatch_assume_zero(r); #endif } @@ -1195,7 +1195,7 @@ _dispatch_debug("requesting new worker thread"); r = pthread_workqueue_additem_np(qc->dgq_kworkqueue, _dispatch_worker_thread2, dq, &wh, &gen_cnt); - dispatch_assume_zero(r); + (void)dispatch_assume_zero(r); } else { _dispatch_debug("work thread request still pending on global queue: %p", dq); } @@ -1217,12 +1217,12 @@ while ((r = pthread_create(&pthr, NULL, _dispatch_worker_thread, dq))) { if (r != EAGAIN) { - dispatch_assume_zero(r); + (void)dispatch_assume_zero(r); } sleep(1); } r = pthread_detach(pthr); - dispatch_assume_zero(r); + (void)dispatch_assume_zero(r); out: return false; @@ -1419,9 +1419,9 @@ // workaround tweaks the kernel workqueue does for us r = sigfillset(&mask); - dispatch_assume_zero(r); + (void)dispatch_assume_zero(r); r = _dispatch_pthread_sigmask(SIG_BLOCK, &mask, NULL); - dispatch_assume_zero(r); + (void)dispatch_assume_zero(r); do { _dispatch_worker_thread2(context); @@ -1777,23 +1777,23 @@ /* Workaround: 6269619 Not all signals can be delivered on any thread */ r = sigdelset(set, SIGILL); - dispatch_assume_zero(r); + (void)dispatch_assume_zero(r); r = sigdelset(set, SIGTRAP); - dispatch_assume_zero(r); + (void)dispatch_assume_zero(r); #if HAVE_DECL_SIGEMT r = sigdelset(set, SIGEMT); - dispatch_assume_zero(r); + (void)dispatch_assume_zero(r); #endif r = sigdelset(set, SIGFPE); - dispatch_assume_zero(r); + (void)dispatch_assume_zero(r); r = sigdelset(set, SIGBUS); - dispatch_assume_zero(r); + (void)dispatch_assume_zero(r); r = sigdelset(set, SIGSEGV); - dispatch_assume_zero(r); + (void)dispatch_assume_zero(r); r = sigdelset(set, SIGSYS); - dispatch_assume_zero(r); + (void)dispatch_assume_zero(r); r = sigdelset(set, SIGPIPE); - dispatch_assume_zero(r); + (void)dispatch_assume_zero(r); return pthread_sigmask(how, set, oset); } Modified: trunk/src/queue_kevent.c =================================================================== --- trunk/src/queue_kevent.c 2009-11-02 21:17:40 UTC (rev 89) +++ trunk/src/queue_kevent.c 2009-11-02 22:58:03 UTC (rev 90) @@ -48,7 +48,8 @@ dispatch_assert_zero(errno); } - dispatch_assume_zero(kevent(_dispatch_kq, &kev, 1, NULL, 0, NULL)); + (void)dispatch_assume_zero(kevent(_dispatch_kq, &kev, 1, NULL, 0, + NULL)); _dispatch_queue_push(_dispatch_mgr_q.do_targetq, &_dispatch_mgr_q); } @@ -112,7 +113,7 @@ r = select(FD_SETSIZE, &tmp_rfds, &tmp_wfds, NULL, sel_timeoutp); if (r == -1) { if (errno != EBADF) { - dispatch_assume_zero(errno); + (void)dispatch_assume_zero(errno); continue; } for (i = 0; i < FD_SETSIZE; i++) { @@ -166,7 +167,7 @@ if (k_err == EBADF) { DISPATCH_CLIENT_CRASH("Do not close random Unix descriptors"); } - dispatch_assume_zero(k_err); + (void)dispatch_assume_zero(k_err); continue; default: _dispatch_mgr_thread2(kev, (size_t)k_cnt); @@ -225,7 +226,7 @@ if (rval == -1) { // If we fail to register with kevents, for other reasons aside from // changelist elements. - dispatch_assume_zero(errno); + (void)dispatch_assume_zero(errno); //kev_copy.flags |= EV_ERROR; //kev_copy.data = error; return; Modified: trunk/src/semaphore.c =================================================================== --- trunk/src/semaphore.c 2009-11-02 21:17:40 UTC (rev 89) +++ trunk/src/semaphore.c 2009-11-02 22:58:03 UTC (rev 90) @@ -109,7 +109,7 @@ dsema->dsema_orig = value; #if USE_POSIX_SEM ret = sem_init(&dsema->dsema_sem, 0, 0); - dispatch_assume_zero(ret); + (void)dispatch_assume_zero(ret); #endif } Modified: trunk/src/shims/time.h =================================================================== --- trunk/src/shims/time.h 2009-11-02 21:17:40 UTC (rev 89) +++ trunk/src/shims/time.h 2009-11-02 22:58:03 UTC (rev 90) @@ -50,7 +50,7 @@ #else #error "clock_gettime: no supported absolute time clock" #endif - dispatch_assume_zero(ret); + (void)dispatch_assume_zero(ret); /* XXXRW: Some kind of overflow detection needed? */ return (ts.tv_sec * NSEC_PER_SEC + ts.tv_nsec); Modified: trunk/src/source.c =================================================================== --- trunk/src/source.c 2009-11-02 21:17:40 UTC (rev 89) +++ trunk/src/source.c 2009-11-02 22:58:03 UTC (rev 90) @@ -461,14 +461,14 @@ c = accept(fd, &sa, &sa_len); if (c == -1) { if (errno != EAGAIN) { - dispatch_assume_zero(errno); + (void)dispatch_assume_zero(errno); } return; } #if 0 int r = fcntl(c, F_SETFL, 0); // disable non-blocking IO if (r == -1) { - dispatch_assume_zero(errno); + (void)dispatch_assume_zero(errno); } #endif debug_stream = fdopen(c, "a"); @@ -542,34 +542,34 @@ } fd = socket(PF_INET, SOCK_STREAM, 0); if (fd == -1) { - dispatch_assume_zero(errno); + (void)dispatch_assume_zero(errno); return; } r = setsockopt(fd, SOL_SOCKET, SO_REUSEADDR, (void *)&sock_opt, (socklen_t) sizeof sock_opt); if (r == -1) { - dispatch_assume_zero(errno); + (void)dispatch_assume_zero(errno); goto out_bad; } #if 0 r = fcntl(fd, F_SETFL, O_NONBLOCK); if (r == -1) { - dispatch_assume_zero(errno); + (void)dispatch_assume_zero(errno); goto out_bad; } #endif r = bind(fd, &sa_u.sa, sizeof(sa_u)); if (r == -1) { - dispatch_assume_zero(errno); + (void)dispatch_assume_zero(errno); goto out_bad; } r = listen(fd, SOMAXCONN); if (r == -1) { - dispatch_assume_zero(errno); + (void)dispatch_assume_zero(errno); goto out_bad; } r = getsockname(fd, &sa_u.sa, &slen); if (r == -1) { - dispatch_assume_zero(errno); + (void)dispatch_assume_zero(errno); goto out_bad; } ds = dispatch_source_read_create_f(fd, NULL, &_dispatch_mgr_q, (void *)(long)fd, _dispatch_kevent_debugger2); @@ -698,7 +698,7 @@ ke = &fake; } else { // log the unexpected error - dispatch_assume_zero(ke->data); + (void)dispatch_assume_zero(ke->data); return; } } @@ -1666,13 +1666,13 @@ kr = mach_port_allocate(mach_task_self(), MACH_PORT_RIGHT_PORT_SET, &_dispatch_port_set); DISPATCH_VERIFY_MIG(kr); - dispatch_assume_zero(kr); + (void)dispatch_assume_zero(kr); kr = mach_port_allocate(mach_task_self(), MACH_PORT_RIGHT_RECEIVE, &_dispatch_event_port); DISPATCH_VERIFY_MIG(kr); - dispatch_assume_zero(kr); + (void)dispatch_assume_zero(kr); kr = mach_port_move_member(mach_task_self(), _dispatch_event_port, _dispatch_port_set); DISPATCH_VERIFY_MIG(kr); - dispatch_assume_zero(kr); + (void)dispatch_assume_zero(kr); kev.ident = _dispatch_port_set; @@ -1721,7 +1721,7 @@ // They should adopt libdispatch :-P kr = mach_port_deallocate(mach_task_self(), previous); DISPATCH_VERIFY_MIG(kr); - dispatch_assume_zero(kr); + (void)dispatch_assume_zero(kr); } } } @@ -1744,7 +1744,7 @@ // log the error } else if (previous) { // the kernel has not consumed the right yet - dispatch_assume_zero(_dispatch_send_consume_send_once_right(previous)); + (void)dispatch_assume_zero(_dispatch_send_consume_send_once_right(previous)); } } } @@ -1765,7 +1765,7 @@ #endif break; default: - dispatch_assume_zero(kr); + (void)dispatch_assume_zero(kr); } } @@ -1787,7 +1787,7 @@ case 0: break; default: - dispatch_assume_zero(kr); + (void)dispatch_assume_zero(kr); break; } } @@ -1873,10 +1873,10 @@ { kern_return_t kr; // this function should never be called - dispatch_assume_zero(name); + (void)dispatch_assume_zero(name); kr = mach_port_mod_refs(mach_task_self(), name, MACH_PORT_RIGHT_RECEIVE, -1); DISPATCH_VERIFY_MIG(kr); - dispatch_assume_zero(kr); + (void)dispatch_assume_zero(kr); return KERN_SUCCESS; } @@ -1884,7 +1884,7 @@ _dispatch_mach_notify_no_senders(mach_port_t notify, mach_port_mscount_t mscnt __attribute__((unused))) { // this function should never be called - dispatch_assume_zero(notify); + (void)dispatch_assume_zero(notify); return KERN_SUCCESS; } @@ -1929,7 +1929,7 @@ // the act of receiving a dead name notification allocates a dead-name right that must be deallocated kr = mach_port_deallocate(mach_task_self(), name); DISPATCH_VERIFY_MIG(kr); - //dispatch_assume_zero(kr); + //(void)dispatch_assume_zero(kr); return KERN_SUCCESS; } @@ -1995,7 +1995,7 @@ case MACH_RCV_INVALID_NAME: break; default: - dispatch_assume_zero(kr); + (void)dispatch_assume_zero(kr); break; } break; Modified: trunk/src/time.c =================================================================== --- trunk/src/time.c 2009-11-02 21:17:40 UTC (rev 89) +++ trunk/src/time.c 2009-11-02 22:58:03 UTC (rev 90) @@ -45,7 +45,8 @@ static void _dispatch_get_host_time_init(void *context __attribute__((unused))) { - dispatch_assume_zero(mach_timebase_info(&_dispatch_host_time_data.tbi)); + (void)dispatch_assume_zero(mach_timebase_info( + &_dispatch_host_time_data.tbi)); _dispatch_host_time_data.safe_numer_math = DISPATCH_TIME_FOREVER / _dispatch_host_time_data.tbi.numer; }