Rework delay checking, use it for net_Accept, add deadline checks

diff --git a/include/vlc_mtime.h b/include/vlc_mtime.h
index 08262a75f8b7739989d1518759e6d97901614d6f..e51c639813068731612df4baf83110a10481a686 100644 (file)
--- a/include/vlc_mtime.h
+++ b/include/vlc_mtime.h
@@ -80,31 +80,49 @@ static
 __attribute__((unused))
 __attribute__((noinline))
 __attribute__((error("sorry, cannot sleep for such short a time")))
-void impossible_msleep( mtime_t delay )
+mtime_t impossible_delay( mtime_t delay )
 {
     (void) delay;
-    msleep( VLC_HARD_MIN_SLEEP );
+    return VLC_HARD_MIN_SLEEP;
 }
 
 static
 __attribute__((unused))
 __attribute__((noinline))
-__attribute__((warning("use proper event handling instead")))
-void bad_msleep( mtime_t delay )
+__attribute__((warning("use proper event handling instead of short delay")))
+mtime_t harmful_delay( mtime_t delay )
 {
-    msleep( delay );
+    return delay;
 }
 
-# define msleep( d ) \
+# define check_delay( d ) \
     ((__builtin_constant_p(d < VLC_HARD_MIN_SLEEP) \
    && (d < VLC_HARD_MIN_SLEEP)) \
-       ? impossible_msleep(d) \
+       ? impossible_delay(d) \
        : ((__builtin_constant_p(d < VLC_SOFT_MIN_SLEEP) \
        && (d < VLC_SOFT_MIN_SLEEP)) \
-           ? bad_msleep(d) \
-           : msleep(d)))
+           ? harmful_delay(d) \
+           : d))
+
+static
+__attribute__((unused))
+__attribute__((noinline))
+__attribute__((error("deadlines can not be constant")))
+mtime_t impossible_deadline( mtime_t deadline )
+{
+    return deadline;
+}
+
+# define check_deadline( d ) \
+    (__builtin_constant_p(d) ? impossible_deadline(d) : d)
+#else
+# define check_delay(d) (d)
+# define check_deadline(d) (d)
 #endif
 
+#define msleep(d) msleep(check_delay(d))
+#define mwait(d) mwait(check_deadline(d))
+
 /*****************************************************************************
  * date_t: date incrementation without long-term rounding errors
  *****************************************************************************/

diff --git a/include/vlc_network.h b/include/vlc_network.h
index 5c4b1dcf780f119694c8b8556c5120777bdf4d3a..d32cf5c2224d7e8e1308646e45b9c21c03574b3d 100644 (file)
--- a/include/vlc_network.h
+++ b/include/vlc_network.h
@@ -107,8 +107,9 @@ static inline int __net_ConnectTCP (vlc_object_t *obj, const char *host, int por
 
 VLC_EXPORT( int, net_AcceptSingle, (vlc_object_t *obj, int lfd) );
 
-#define net_Accept(a, b, c) __net_Accept(VLC_OBJECT(a), b, c)
 VLC_EXPORT( int, __net_Accept, ( vlc_object_t *, int *, mtime_t ) );
+#define net_Accept(a, b, c) \
+      __net_Accept(VLC_OBJECT(a), b, c ? check_delay(c) : 0)
 
 #define net_ConnectDgram(a, b, c, d, e ) __net_ConnectDgram(VLC_OBJECT(a), b, c, d, e)
 VLC_EXPORT( int, __net_ConnectDgram, ( vlc_object_t *p_this, const char *psz_host, int i_port, int hlim, int proto ) );

diff --git a/include/vlc_objects.h b/include/vlc_objects.h
index bf568ed474f89312c76c9f10544bbe30c1e358fa..67f26da1f7f8849e7a3a08cfbbb5a4c19f483d60 100644 (file)
--- a/include/vlc_objects.h
+++ b/include/vlc_objects.h
@@ -139,7 +139,7 @@ VLC_EXPORT( void, __vlc_object_wait, ( vlc_object_t * ) );
 
 VLC_EXPORT( int, __vlc_object_timedwait, ( vlc_object_t *, mtime_t ) );
 #define vlc_object_timedwait( obj, d ) \
-    __vlc_object_timedwait( VLC_OBJECT( obj ), d )
+    __vlc_object_timedwait( VLC_OBJECT( obj ), check_deadline(d) )
 
 VLC_EXPORT( void, __vlc_object_signal_unlocked, ( vlc_object_t * ) );
 #define vlc_object_signal_unlocked( obj ) \

diff --git a/include/vlc_threads.h b/include/vlc_threads.h
index 3afadfadf41e8d78b16b4269cf46a5137d15fb91..392db0686518510d419d3a3974c4b752caa506d5 100644 (file)
--- a/include/vlc_threads.h
+++ b/include/vlc_threads.h
@@ -411,8 +411,8 @@ static inline void __vlc_cond_wait( const char * psz_file, int i_line,
  *****************************************************************************
  * Returns 0 if object signaled, an error code in case of timeout or error.
  *****************************************************************************/
-#define vlc_cond_timedwait( P_COND, P_MUTEX, DEADLINE )                      \
-    __vlc_cond_timedwait( __FILE__, __LINE__, P_COND, P_MUTEX, DEADLINE  )
+#define vlc_cond_timedwait( c, m, d ) \
+    __vlc_cond_timedwait( __FILE__, __LINE__, c, m, check_deadline(d) )
 
 static inline int __vlc_cond_timedwait( const char * psz_file, int i_line,
                                         vlc_cond_t *p_condvar,

diff --git a/src/misc/mtime.c b/src/misc/mtime.c
index afa5705c7ac7663def4e8daf92d399517d3d277d..37a28f928b9474cd001673b8b32b228f1536d596 100644 (file)
--- a/src/misc/mtime.c
+++ b/src/misc/mtime.c
@@ -314,6 +314,7 @@ mtime_t mdate( void )
     return res;
 }
 
+#undef mwait
 /**
  * Wait for a date
  *