Changeset e516ddb1ca69202f576d6e7020c9f9b2c90b8890

Timestamp:

07/09/08 11:09:18 (3 months ago)

Author:

Rémi Denis-Courmont <rdenis@simphalempin.com>

git-committer:

Rémi Denis-Courmont <rdenis@simphalempin.com> 1220778558 +0300

git-parent:

[6db8a5e028fd4e7d97b95c7b945c13230f15a40b]

git-author:

Rémi Denis-Courmont <rdenis@simphalempin.com> 1220778558 +0300

Message:

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

Files:

• include/vlc_mtime.h (modified) (2 diffs)
• include/vlc_network.h (modified) (1 diff)
• include/vlc_objects.h (modified) (1 diff)
• include/vlc_threads.h (modified) (1 diff)
• src/misc/mtime.c (modified) (1 diff)

include/vlc_mtime.h

@@ -81 +81 @@
-__attribute__((noinline))
-__attribute__((error("sorry, cannot sleep for such short a time")))
-void impossible_msleep
+mtime_t impossible_delay
-{
-    (void) delay;
-msleep( VLC_HARD_MIN_SLEEP )
+return VLC_HARD_MIN_SLEEP
-}
-
@@ -90 +90 @@
-__attribute__((unused))
-__attribute__((noinline))
-
-void bad_msleep
+ of short delay
+mtime_t harmful_delay
-{
-msleep( delay )
+return delay
-}
-
-msleep
+check_delay
-    ((__builtin_constant_p(d < VLC_HARD_MIN_SLEEP) \
-   && (d < VLC_HARD_MIN_SLEEP)) \
-msleep
+delay
-       : ((__builtin_constant_p(d < VLC_SOFT_MIN_SLEEP) \
-       && (d < VLC_SOFT_MIN_SLEEP)) \
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-#endif
+
+#define msleep(d) msleep(check_delay(d))
+#define mwait(d) mwait(check_deadline(d))
-
-/*****************************************************************************

include/vlc_network.h

@@ -108 +108 @@
-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)

include/vlc_objects.h

@@ -140 +140 @@
-VLC_EXPORT( int, __vlc_object_timedwait, ( vlc_object_t *, mtime_t ) );
-#define vlc_object_timedwait( obj, d ) \
-d
+check_deadline(d)
-
-VLC_EXPORT( void, __vlc_object_signal_unlocked, ( vlc_object_t * ) );

include/vlc_threads.h

@@ -412 +412 @@
- * Returns 0 if object signaled, an error code in case of timeout or error.
- *****************************************************************************/
-P_COND, P_MUTEX, DEADLINE )                     
-P_COND, P_MUTEX, DEADLINE 
+c, m, d )
+c, m, check_deadline(d)
-
-static inline int __vlc_cond_timedwait( const char * psz_file, int i_line,

src/misc/mtime.c

@@ -315 +315 @@
-}
-
+#undef mwait
-/**
- * Wait for a date