Changeset c887fde77c277647250c783fcb921a15a708f844

Timestamp:

01/10/07 20:11:03 (1 year ago)

Author:

Rémi Denis-Courmont <rem@videolan.org>

git-committer:

Rémi Denis-Courmont <rem@videolan.org> 1191262263 +0000

git-parent:

[e8d03d1408b0cf0b7490a4889551a0531af5e2af]

git-author:

Rémi Denis-Courmont <rem@videolan.org> 1191262263 +0000

Message:

Cleanup previous commit

Files:

• src/network/httpd.c (modified) (4 diffs)

src/network/httpd.c

@@ -1063 +1063 @@
-        goto error;
-
+    vlc_object_lock( host );
+    if( vlc_object_waitpipe( host ) == -1 )
+    {
+        vlc_object_unlock( host );
+        goto error;
+    }
+    vlc_object_unlock( host );
+
-    host->httpd = httpd;
-    vlc_mutex_init( httpd, &host->lock );
@@ -2016 +2024 @@
-    counter_t *p_total_counter = stats_CounterCreate( host, VLC_VAR_INTEGER, STATS_COUNTER );
-    counter_t *p_active_counter = stats_CounterCreate( host, VLC_VAR_INTEGER, STATS_COUNTER );
+    int evfd;
-    vlc_bool_t b_die = VLC_FALSE;
+
+    vlc_object_lock( host );
+    evfd = vlc_object_waitpipe( host );
+    vlc_object_unlock( host );
-
-    while( !b_die )
@@ -2415 +2428 @@
-                b_low_delay = VLC_TRUE;
-        }
-
-        vlc_object_lock( host );
-        int evfd = ufd[nfd].fd = vlc_object_waitpipe( host );
-        if( ufd[nfd].fd != -1 )
-        {
-            ufd[nfd].events = POLLIN;
-            ufd[nfd].revents = 0;
-            nfd++;
-        }
-        vlc_object_unlock( host );
-        vlc_mutex_unlock( &host->lock );
+
+        ufd[nfd].fd = evfd;
+        ufd[nfd].events = POLLIN;
+        ufd[nfd].revents = 0;
+        nfd++;
-
-        /* we will wait 20ms (not too big) if HTTPD_CLIENT_WAITING */
@@ -2442 +2450 @@
-
-        vlc_object_lock( host );
-( evfd != -1 ) && ( ufd[nfd - 1].revents )
+ufd[nfd - 1].revents
-            b_die = vlc_object_wait( host );
-        vlc_object_unlock( host );