Project: Icecast

Revision: 15124

Author: karl

Date: 21 Jul 2008 22:37:32

• /icecast/trunk/icecast/src/fserve.c

  ......	@@ -29,12 +29,14 @@
  29	29	#include <unistd.h>
  30	30	#include <sys/time.h>
  31	31	#include <sys/socket.h>
  	32	#define SCN_OFF_T SCNdMAX
  	33	#define PRI_OFF_T PRIdMAX
  32	34	#else
  33	35	#include <winsock2.h>
  34	36	#include <windows.h>
  35	37	#define fseeko fseek
  36		#define PRIdMAX "ld"
  37		#define SCNdMAX "ld"
  	38	#define SCN_OFF_T "ld"
  	39	#define PRI_OFF_T "ld"
  38	40	#define snprintf _snprintf
  39	41	#define strncasecmp _strnicmp
  40	42	#define S_ISREG(mode) ((mode) & _S_IFREG)
  ......	@@ -70,8 +72,7 @@
  70	72	static mutex_t pending_lock;
  71	73	static avl_tree *mimetypes = NULL;
  72	74
  73		static thread_type *fserv_thread;
  74		static int run_fserv = 0;
  	75	static volatile int run_fserv = 0;
  75	76	static unsigned int fserve_clients;
  76	77	static int client_tree_changed=0;
  77	78
  ......	@@ -101,23 +102,34 @@
  101	102	fserve_recheck_mime_types (config);
  102	103	config_release_config();
  103	104
  104		run_fserv = 1;
  105	105	stats_event (NULL, "file_connections", "0");
  106
  107		fserv_thread = thread_create("File Serving Thread",
  108		fserv_thread_function, NULL, THREAD_ATTACHED);
  	106	INFO0("file serving started");
  109	107	}
  110	108
  111	109	void fserve_shutdown(void)
  112	110	{
  113		if(!run_fserv)
  114		return;
  115
  	111	thread_mutex_lock (&pending_lock);
  116	112	run_fserv = 0;
  117		thread_join(fserv_thread);
  118		INFO0("file serving thread stopped");
  	113	while (pending_list)
  	114	{
  	115	fserve_t *to_go = (fserve_t *)pending_list;
  	116	pending_list = to_go->next;
  	117
  	118	fserve_client_destroy (to_go);
  	119	}
  	120	while (active_list)
  	121	{
  	122	fserve_t *to_go = active_list;
  	123	active_list = to_go->next;
  	124	fserve_client_destroy (to_go);
  	125	}
  	126
  119	127	if (mimetypes)
  120	128	avl_tree_free (mimetypes, _delete_mapping);
  	129
  	130	thread_mutex_unlock (&pending_lock);
  	131	thread_mutex_destroy (&pending_lock);
  	132	INFO0("file serving stopped");
  121	133	}
  122	134
  123	135	#ifdef HAVE_POLL
  ......	@@ -142,7 +154,12 @@
  142	154	}
  143	155	}
  144	156	if (!ufds)
  145		thread_sleep(200000);
  	157	{
  	158	thread_mutex_lock (&pending_lock);
  	159	run_fserv = 0;
  	160	thread_mutex_unlock (&pending_lock);
  	161	return -1;
  	162	}
  146	163	else if (poll(ufds, fserve_clients, 200) > 0)
  147	164	{
  148	165	/* mark any clients that are ready */
  ......	@@ -178,7 +195,12 @@
  178	195	}
  179	196	/* hack for windows, select needs at least 1 descriptor */
  180	197	if (fd_max == SOCK_ERROR)
  181		thread_sleep (200000);
  	198	{
  	199	thread_mutex_lock (&pending_lock);
  	200	run_fserv = 0;
  	201	thread_mutex_unlock (&pending_lock);
  	202	return -1;
  	203	}
  182	204	else
  183	205	{
  184	206	struct timeval tv;
  ......	@@ -204,8 +226,10 @@
  204	226	}
  205	227	#endif
  206	228
  207		static void wait_for_fds(void) {
  	229	static int wait_for_fds(void)
  	230	{
  208	231	fserve_t *fclient;
  	232	int ret;
  209	233
  210	234	while (run_fserv)
  211	235	{
  ......	@@ -228,9 +252,11 @@
  228	252	thread_mutex_unlock (&pending_lock);
  229	253	}
  230	254	/* drop out of here if someone is ready */
  231		if (fserve_client_waiting())
  232		break;
  	255	ret = fserve_client_waiting();
  	256	if (ret)
  	257	return ret;
  233	258	}
  	259	return -1;
  234	260	}
  235	261
  236	262	static void *fserv_thread_function(void *arg)
  ......	@@ -238,9 +264,10 @@
  238	264	fserve_t *fclient, **trail;
  239	265	size_t bytes;
  240	266
  241		INFO0("file serving thread started");
  242		while (run_fserv) {
  243		wait_for_fds();
  	267	while (1)
  	268	{
  	269	if (wait_for_fds() < 0)
  	270	break;
  244	271
  245	272	fclient = active_list;
  246	273	trail = &active_list;
  ......	@@ -515,7 +542,7 @@
  515	542	if (range != NULL) {
  516	543	ret = 0;
  517	544	if (strncasecmp (range, "bytes=", 6) == 0)
  518		ret = sscanf (range+6, "%" SCNdMAX "-", &rangenumber);
  	545	ret = sscanf (range+6, "%" SCN_OFF_T "-", &rangenumber);
  519	546
  520	547	if (ret != 1) {
  521	548	/* format not correct, so lets just assume
  ......	@@ -557,9 +584,9 @@
  557	584	"HTTP/1.1 206 Partial Content\r\n"
  558	585	"Date: %s\r\n"
  559	586	"Accept-Ranges: bytes\r\n"
  560		"Content-Length: %" PRIdMAX "\r\n"
  561		"Content-Range: bytes %" PRIdMAX \
  562		"-%" PRIdMAX "/%" PRIdMAX "\r\n"
  	587	"Content-Length: %" PRI_OFF_T "\r\n"
  	588	"Content-Range: bytes %" PRI_OFF_T \
  	589	"-%" PRI_OFF_T "/%" PRI_OFF_T "\r\n"
  563	590	"Content-Type: %s\r\n\r\n",
  564	591	currenttime,
  565	592	new_content_len,
  ......	@@ -583,7 +610,7 @@
  583	610	bytes = snprintf (httpclient->refbuf->data, BUFSIZE,
  584	611	"HTTP/1.0 200 OK\r\n"
  585	612	"Accept-Ranges: bytes\r\n"
  586		"Content-Length: %" PRIdMAX "\r\n"
  	613	"Content-Length: %" PRI_OFF_T "\r\n"
  587	614	"Content-Type: %s\r\n\r\n",
  588	615	content_length,
  589	616	type);
  ......	@@ -607,6 +634,24 @@
  607	634	}
  608	635
  609	636
  	637	/* Routine to actually add pre-configured client structure to pending list and
  	638	* then to start off the file serving thread if it is not already running
  	639	*/
  	640	static void fserve_add_pending (fserve_t *fclient)
  	641	{
  	642	thread_mutex_lock (&pending_lock);
  	643	fclient->next = (fserve_t *)pending_list;
  	644	pending_list = fclient;
  	645	if (run_fserv == 0)
  	646	{
  	647	run_fserv = 1;
  	648	DEBUG0 ("fserve handler waking up");
  	649	thread_create("File Serving Thread", fserv_thread_function, NULL, THREAD_DETACHED);
  	650	}
  	651	thread_mutex_unlock (&pending_lock);
  	652	}
  	653
  	654
  610	655	/* Add client to fserve thread, client needs to have refbuf set and filled
  611	656	* but may provide a NULL file if no data needs to be read
  612	657	*/
  ......	@@ -623,11 +668,7 @@
  623	668	fclient->file = file;
  624	669	fclient->client = client;
  625	670	fclient->ready = 0;
  626
  627		thread_mutex_lock (&pending_lock);
  628		fclient->next = (fserve_t *)pending_list;
  629		pending_list = fclient;
  630		thread_mutex_unlock (&pending_lock);
  	671	fserve_add_pending (fclient);
  631	672
  632	673	return 0;
  633	674	}
  ......	@@ -652,10 +693,7 @@
  652	693	fclient->callback = callback;
  653	694	fclient->arg = arg;
  654	695
  655		thread_mutex_lock (&pending_lock);
  656		fclient->next = (fserve_t *)pending_list;
  657		pending_list = fclient;
  658		thread_mutex_unlock (&pending_lock);
  	696	fserve_add_pending (fclient);
  659	697	}
  660	698
  661	699