Changeset 8262340

Timestamp:

Feb 25, 2003, 12:56:21 PM (22 years ago)

Author:

James M. Kretchmar <kretch@mit.edu>

Branches:

master, barnowl_perlaim, debian, owl, release-1.10, release-1.4, release-1.5, release-1.6, release-1.7, release-1.8, release-1.9

Children:

ecd5dc5

Parents:

316962a

Message:

Added ZResetAuthentication in a number of places to fix problems with
  stale tickets
Added some hooks for malloc debugging

Files:

• ChangeLog (modified) (1 diff)
• functions.c (modified) (1 diff)
• global.c (modified) (2 diffs)
• message.c (modified) (1 diff)
• owl.h (modified) (1 diff)
• zephyr.c (modified) (8 diffs)
• zwrite.c (modified) (2 diffs)

ChangeLog

@@ -30 +30 @@
         Zaway now obeys the smart strip variable
         Hacked the build system to not have the -E link problem on Athena
+        Added ZResetAuthentication in a number of places to fix problems
+          with stale tickets
+        Added some hooks for malloc debugging
         
 1.2.8

functions.c

@@ -1534 +1534 @@
     strcat(buff, "Color: No.\n");
   }
-  
+
+  sprintf(buff, "%sMemory Malloced: %i\n", buff, owl_global_get_malloced(&g));
+  sprintf(buff, "%sMemory Freed: %i\n", buff, owl_global_get_freed(&g));
+  sprintf(buff, "%sMemory In Use: %i\n", buff, owl_global_get_meminuse(&g));
+
   owl_function_popless_text(buff);
 }

global.c

@@ -18 +18 @@
   struct hostent *hent;
   char hostname[MAXHOSTNAMELEN];
+
+  g->malloced=0;
+  g->freed=0;
 
   gethostname(hostname, MAXHOSTNAMELEN);
@@ -607 +610 @@
 }
 
+void owl_global_add_to_malloced(owl_global *g, int i) {
+  g->malloced+=i;
+}
+
+void owl_global_add_to_freed(owl_global *g, int i) {
+  g->freed+=1;
+}
+
+int owl_global_get_malloced(owl_global *g) {
+  return(g->malloced);
+}
+
+int owl_global_get_freed(owl_global *g) {
+  return(g->freed);
+}
+
+int owl_global_get_meminuse(owl_global *g) {
+  return(g->malloced-g->freed);
+}

message.c

@@ -868 +868 @@
   owl_fmtext_free(&(m->fmtext));
 }
-

owl.h

@@ -391 +391 @@
   int searchactive;
   int newmsgproc_pid;
+  int malloced, freed;
   char *searchstring;
   owl_filterelement fe_true;

zephyr.c

@@ -9 +9 @@
 
 static const char fileIdent[] = "$Id$";
+
+Code_t ZResetAuthentication();
 
 int owl_zephyr_loadsubs(char *filename) {
@@ -28 +30 @@
     strcpy(subsfile, filename);
   }
-  
+
+  ZResetAuthentication();
   /* need to redo this to do chunks, not just bail after 3000 */
   count=0;
@@ -95 +98 @@
   }
 
+  ZResetAuthentication();
   /* need to redo this to do chunks, not just bag out after 3000 */
   count=0;
@@ -137 +141 @@
 void unsuball() {
   int ret;
-  
+
+  ZResetAuthentication();
   ret=ZCancelSubscriptions(0);
   if (ret != ZERR_NONE) {
@@ -152 +157 @@
   subs[0].zsub_recipient=recip;
 
+  ZResetAuthentication();
   if (ZSubscribeTo(subs,1,0) != ZERR_NONE) {
     fprintf(stderr, "Error subbing\n");
@@ -168 +174 @@
   subs[0].zsub_recipient=recip;
 
+  ZResetAuthentication();
   if (ZUnsubscribeTo(subs,1,0) != ZERR_NONE) {
     fprintf(stderr, "Error unsubbing\n");
@@ -246 +253 @@
   memset(&notice, 0, sizeof(notice));
 
+  ZResetAuthentication();
+  
   notice.z_kind=ACKED;
   notice.z_port=0;
@@ -389 +398 @@
   
   strcpy(out, "");
-
+  ZResetAuthentication();
   ret=ZLocateUser(user,&numlocs,auth?ZAUTH:ZNOAUTH);
   if (ret != ZERR_NONE) {

zwrite.c

@@ -6 +6 @@
 
 static const char fileIdent[] = "$Id$";
-
-Code_t ZResetAuthentication();
 
 int owl_zwrite_create_and_send_from_line(char *cmd, char *msg) {
@@ -227 +225 @@
     send_zephyr(z->opcode, z->zsig, z->class, z->inst, to, msg);
   }
-
-  ZResetAuthentication();
 }