Changeset 4328

Timestamp:

01/28/91 10:57:00 (19 years ago)

Author:

raeburn

Message:

Renamed _losinghost to losinghost; added new & delete ops.
(De-/allocations changed.)
Explicit version of default initializer for losing_hosts removed.
NULLLH definition deleted.

Use access methods to get/set ZServerDesc_t::zs_state.
Use new/delete for ZHostList_t.

Files:

• trunk/athena/lib/zephyr/server/hostm.c (modified) (18 diffs)

trunk/athena/lib/zephyr/server/hostm.c

@@ -16 +16 @@
 #ifndef lint
 #ifndef SABER
-static char rcsid_hostm_c[] = "$Header: /afs/dev.mit.edu/source/repository/athena/lib/zephyr/server/hostm.c,v 1.33 1990-12-29 01:35:08 raeburn Exp $";
+static char rcsid_hostm_c[] = "$Header: /afs/dev.mit.edu/source/repository/athena/lib/zephyr/server/hostm.c,v 1.34 1991-01-28 15:57:00 raeburn Exp $";
 #endif
 #endif
@@ -78 +78 @@
         ZHostList_t *host;              /* ptr to host struct */
         int server_index;               /* index of server in the table */
+#if 0 /* always allocated in arrays */
+#if !defined(__GNUG__) || defined(FIXED_GXX)
+        void *operator new (unsigned int sz) { return zalloc (sz); }
+        void operator delete (void *ptr) { zfree (ptr, sizeof (hostlist)); }
+#endif
+#endif
 };
 
-typedef struct _losinghost {
-        struct _losinghost *q_forw;
-        struct _losinghost *q_back;
+struct losinghost {
+        losinghost *q_forw;
+        losinghost *q_back;
         ZHostList_t *lh_host;
         timer lh_timer;
         ZClient_t *lh_client;
-} losinghost;
-
-#define NULLLH          ((struct _losinghost *) 0)
+#if !defined(__GNUG__) || defined(FIXED_GXX)
+        void *operator new (unsigned int sz) { return zalloc (sz); }
+        void operator delete (void *ptr) { zfree (ptr, sizeof (losinghost)); }
+#endif
+};
+
 #define NULLHLT         ((struct hostlist *) 0)
 
@@ -96 +105 @@
 static long lose_timo = LOSE_TIMO;
 
-static losinghost *losing_hosts = NULLLH; /* queue of pings for hosts we
+static losinghost *losing_hosts; /* queue of pings for hosts we
                                              doubt are really there */
 
@@ -113 +122 @@
 /*ARGSUSED*/
 Code_t
-hostm_dispatch(ZNotice_t *notice, int auth, struct sockaddr_in *who, ZServerDesc_t *server)
+hostm_dispatch(ZNotice_t *notice, int auth, struct sockaddr_in *who,
+               ZServerDesc_t *server)
 {
         ZServerDesc_t *owner;
@@ -239 +249 @@
                                 timer_reset(lhp->lh_timer);
                                 xremque(lhp);
-                                xfree(lhp);
+                                delete lhp;
                                 lhp = lhp2->q_forw;
                         } else
@@ -280 +290 @@
         for (i = 0; i < nservers; i++){
                 if (i == me_server_idx) continue;
-                if (otherservers[i].zs_state == SERV_UP)
+                if (otherservers[i].state() == SERV_UP)
                         break;
         }
@@ -297 +307 @@
                                 newserver = (int) (random() % (nservers - 1)) + 1;
                         while (newserver == limbo_server_idx() ||
-                               (otherservers[newserver].zs_state != SERV_UP &&
-                                otherservers[newserver].zs_state != SERV_TARDY) ||
+                               (otherservers[newserver].state() != SERV_UP &&
+                                otherservers[newserver].state() != SERV_TARDY) ||
                                newserver == me_server_idx);
                         hostm_deathgram(&host->zh_addr, &otherservers[newserver]);
@@ -322 +332 @@
 #endif
         if (!losing_hosts) {
-                if (!(losing_hosts = (losinghost *) xmalloc(sizeof(losinghost)))) {
+                losing_hosts = new losinghost;
+                if (!losing_hosts) {
                         syslog(LOG_ERR, "no mem losing host");
                         return;
@@ -337 +348 @@
                         return;
                 }
-        if (!(newhost = (losinghost *) xmalloc(sizeof(losinghost)))) {
+        newhost = new losinghost;
+        if (!newhost) {
                 syslog(LOG_ERR, "no mem losing host 2");
                 return;
@@ -378 +390 @@
 #endif
                 xremque(which);
-                xfree(which);
+                delete which;
                 (void) sigsetmask(omask);
                 return;
@@ -414 +426 @@
         server_forward(&notice, 0, &who); /* unauthentic */
 
-        xfree(which);
+        delete which;
         (void) sigsetmask(omask);
         return;
@@ -452 +464 @@
                         server_kill_clt(lhp->lh_client);
                         xremque(lhp);
-                        xfree(lhp);
+                        delete lhp;
                         /* now that the remque adjusted the linked list,
                            we go forward again */
@@ -489 +501 @@
 #endif
                         xremque(lhp);
-                        xfree(lhp);
+                        delete lhp;
                         /* now that the remque adjusted the linked list,
                            we go forward again */
@@ -546 +558 @@
 
         /* allocate a header */
-        if (!(hlist = (ZHostList_t *)xmalloc(sizeof(ZHostList_t)))) {
-                syslog(LOG_WARNING, "hm_attach malloc");
+        hlist = new ZHostList_t;
+        if (!hlist) {
+                syslog(LOG_WARNING, "hm_attach alloc");
                 (void) sigsetmask(omask);
                 return(ENOMEM);
@@ -553 +566 @@
         /* set up */
         if (!(clist = (ZClientList_t *)xmalloc(sizeof(ZClientList_t)))) {
-                xfree(hlist);
+                delete hlist;
                 (void) sigsetmask(omask);
                 return(ENOMEM);
@@ -601 +614 @@
         remove_host(host);
 
-        xfree(host);
+        delete host;
         (void) sigsetmask(omask);
         return;
@@ -903 +916 @@
                 zdbug((LOG_DEBUG,"last host"));
 #endif
-                xfree(all_hosts);
+                xfree (all_hosts);
                 all_hosts = NULLHLT;
                 (void) sigsetmask(omask);
@@ -929 +942 @@
                 i++;
         }
-        xfree(oldlist);
+        xfree (oldlist);
         (void) sigsetmask(omask);
         return;