UpgradeNotes: fix-capture_nested.patch

xmview/capture_nested.c

@@ -1192 +1192 @@
         int (*fn) (void *arg);
         void *arg;
         void *parentpcb;
+        struct npcb *npcb;
 };
 
 /* create a new (reduced) pcb for a thread */
-static struct npcb *new_npcb(struct pcb *old)
+static struct npcb *new_npcb(struct pcb *old, struct npcb *npcb)
 {
+        /*
         struct npcb *npcb;
         npcb=calloc(1,sizeof(struct npcb));
+        npcb = tryit + alloced++ * sizeof(struct npcb);
+        */
         npcb->flags=PCB_ALLOCATED;
         /* inherit the treepoch path from the generating thread */
         npcb->tst=old->tst;
@@ -1227 +1231 @@
 static int clonewrap(void *carg){
         int (*fn) (void *arg) = ((struct clonearg *)(carg))->fn;
         void *arg=((struct clonearg *)(carg))->arg;
+        struct npcb *npcb = ((struct clonearg *)(carg))->npcb;  
         /* create a new pcb for the new thread, and link the pcb with this new 
          * thread */
-        set_pcb(new_npcb(((struct clonearg *)(carg))->parentpcb));      
+        set_pcb(new_npcb(((struct clonearg *)(carg))->parentpcb, npcb));        
         /* free the data structure used to keep the thread info */
         free(carg);
         /* start the real thread */
@@ -1248 +1253 @@
         carg->fn=fn;
         carg->arg=arg;
         carg->parentpcb=get_pcb();
+        /* Calloc inside the new thread after the libc__clone call dumps core */
+        carg->npcb = calloc(1, sizeof(struct npcb));
         /* start a wrapper to the real main function of the thread */
         rv= libc__clone(clonewrap,child_stack,flags,carg,arg2,arg3,arg4);
         return rv;