Changeset 6283c63bb120fef59d85d0f8fbf16d89c6c99224

Timestamp:

27/02/03 16:07:48 (6 years ago)

Author:

Laurent Aimar <fenrir@videolan.org>

git-committer:

Laurent Aimar <fenrir@videolan.org> 1046358468 +0000

git-parent:

[e853c4ee5d5caf4e7cbb70359385c89df1f6bf7d]

git-author:

Laurent Aimar <fenrir@videolan.org> 1046358468 +0000

Message:

• httpd: clean up, kick up unused connection (it waits 10s), use select
  

to way (instead of a hard coded sleep ;)

Files:

• modules/misc/httpd.c (modified) (13 diffs)

modules/misc/httpd.c

@@ -3 +3 @@
- *****************************************************************************
- * Copyright (C) 2001-2003 VideoLAN
-3 2003/02/25 17:17:43
+4 2003/02/27 15:07:48
- *
- * Authors: Laurent Aimar <fenrir@via.ecp.fr>
@@ -26 +26 @@
- *****************************************************************************/
-#include <stdlib.h>
+
+#include <sys/time.h>
-#include <sys/types.h>
-#include <sys/stat.h>
+
-#include <string.h>
-#include <errno.h>
@@ -67 +70 @@
-#endif
-
-
-1024
-
+        
+512
+
-
-#define FREE( p ) if( p ) { free( p); (p) = NULL; }
@@ -176 +179 @@
-    struct httpd_connection_s *p_prev;
-
-
-
+
+
+
-
-    int    i_state;
@@ -958 +962 @@
-    p += sprintf( p, "<h2><center>Admin page</center></h2>\n" );
-
+    /* general */
+    p += sprintf( p, "<h3>General state</h3>\n" );
+    p += sprintf( p, "<ul>\n" );
+    p += sprintf( p, "<li>Connection count: %d</li>\n", p_httpt->i_connection_count );
+    //p += sprintf( p, "<li>Total bandwith: %d</li>\n", -1 );
+    /*p += sprintf( p, "<li></li>\n" );*/
+    p += sprintf( p, "</ul>\n" );
-    /* host list */
-    vlc_mutex_lock( &p_httpt->host_lock );
@@ -1054 +1065 @@
-    p_con->i_state  = HTTPD_CONNECTION_RECEIVING_REQUEST;
-    p_con->fd       = fd;
+    p_con->i_last_activity_date = mdate();
+
-    p_con->sock     = *p_sock;
-    p_con->psz_file = NULL;
@@ -1403 +1416 @@
-
-    httpd_connection_t *p_con;
-    vlc_bool_t         b_wait;
-
-    msg_Info( p_httpt, "httpd started" );
@@ -1425 +1437 @@
-    while( !p_httpt->b_die )
-    {
+        struct timeval  timeout;
+        fd_set          fds_read;
+        fd_set          fds_write;
+        int             i_handle_max = 0;
+        int             i_ret;
-        int i;
-        if( p_httpt->i_host_count <= 0 )
@@ -1431 +1448 @@
-            continue;
-        }
+
+        /* we will create a socket set with host and connection */
+        FD_ZERO( &fds_read );
+        FD_ZERO( &fds_write );
+
+        vlc_mutex_lock( &p_httpt->host_lock );
+        vlc_mutex_lock( &p_httpt->connection_lock );
+        for( i = 0; i < p_httpt->i_host_count; i++ )
+        {
+            FD_SET( p_httpt->host[i]->fd, &fds_read );
+            i_handle_max = __MAX( i_handle_max, p_httpt->host[i]->fd );
+        }
+        for( p_con = p_httpt->p_first_connection; p_con != NULL; )
+        {
+            /* no more than 10s of inactivity */
+            if( p_con->i_last_activity_date + (mtime_t)HTTPD_CONNECTION_MAX_UNUSED < mdate() )
+            {
+                httpd_connection_t *p_next = p_con->p_next;
+
+                msg_Dbg( p_httpt,  "close unused connection" );
+                httpd_ConnnectionClose( p_httpt, p_con );
+                p_con = p_next;
+                continue;
+            }
+
+            if( p_con->i_state == HTTPD_CONNECTION_SENDING_STREAM && p_con->i_stream_pos + HTTPD_STREAM_PACKET >= p_con->p_file->i_buffer_pos )
+            {
+                p_con = p_con->p_next;
+                continue;
+            }
+
+            if( p_con->i_state == HTTPD_CONNECTION_RECEIVING_REQUEST )
+            {
+                FD_SET( p_con->fd, &fds_read );
+            }
+            else
+            {
+                FD_SET( p_con->fd, &fds_write );
+            }
+            i_handle_max = __MAX( i_handle_max, p_con->fd );
+
+            p_con = p_con->p_next;
+        }
+        vlc_mutex_unlock( &p_httpt->host_lock );
+        vlc_mutex_unlock( &p_httpt->connection_lock );
+
+        /* we will wait 0.5s */
+        timeout.tv_sec = 0;
+        timeout.tv_usec = 500*1000;
+
+        i_ret = select( i_handle_max + 1, 
+                        &fds_read,
+                        &fds_write,
+                        NULL,
+                        &timeout );
+        if( i_ret == -1 && errno != EINTR )
+        {
+            msg_Warn( p_httpt, "cannot select sockets" );
+            msleep( 1000 );
+            continue;
+        }
+        if( i_ret <= 0 )
+        {
+//            msg_Dbg( p_httpt, "waiting..." );
+            continue;
+        }
+
-        vlc_mutex_lock( &p_httpt->host_lock );
-        /* accept/refuse new connection */
@@ -1488 +1572 @@
-                {
-                    uint8_t *ptr;
-
+
-                    p_con->i_buffer += i_len;
-
@@ -1528 +1612 @@
-                else if( i_len > 0 )
-                {
+                    p_con->i_last_activity_date = mdate();
-                    p_con->i_buffer += i_len;
-
@@ -1610 +1695 @@
-                    else if( i_send > 0 )
-                    {
+                        p_con->i_last_activity_date = mdate();
-                        p_con->i_stream_pos += i_send;
-                    }
@@ -1623 +1709 @@
-        }   /* for over connection */
-
-#if 0
-        b_wait = VLC_TRUE;
-        /* update position for stream based file */
-        for( i = 0; i < p_httpt->i_file_count; i++ )
-        {
-            if( p_httpt->file[i]->b_stream )
-            {
-                p_httpt->file[i]->i_buffer += __MIN( p_httpt->file[i]->i_buffer_valid - p_httpt->file[i]->i_buffer,
-                                                     HTTPD_STREAM_PACKET );
-                if( p_httpt->file[i]->i_buffer < p_httpt->file[i]->i_buffer_valid )
-                {
-                    /* there is data */
-                    b_wait = VLC_FALSE;
-                }
-            }
-        }
-#endif
-        vlc_mutex_unlock( &p_httpt->file_lock );
-        /*if( b_wait )*/ msleep( 10 );
-    }
-    msg_Info( p_httpt, "httpd stopped" );