Changeset db654df

Timestamp:

Mar 29, 2009, 9:34:47 PM (15 years ago)

Author:

James M. Kretchmar <kretch@mit.edu>

Branches:

owl

Children:

f19fef4

Parents:

6d7e6c6

Message:

remove the excessive process_events (it oddly made the situation
   worse) and instead call it just on sending login and logout
   notificatinos.
new debug message in loadsubs
new handle_ack

Files:

• owl.c (modified) (2 diffs)
• select.c (modified) (2 diffs)
• zephyr.c (modified) (19 diffs)

owl.c

@@ -427 +427 @@
   nexttime=time(NULL);
 
-  owl_zephyr_process_events(NULL);
+  /* owl_zephyr_process_events(NULL); */
   owl_function_debugmsg("startup: entering main loop");
   /* main loop */
@@ -622 +622 @@
      * own select loop and may leave zephyrs on the queue. Check for
      * them now, and process any we find. */
-    owl_zephyr_process_events(NULL);
+    /* owl_zephyr_process_events(NULL); */
     owl_select();
-    owl_zephyr_process_events(NULL);
+    /* owl_zephyr_process_events(NULL); */
     
     /* Log any error signals */

select.c

@@ -75 +75 @@
 
   if (elt != -1) {  /* If we have a dispatch for this FD */
+    owl_function_debugmsg("select: duplicate dispatch found");
     owl_dispatch *d_old;
     d_old = (owl_dispatch*)owl_list_get_element(dl, elt);
@@ -210 +211 @@
 
   /* owl_select_process_timers(&timeout); */
-  timeout.tv_sec = 60;
+
+  /* settings to 5 seconds for the moment, we can raise this when the
+   * odd select behavior with zephyr is understood
+   */
+  timeout.tv_sec = 5;
   timeout.tv_usec = 0;
 

zephyr.c

@@ -26 +26 @@
     return(1);
   }
-  owl_zephyr_process_events(NULL);
 #endif
   return(0);
@@ -36 +35 @@
 #ifdef HAVE_LIBZEPHYR
   unsuball();
-  owl_zephyr_process_events(NULL);
   ZClosePort();
 #endif
@@ -85 +83 @@
     owl_free(subs[i].zsub_recipient);
   }
-  owl_zephyr_process_events(NULL);
   return ret;
 }
@@ -116 +113 @@
   ret=stat(subsfile, &statbuff);
   if (ret) {
+    owl_function_debugmsg("loadsubs: could not stat file %s", subsfile)
     if (error_on_nofile==1) return(-1);
     return(0);
@@ -123 +121 @@
   count=0;
   file=fopen(subsfile, "r");
-  if (!file) return(-1);
+  if (!file) {
+    owl_function_debugmsg("loadsubs: could not open file %s", subsfile)
+    return(-1);
+  }
   while ( fgets(buffer, 1024, file)!=NULL ) {
     if (buffer[0]=='#' || buffer[0]=='\n' || buffer[0]=='\n') continue;
@@ -176 +177 @@
     return(-1);
   }
-  owl_zephyr_process_events(NULL);
   return(0);
 #else
@@ -241 +241 @@
   }
 
-  owl_zephyr_process_events(NULL);
-
   return(ret);
 #else
@@ -276 +274 @@
     return(-2);
   }
-  owl_zephyr_process_events(NULL);
   return(0);
 #else
@@ -298 +295 @@
     return(-2);
   }
-  owl_zephyr_process_events(NULL);
   return(0);
 #else
@@ -468 +464 @@
   owl_free(notice.z_message);
   ZFreeNotice(&notice);
-  owl_zephyr_process_events(NULL);
   if (ret!=ZERR_NONE) {
     owl_function_error("Error sending zephyr");
@@ -484 +479 @@
   int ret;
   ret=ZSendPacket(buf, len, 0);
-  owl_zephyr_process_events(NULL);
   return(ret);
 }
@@ -493 +487 @@
 #ifdef HAVE_LIBZEPHYR
   send_zephyr("PING", "", "MESSAGE", "PERSONAL", to, "");
-  owl_zephyr_process_events(NULL);
 #endif
 }
@@ -500 +493 @@
 void owl_zephyr_handle_ack(ZNotice_t *retnotice)
 {
-  char *tmp, *buff;
+  char *tmp;
   
   /* if it's an HMACK ignore it */
@@ -521 +514 @@
     }
   } else if (!strcmp(retnotice->z_message, ZSRVACK_NOTSENT)) {
-    if (strcasecmp(retnotice->z_class, "message")) {
-      owl_function_error("No one subscribed to class class %s", retnotice->z_class);
-      buff=owl_sprintf("Could not send message to class %s: no one subscribed.\n",
-                       retnotice->z_class);
+    #define BUFFLEN 1024
+    if (retnotice->z_recipient == NULL
+        || *retnotice->z_recipient == 0
+        || *retnotice->z_recipient == '@') {
+      char buff[BUFFLEN];
+      owl_function_error("No one subscribed to class %s", retnotice->z_class);
+      snprintf(buff, BUFFLEN, "Could not send message to class %s: no one subscribed.\n", retnotice->z_class);
       owl_function_adminmsg("", buff);
-      owl_free(buff);
     } else {
+      char buff[BUFFLEN];
       tmp = short_zuser(retnotice->z_recipient);
-      owl_function_error("%s: Not logged in or subscribing to messages.", tmp);
-      buff=owl_sprintf("Could not send message to %s: not logged in or subscribing to messages.\n",
-                       tmp);
+      owl_function_error("%s: Not logged in or subscribing.", tmp);
+      if(strcmp(retnotice->z_class, "message")) {
+        snprintf(buff, BUFFLEN,
+                 "Could not send message to %s: "
+                 "not logged in or subscribing to class %s, instance %s.\n", 
+                 tmp,
+                 retnotice->z_class,
+                 retnotice->z_class_inst);
+      } else {
+        snprintf(buff, BUFFLEN,
+                 "Could not send message to %s: "
+                 "not logged in or subscribing to messages.\n",
+                 tmp);
+      }
       owl_function_adminmsg("", buff);
       owl_log_outgoing_zephyr_error(tmp, buff);
       owl_free(tmp);
-      owl_free(buff);
     }
   } else {
     owl_function_error("Internal error on ack (%s)", retnotice->z_message);
   }
-  owl_zephyr_process_events(NULL);
 }
 #else
@@ -635 +640 @@
   ZResetAuthentication();
   ret=ZLocateUser(user,&numlocs,auth?ZAUTH:ZNOAUTH);
-  owl_zephyr_process_events(NULL);
   if (ret != ZERR_NONE) {
     return(owl_sprintf("Error locating user %s\n", user));
@@ -661 +665 @@
     owl_free(myuser);
   }
-  owl_zephyr_process_events(NULL);
   return(out);
 #else
@@ -866 +869 @@
       int tmpbufflen;
       char *tmpbuff;
-      owl_zephyr_process_events(NULL);
       tmpbuff = owl_sprintf("<%s,%s,%s>\n%s", sub.zsub_class, sub.zsub_classinst, sub.zsub_recipient, out);
       tmpbufflen = strlen(tmpbuff) + 1;
@@ -888 +890 @@
 
   ZFlushSubscriptions();
-  owl_zephyr_process_events(NULL);
   return(out);
 #else
@@ -908 +909 @@
 #ifdef HAVE_LIBZEPHYR
   ZInitLocationInfo(host, val);
-  owl_zephyr_process_events(NULL);
 #endif
 }