Merge pull request #57 from frankeh/master

fix timebase used in _dispatch_semaphore_wait_slow leading to infinit…

Author: MadCoder

src/semaphore.c

@@ -380,7 +380,7 @@ _dispatch_semaphore_wait_slow(dispatch_semaphore_t dsema,
 		}
 #elif USE_FUTEX_SEM
 		do {
-			uint64_t nsec = _dispatch_time_to_nanoseconds(timeout);
+			uint64_t nsec = _dispatch_timeout(timeout);
 			_timeout.tv_sec = (typeof(_timeout.tv_sec))(nsec / NSEC_PER_SEC);
 			_timeout.tv_nsec = (typeof(_timeout.tv_nsec))(nsec % NSEC_PER_SEC);
 			ret = slowpath(_dispatch_futex_wait(&dsema->dsema_futex, &_timeout));
@@ -645,10 +645,9 @@ _dispatch_group_wait_slow(dispatch_semaphore_t dsema, dispatch_time_t timeout)
 		}
 #elif USE_FUTEX_SEM
 		do {
-			// HF: check whether we need same timer as POSIX_SEM
 			uint64_t nsec = _dispatch_timeout(timeout);
-			_timeout.tv_sec = nsec / NSEC_PER_SEC;
-			_timeout.tv_nsec = nsec % NSEC_PER_SEC;
+			_timeout.tv_sec = (typeof(_timeout.tv_sec))(nsec / NSEC_PER_SEC);
+			_timeout.tv_nsec = (typeof(_timeout.tv_nsec))(nsec % NSEC_PER_SEC);
 			ret = slowpath(_dispatch_futex_wait(&dsema->dsema_futex, &_timeout));
 		} while (ret == false && errno == EINTR);