upas/*: cleanup mkfiles (thanks amavect)

[plan9front.git] / sys / src / libdtracy / pack.c

diff --git a/sys/src/libdtracy/pack.c b/sys/src/libdtracy/pack.c
index 34efd83745909e0e04fd18ad3bee2e1df583cf0d..de5721454cf60227a820a20086a10e6e3a3e1253 100644 (file)
--- a/sys/src/libdtracy/pack.c
+++ b/sys/src/libdtracy/pack.c
@@ -27,6 +27,12 @@ dtgpack(Fmt *f, DTActGr *g)
                fmtprint(f, "t%d\n", g->acts[i].type);
                fmtprint(f, "s%d\n", g->acts[i].size);
                dtepack(f, g->acts[i].p);
+               switch(g->acts[i].type){
+               case ACTAGGKEY:
+               case ACTAGGVAL:
+                       fmtprint(f, "A%#.8ux\n", g->acts[i].agg.id);
+                       break;
+               }
        }
        fmtprint(f, "G");
 }
@@ -132,6 +138,18 @@ dtgunpack(char *s, DTActGr **rp)
                                case ACTTRACESTR:
                                        g->reclen += g->acts[i].size;
                                        break;
+                               case ACTAGGKEY:
+                                       if(*s++ != 'A') goto fail;
+                                       s = u32unpack(s, (u32int *) &g->acts[i].agg.id);
+                                       if(s == nil) goto fail;
+                                       break;
+                               case ACTAGGVAL:
+                                       if(*s++ != 'A') goto fail;
+                                       s = u32unpack(s, (u32int *) &g->acts[i].agg.id);
+                                       if(s == nil) goto fail;
+                                       break;
+                               case ACTCANCEL:
+                                       break;
                                default:
                                        goto fail;
                                }
@@ -182,7 +200,7 @@ dtclfree(DTClause *c)
        int i;
 
        if(c == nil) return;
-       if(--c->gr->ref == 0)
+       if(c->gr != nil && --c->gr->ref == 0)
                dtgfree(c->gr);
        for(i = 0; i < c->nprob; i++)
                free(c->probs[i]);