Author: Ghostwolf <foxxe@wtfs.net>

[ircu2.10.12-pk.git] / ircd / ircd_events.c

diff --git a/ircd/ircd_events.c b/ircd/ircd_events.c
index e59cd051f4cfd7590086cfde3aa76d5f4779554a..00616e64904ecf9d8fdaef166d809ee5285e2b23 100644 (file)
--- a/ircd/ircd_events.c
+++ b/ircd/ircd_events.c
@@ -129,6 +129,8 @@ event_execute(struct Event* event)
 
   if (event->ev_type == ET_DESTROY) /* turn off active flag *before* destroy */
     event->ev_gen.gen_header->gh_flags &= ~GEN_ACTIVE;
+  if (event->ev_type == ET_ERROR) /* turn on error flag before callback */
+    event->ev_gen.gen_header->gh_flags |= GEN_ERROR;
 
   (*event->ev_gen.gen_header->gh_call)(event); /* execute the event */
 
@@ -217,6 +219,7 @@ timer_enqueue(struct Timer* timer)
 
   assert(0 != timer);
   assert(0 == timer->t_header.gh_prev_p); /* not already on queue */
+  assert(timer->t_header.gh_flags & GEN_ACTIVE); /* timer is active */
 
   /* Calculate expire time */
   switch (timer->t_type) {
@@ -368,6 +371,43 @@ event_generate(enum EventType type, void* arg, int data)
   event_add(ptr); /* add event to queue */
 }
 
+#if 0
+/* Try to verify the timer list */
+void
+timer_verify(void)
+{
+  struct Timer* ptr;
+  struct Timer** ptr_p = &evInfo.gens.g_timer;
+  time_t lasttime = 0;
+
+  for (ptr = evInfo.gens.g_timer; ptr;
+       ptr = (struct Timer*) ptr->t_header.gh_next) {
+    /* verify timer is supposed to be in the list */
+    assert(ptr->t_header.gh_prev_p);
+    /* verify timer is correctly ordered */
+    assert((struct Timer**) ptr->t_header.gh_prev_p == ptr_p);
+    /* verify timer is active */
+    assert(ptr->t_header.gh_flags & GEN_ACTIVE);
+    /* verify timer ordering is correct */
+    assert(lasttime <= ptr->t_expire);
+
+    lasttime = ptr->t_expire; /* store time for ordering check */
+    ptr_p = (struct Timer**) &ptr->t_header.gh_next; /* store prev pointer */
+  }
+}
+#endif
+
+/* Initialize a timer structure */
+struct Timer*
+timer_init(struct Timer* timer)
+{
+  gen_init((struct GenHeader*) timer, 0, 0, 0, 0);
+
+  timer->t_header.gh_flags = 0; /* turn off active flag */
+
+  return timer; /* convenience return */
+}
+
 /* Add a timer to be processed */
 void
 timer_add(struct Timer* timer, EventCallBack call, void* data,
@@ -380,13 +420,20 @@ timer_add(struct Timer* timer, EventCallBack call, void* data,
         timer_to_name(type)));
 
   /* initialize a timer... */
-  gen_init((struct GenHeader*) timer, call, data, 0, 0);
+  timer->t_header.gh_flags |= GEN_ACTIVE;
+  if (timer->t_header.gh_flags & GEN_MARKED)
+    timer->t_header.gh_flags |= GEN_READD;
+
+  timer->t_header.gh_ref = 0;
+  timer->t_header.gh_call = call;
+  timer->t_header.gh_data = data;
 
   timer->t_type = type;
   timer->t_value = value;
   timer->t_expire = 0;
 
-  timer_enqueue(timer); /* and enqueue it */
+  if (!(timer->t_header.gh_flags & GEN_MARKED))
+    timer_enqueue(timer); /* and enqueue it */
 }
 
 /* Remove a timer from the processing queue */
@@ -395,18 +442,16 @@ timer_del(struct Timer* timer)
 {
   assert(0 != timer);
 
-  if (timer->t_header.gh_flags & GEN_MARKED)
-    return; /* timer already marked for destruction */
+  timer->t_header.gh_flags &= ~GEN_READD;
 
-  timer->t_header.gh_flags |= GEN_DESTROY;
+  if (timer->t_header.gh_flags & GEN_MARKED)
+    return; /* timer is being used */
 
   Debug((DEBUG_LIST, "Deleting timer %p (type %s)", timer,
         timer_to_name(timer->t_type)));
 
-  if (!timer->t_header.gh_ref) { /* not in use; destroy right now */
-    gen_dequeue(timer);
-    event_generate(ET_DESTROY, timer, 0);
-  }
+  gen_dequeue(timer);
+  event_generate(ET_DESTROY, timer, 0);
 }
 
 /* Change the time a timer expires */
@@ -436,27 +481,27 @@ void
 timer_run(void)
 {
   struct Timer* ptr;
-  struct Timer* next = 0;
 
   /* go through queue... */
-  for (ptr = evInfo.gens.g_timer; ptr; ptr = next) {
-    next = (struct Timer*) ptr->t_header.gh_next;
+  while ((ptr = evInfo.gens.g_timer)) {
     if (CurrentTime < ptr->t_expire)
       break; /* processed all pending timers */
 
     gen_dequeue(ptr); /* must dequeue timer here */
-    if (ptr->t_type == TT_ABSOLUTE || ptr->t_type == TT_RELATIVE) {
-      Debug((DEBUG_LIST, "Marking timer %p for later destruction", ptr));
-      ptr->t_header.gh_flags |= GEN_MARKED; /* mark for destruction */
-    }
+    ptr->t_header.gh_flags |= (GEN_MARKED |
+                              (ptr->t_type == TT_PERIODIC ? GEN_READD : 0));
+
     event_generate(ET_EXPIRE, ptr, 0); /* generate expire event */
 
-    if (ptr->t_header.gh_flags & (GEN_MARKED | GEN_DESTROY)) {
+    ptr->t_header.gh_flags &= ~GEN_MARKED;
+
+    if (!(ptr->t_header.gh_flags & GEN_READD)) {
       Debug((DEBUG_LIST, "Destroying timer %p", ptr));
       event_generate(ET_DESTROY, ptr, 0);
-    } else if (ptr->t_type == TT_PERIODIC) {
-      Debug((DEBUG_LIST, "Re-enqueuing periodic timer %p", ptr));
-      timer_enqueue(ptr); /* re-queue periodic timer */
+    } else {
+      Debug((DEBUG_LIST, "Re-enqueuing timer %p", ptr));
+      timer_enqueue(ptr); /* re-queue timer */
+      ptr->t_header.gh_flags &= ~GEN_READD;
     }
   }
 }
@@ -550,7 +595,8 @@ socket_state(struct Socket* sock, enum SocketState state)
   /* connected datagram socket now unconnected */
   assert(sock->s_state != SS_CONNECTDG || state == SS_DATAGRAM);
 
-  if (sock->s_header.gh_flags & GEN_DESTROY) /* socket's been destroyed */
+  /* Don't continue if an error occurred or the socket got destroyed */
+  if (sock->s_header.gh_flags & (GEN_DESTROY | GEN_ERROR))
     return;
 
   /* tell engine we're changing socket state */
@@ -569,7 +615,8 @@ socket_events(struct Socket* sock, unsigned int events)
   assert(0 != evInfo.engine);
   assert(0 != evInfo.engine->eng_events);
 
-  if (sock->s_header.gh_flags & GEN_DESTROY) /* socket's been destroyed */
+  /* Don't continue if an error occurred or the socket got destroyed */
+  if (sock->s_header.gh_flags & (GEN_DESTROY | GEN_ERROR))
     return;
 
   switch (events & SOCK_ACTION_MASK) {
@@ -689,6 +736,9 @@ gen_flags(unsigned int flags)
   NS(unsigned int) map[] = {
     NM(GEN_DESTROY),
     NM(GEN_MARKED),
+    NM(GEN_ACTIVE),
+    NM(GEN_READD),
+    NM(GEN_ERROR),
     NE
   };