Fix memory allocation warnings at shutdown

At shutdown we check for unfreed memory allocated with AllocSmallSpace
and AllocLargeSpace and complain in the syslog if there are dangling
pieces.  This patch takes care of a few cases that always showed up
as warnings, even after a simple start-stop of the client.

- The cacheInode file needs to be closed before the checks, since it
uses a large piece for its struct file.

- The ICL logging code allocates 6 small pieces that are never freed.
Add a shutdown_icl() function that releases everything.  While we're
at it, correct one place where we allocated with afs_osi_Alloc but
freed with osi_FreeSmallSpace, confusing our accounting.

Change-Id: I4c28c848f155dec9d89e6199cde34209227ca5c9
Reviewed-on: http://gerrit.openafs.org/758
Reviewed-by: Simon Wilkinson <sxw@inf.ed.ac.uk>
Reviewed-by: Derrick Brashear <shadow@dementia.org>
Tested-by: Derrick Brashear <shadow@dementia.org>
Reviewed-on: http://gerrit.openafs.org/767

diff --git a/src/afs/afs_call.c b/src/afs/afs_call.c
index bb0205fc936e4b6fdb98c22c8482fba00fcbce18..0b6011d552702c34299885d849337de4405b74df 100644 (file)
--- a/src/afs/afs_call.c
+++ b/src/afs/afs_call.c
@@ -1894,6 +1894,20 @@ afs_shutdown(void)
     shutdown_bufferpackage();
     shutdown_cache();
     shutdown_osi();
+    /*
+     * Close file only after daemons which can write to it are stopped.
+     * Need to close before the osinet shutdown to avoid failing check
+     * for dangling memory allocations.
+     */
+    if (afs_cacheInodep) {     /* memcache won't set this */
+       osi_UFSClose(afs_cacheInodep);  /* Since we always leave it open */
+       afs_cacheInodep = 0;
+    }
+    /*
+     * Shutdown the ICL logs - needed to free allocated memory space and avoid
+     * warnings from shutdown_osinet
+     */
+    shutdown_icl();
     shutdown_osinet();
     shutdown_osifile();
     shutdown_vnodeops();
@@ -1911,12 +1925,6 @@ afs_shutdown(void)
 */
     afs_warn(" ALL allocated tables\n");
 
-    /* Close file only after daemons which can write to it are stopped. */
-    if (afs_cacheInodep) {     /* memcache won't set this */
-       osi_UFSClose(afs_cacheInodep);  /* Since we always leave it open */
-       afs_cacheInodep = 0;
-    }
-
     afs_shuttingdown = 0;
 
     return;                    /* Just kill daemons for now */
@@ -3109,7 +3117,7 @@ afs_icl_CreateSetWithFlags(char *name, struct afs_icl_log *baseLogp,
     if (flags & ICL_CRSET_FLAG_PERSISTENT)
        states |= ICL_SETF_PERSISTENT;
 
-    setp = (struct afs_icl_set *)afs_osi_Alloc(sizeof(struct afs_icl_set));
+    setp = (struct afs_icl_set *)osi_AllocSmallSpace(sizeof(struct afs_icl_set));
     memset((caddr_t) setp, 0, sizeof(*setp));
     setp->refCount = 1;
     if (states & ICL_SETF_FREED)
@@ -3414,3 +3422,31 @@ afs_icl_SetSetStat(struct afs_icl_set *setp, int op)
     ReleaseWriteLock(&setp->lock);
     return code;
 }
+
+/* Function called at shutdown - zap everything */
+void
+shutdown_icl(void)
+{
+    struct afs_icl_log *logp;
+    struct afs_icl_set *setp;
+
+    setp = afs_icl_FindSet("cm");
+    if (setp) {
+       /* Release the reference from Find, and the initial one */
+       afs_icl_SetFree(setp);
+       afs_icl_SetFree(setp);
+    }
+    setp = afs_icl_FindSet("cmlongterm");
+    if (setp) {
+       /* Release the reference from Find, and the initial one */
+       afs_icl_SetFree(setp);
+       afs_icl_SetFree(setp);
+    }
+    logp = afs_icl_FindLog("cmfx");
+    if (logp) {
+       /* Release the reference from Find, and the initial one */
+       afs_icl_LogFree(logp);
+       afs_icl_LogFree(logp);
+    }
+    return 0;
+}

diff --git a/src/afs/afs_prototypes.h b/src/afs/afs_prototypes.h
index 7ba69225cb603d0853b39cdf82e6fa270114a149..5ff1e49035632f9a3353a0256958907ed39fdd06 100644 (file)
--- a/src/afs/afs_prototypes.h
+++ b/src/afs/afs_prototypes.h
@@ -116,6 +116,7 @@ extern int afs_icl_Event0(register struct afs_icl_set *setp,
 extern void afs_icl_AppendRecord(register struct afs_icl_log *logp,
                                 afs_int32 op, afs_int32 types, long p1,
                                 long p2, long p3, long p4);
+extern void shutdown_icl(void);
 
 extern int afs_CheckInit(void);
 extern void afs_shutdown(void);