--- rpl/src/rpl.h	2019/02/03 14:41:28	1.326
+++ rpl/src/rpl.h	2019/02/06 14:23:26	1.327
@@ -397,18 +397,16 @@ union semun
 #		define sem_wait(a) ({ int value; sem_getvalue(a, &value); \
 				uprintf("[%d-%llu] Semaphore %s (%p) "\
 				"waiting at %s() " \
-				"line #%d\n", (int) getpid(), (unsigned long long) i\
+				"line #%d <%d>\n", (int) getpid(), (unsigned long long) i\
 						pthread_self(), \
-				#a, a, __FUNCTION__, __LINE__), fflush(stdout); \
-				if (value > 1) BUG(1, uprintf("Value %d\n", value)); \
+				#a, a, __FUNCTION__, __LINE__, value), fflush(stdout); \
 				sem_wait_SysV(a); })
 #	define sem_post(a) ({ int value; sem_getvalue(a, &value); \
 				uprintf("[%d-%llu] Semaphore %s (%p) "\
 				"posting at %s() " \
-				"line #%d\n", (int) getpid(), (unsigned long long) \
+				"line #%d <%d>\n", (int) getpid(), (unsigned long long) \
 						pthread_self(), \
-				#a, a, __FUNCTION__, __LINE__), fflush(stdout); \
-				if (value > 0) BUG(1, uprintf("Value %d\n", value)); \
+				#a, a, __FUNCTION__, __LINE__, value), fflush(stdout); \
 				sem_post_SysV(a); })
 #	define sem_destroy(a) ({ int value; sem_getvalue(a, &value); \
 				if (value == 0) BUG(1, uprintf("Value %d\n", value)); \
@@ -431,17 +429,17 @@ union semun
 #		define sem_wait(a) ({ int value; sem_getvalue(a, &value); \
 				uprintf("[%d-%llu] Semaphore %s (%p) "\
 				"waiting at %s() " \
-				"line #%d\n", (int) getpid(), (unsigned long long) \
+				"line #%d <%d>\n", (int) getpid(), (unsigned long long) \
 						pthread_self(), \
-				#a, a, __FUNCTION__, __LINE__), fflush(stdout); \
-				if (value > 1) BUG(1, uprintf("Value %d\n", value)); sem_wait(a); })
+				#a, a, __FUNCTION__, __LINE__, value), fflush(stdout); \
+				sem_wait(a); })
 #		define sem_post(a) ({ int value; sem_getvalue(a, &value); \
 				uprintf("[%d-%llu] Semaphore %s (%p) "\
 				"posting at %s() " \
-				"line #%d\n", (int) getpid(), (unsigned long long) \
+				"line #%d <%d>\n", (int) getpid(), (unsigned long long) \
 						pthread_self(), \
-				#a, a, __FUNCTION__, __LINE__), fflush(stdout); \
-				if (value > 0) BUG(1, uprintf("Value %d\n", value)); sem_post(a); })
+				#a, a, __FUNCTION__, __LINE__, value), fflush(stdout); \
+				sem_post(a); })
 #		define sem_destroy(a) ({ int value; sem_getvalue(a, &value); \
 				if (value == 0) BUG(1, uprintf("Value %d\n", value)); \
 				sem_destroy(a); })