[xiph-commits] r8123 - icecast/trunk/icecast/src

[karl at motherfish-iii.xiph.org]

Author: karl
Date: 2004-10-27 07:13:29 -0700 (Wed, 27 Oct 2004)
New Revision: 8123

Modified:
   icecast/trunk/icecast/src/connection.c
   icecast/trunk/icecast/src/fserve.c
   icecast/trunk/icecast/src/stats.c
   icecast/trunk/icecast/src/yp.c
Log:
correct type for volatile usage and uncomment log message for stats updating


Modified: icecast/trunk/icecast/src/connection.c
===================================================================
--- icecast/trunk/icecast/src/connection.c	2004-10-27 14:09:10 UTC (rev 8122)
+++ icecast/trunk/icecast/src/connection.c	2004-10-27 14:13:29 UTC (rev 8123)
@@ -79,7 +79,7 @@
 static volatile unsigned long _current_id = 0;
 static int _initialized = 0;
 
-static volatile con_queue_t *_queue = NULL;
+volatile static con_queue_t *_queue = NULL;
 static mutex_t _queue_mutex;
 
 static thread_queue_t *_conhands = NULL;

Modified: icecast/trunk/icecast/src/fserve.c
===================================================================
--- icecast/trunk/icecast/src/fserve.c	2004-10-27 14:09:10 UTC (rev 8122)
+++ icecast/trunk/icecast/src/fserve.c	2004-10-27 14:13:29 UTC (rev 8123)
@@ -61,7 +61,7 @@
 #endif
 
 static fserve_t *active_list = NULL;
-static volatile fserve_t *pending_list = NULL;
+volatile static fserve_t *pending_list = NULL;
 
 static mutex_t pending_lock;
 static avl_tree *mimetypes = NULL;

Modified: icecast/trunk/icecast/src/stats.c
===================================================================
--- icecast/trunk/icecast/src/stats.c	2004-10-27 14:09:10 UTC (rev 8122)
+++ icecast/trunk/icecast/src/stats.c	2004-10-27 14:13:29 UTC (rev 8123)
@@ -57,17 +57,17 @@
     struct _event_listener_tag *next;
 } event_listener_t;
 
-static volatile int _stats_running = 0;
+volatile static int _stats_running = 0;
 static thread_type *_stats_thread_id;
-static volatile int _stats_threads = 0;
+volatile static int _stats_threads = 0;
 
 static stats_t _stats;
 static mutex_t _stats_mutex;
 
-static volatile stats_event_t *_global_event_queue;
+volatile static stats_event_t *_global_event_queue;
 mutex_t _global_event_mutex;
 
-static volatile event_listener_t *_event_listeners;
+volatile static event_listener_t *_event_listeners;
 
 
 static void *_stats_thread(void *arg);
@@ -398,7 +398,7 @@
         str = (char *)strdup (event->value);
     free (node->value);
     node->value = str;
-    /* DEBUG3 ("update node %s \"%s\" (%d)", node->name, node->value, event->action); */
+    DEBUG2 ("update node %s (%s)", node->name, node->value);
 }
 
 

Modified: icecast/trunk/icecast/src/yp.c
===================================================================
--- icecast/trunk/icecast/src/yp.c	2004-10-27 14:09:10 UTC (rev 8122)
+++ icecast/trunk/icecast/src/yp.c	2004-10-27 14:13:29 UTC (rev 8123)
@@ -84,7 +84,7 @@
 static rwlock_t yp_lock;
 static mutex_t yp_pending_lock;
 
-static volatile struct yp_server *active_yps = NULL, *pending_yps = NULL;
+volatile static struct yp_server *active_yps = NULL, *pending_yps = NULL;
 static volatile int yp_update = 0;
 static int yp_running;
 static time_t now;