From: Ian Jackson <ian@liberator.relativity.greenend.org.uk>
Date: Sat, 1 May 2010 13:46:31 +0000 (+0100)
Subject: abolish xk_Malloc
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=inn-innduct.git;a=commitdiff_plain;h=d2ca385313c2f8994f8ea7f6c62e975d3c331467

abolish xk_Malloc
---

diff --git a/backends/innduct.c b/backends/innduct.c
index 613a85d..8c9d769 100644
--- a/backends/innduct.c
+++ b/backends/innduct.c
@@ -1,6 +1,5 @@
 /*
  * todo
- *  - abolish xk_Malloc
  *  - rename sm_period_counter as it's just about flushes
  *  - manpage: document control master stuff
  *
@@ -410,13 +409,12 @@ typedef enum {
 #define CONNIOVS 128
 
 typedef enum {
-  xk_Malloc, xk_Const, xk_Artdata
+  xk_Const, xk_Artdata
 } XmitKind;
 
 struct XmitDetails {
   XmitKind kind;
   union {
-    char *malloc_tofree;
     ARTHANDLE *sm_art;
   } info;
 };
@@ -1513,7 +1511,6 @@ static void xmit_artbody(Conn *conn, ARTHANDLE *ah /* consumed */) {
 
 static void xmit_free(XmitDetails *d) {
   switch (d->kind) {
-  case xk_Malloc:  free(d->info.malloc_tofree);   break;
   case xk_Artdata: SMfreearticle(d->info.sm_art); break;
   case xk_Const:                                  break;
   default: abort();
@@ -3202,16 +3199,8 @@ CCMD(dump) {
       char *dinfo;
       long diff;
       switch (xd->kind) {
-      case xk_Malloc:
-	diff= xd->info.malloc_tofree - (char*)iv->iov_base;
-	dinfo= xasprintf("M%5ld", diff);
-	break;
-      case xk_Const:
-	dinfo= xasprintf("Const");
-	break;
-      case xk_Artdata:
-	dinfo= xasprintf("A%p", xd->info.sm_art);
-	break;
+      case xk_Const:    dinfo= xasprintf("Const");                 break;
+      case xk_Artdata:  dinfo= xasprintf("A%p", xd->info.sm_art);  break;
       default:
 	abort();
       }