Changeset e8d03d1408b0cf0b7490a4889551a0531af5e2af

Timestamp:

01/10/07 20:04:10 (1 year ago)

Author:

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

git-committer:

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

git-parent:

[4f8856eeb7e633ee66a0e56a191ba43cc20a705d]

git-author:

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

Message:

Removed b_die arbitrary timer from httpd.

Files:

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

src/network/httpd.c

@@ -2016 +2016 @@
-    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 );
-
-
+
+
+
-    {
-        if( host->i_url <= 0 )
-        {
-
+(FIXME: use a condition variable) 
-            msleep( 200000 );
-            continue;
@@ -2030 +2031 @@
-            p_tls = tls_ServerSessionPrepare( host->p_tls );
-
-
+ + 1
-        unsigned nfd;
-        for( nfd = 0; nfd < host->nfd; nfd++ )
@@ -2400 +2401 @@
-                    cl->i_state = HTTPD_CLIENT_SENDING;
-                }
-                else
-                {
-                    /* we shouldn't wait too long */
-                    b_low_delay = VLC_TRUE;
-                }
-            }
-
@@ -2416 +2412 @@
-            if (pufd->events != 0)
-                nfd++;
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-        vlc_mutex_unlock( &host->lock );
-
-100ms or 20ms (not too big 'cause HTTPD_CLIENT_WAITING)
-100
+20ms (not too big) if HTTPD_CLIENT_WAITING
+-1
-        {
-            case -1:
-                if (errno != EINTR)
-                {
-This is most likely a bug
+Kernel on low memory or a bug: pace
-                    msg_Err( host, "polling error: %m" );
-
+00
-                }
-            case 0:
-                continue;
-        }
+
+        vlc_object_lock( host );
+        if( ( evfd != -1 ) && ( ufd[nfd - 1].revents ) )
+            b_die = vlc_object_wait( host );
+        vlc_object_unlock( host );
-
-        /* Handle client sockets */