UST_REGISTER_TIMEOUT 0 and 1 change (follow poll() timeout)

0 now means "don't wait" and -1 "wait forever".

Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>

diff --git a/README b/README
index 399263d5e1e8faf8807f84e1b98c33acb36e0fe4..635f9c1b482a2854788866a20acefee375c68c28 100644 (file)
--- a/README
+++ b/README
@@ -55,8 +55,8 @@ ENVIRONMENT VARIABLES:
     specify how long the applications should wait for sessiond
     "registration done" command before proceeding to execute the main
     program. The default is 3000ms (3 seconds). The timeout value is
     specify how long the applications should wait for sessiond
     "registration done" command before proceeding to execute the main
     program. The default is 3000ms (3 seconds). The timeout value is

-    specified in milliseconds. The value -1 means "don't wait". The value
-    0 means "wait forever".
+    specified in milliseconds. The value 0 means "don't wait". The value
+    -1 means "wait forever".

 
 
 TRACE VIEWER:
 
 
 TRACE VIEWER:

diff --git a/libust/lttng-ust-comm.c b/libust/lttng-ust-comm.c
index 8f0cb85b95d2074c1ff2c362e69ce3de1eb7e994..1496408f12356d382567f13fe25ea527fb178a72 100644 (file)
--- a/libust/lttng-ust-comm.c
+++ b/libust/lttng-ust-comm.c
@@ -424,11 +424,11 @@ void __attribute__((constructor)) lttng_ust_comm_init(void)
                        assert(!ret);
                }
                break;
                        assert(!ret);
                }
                break;

-       case 0: /* wait forever */
+       case -1:/* wait forever */

                ret = sem_wait(&constructor_wait);
                assert(!ret);
                break;
                ret = sem_wait(&constructor_wait);
                assert(!ret);
                break;

-       case -1:/* no timeout */
+       case 0: /* no timeout */

                break;
        }
        pthread_mutex_unlock(&lttng_ust_comm_mutex);
                break;
        }
        pthread_mutex_unlock(&lttng_ust_comm_mutex);