Changeset 781

Timestamp:

10/02/06 11:17:21 (6 years ago)

Author:

wd

Message:

Fix static bogosity in timer.c (lame gcc single pass compile problem) and
change maxsockets setting to be what the normal default would be.

Location:

branches/ithildin-scons

Files:

• etc/ithildin.conf (modified) (1 diff)
• lib/timer.c (modified) (2 diffs)

branches/ithildin-scons/etc/ithildin.conf

@@ -12 +12 @@
 // be allocated.  this 'can' be set above what your system's limit is, but
 // it won't do you any good.  by default set it to 1024
-maxsockets 256;
+maxsockets 1024;
 
 // the 'username' setting specifies which user the daemon should try to run

branches/ithildin-scons/lib/timer.c

@@ -26 +26 @@
 static timer_event_t *find_timer(timer_ref_t);
 static inline void insert_timer(timer_event_t *);
+
+/* This inserts a timer into the correct position in the timer list.  That is,
+ * it sorts the timer list by order of execution.   At the top of the file
+ * so gcc can inline it. */
+static inline void insert_timer(timer_event_t *timer) {
+    timer_event_t *tep;
+
+    tep = LIST_FIRST(&me.timers);
+    if (tep == NULL) {
+        LIST_INSERT_HEAD(&me.timers, timer, lp);
+        return;
+    }
+
+    while (tep != NULL) {
+        if (tep->next > timer->next) {
+            LIST_INSERT_BEFORE(tep, timer, lp);
+            return;
+        }
+        if (LIST_NEXT(tep, lp) == NULL)
+            break;
+        tep = LIST_NEXT(tep, lp);
+    }
+    LIST_INSERT_AFTER(tep, timer, lp);
+}
 
 /* This creates a new timer which repeats for the given count (0 means no
@@ -147 +171 @@
 }
 
-/* This inserts a timer into the correct position in the timer list.  That is,
- * it sorts the timer list by order of execution. */
-static inline void insert_timer(timer_event_t *timer) {
-    timer_event_t *tep;
-
-    tep = LIST_FIRST(&me.timers);
-    if (tep == NULL) {
-        LIST_INSERT_HEAD(&me.timers, timer, lp);
-        return;
-    }
-
-    while (tep != NULL) {
-        if (tep->next > timer->next) {
-            LIST_INSERT_BEFORE(tep, timer, lp);
-            return;
-        }
-        if (LIST_NEXT(tep, lp) == NULL)
-            break;
-        tep = LIST_NEXT(tep, lp);
-    }
-    LIST_INSERT_AFTER(tep, timer, lp);
-}
-
 /* vi:set ts=8 sts=4 sw=4 tw=76 et: */