From: jjenista <jjenista>
Date: Tue, 26 Oct 2010 18:17:14 +0000 (+0000)
Subject: couple of minor bug fixes
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=25f4e6d483f4b7f7abb91363bdef52e1cbdc4240;p=IRC.git

couple of minor bug fixes
---

diff --git a/Robust/src/IR/Flat/BuildCode.java b/Robust/src/IR/Flat/BuildCode.java
index bdaec07a..f309ad5b 100644
--- a/Robust/src/IR/Flat/BuildCode.java
+++ b/Robust/src/IR/Flat/BuildCode.java
@@ -4212,12 +4212,12 @@ public class BuildCode {
                                      + waitingElement
                                      .getDynID()
                                      + ";");
-                      output.println("       rentry=mlpCreateFineREntry("
+                      output.println("       rentry=mlpCreateFineREntry(runningSESE->memoryQueueArray["+ queueID+ "],"
                                      + waitingElement.getStatus()
                                      + ", &(seseToIssue->common),  pointer );");
                     }
                   } else {
-                    output.println("       rentry=mlpCreateFineREntry("
+                    output.println("       rentry=mlpCreateFineREntry(runningSESE->memoryQueueArray["+ queueID+ "],"
                                    + waitingElement.getStatus()
                                    + ", &(seseToIssue->common), (void*)&seseToIssue->"
                                    + waitingElement.getDynID()
@@ -4327,7 +4327,7 @@ public class BuildCode {
                                  .getDynID()
                                  + ";");
                       output
-                        .println("     rentry=mlpCreateFineREntry("
+                        .println("     rentry=mlpCreateFineREntry(runningSESE->memoryQueueArray["+ queueID+ "],"
                                  + waitingElement
                                  .getStatus()
                                  + ", &(seseToIssue->common),  pointer );");
@@ -4335,7 +4335,7 @@ public class BuildCode {
                     }
                   } else {
                     output
-                      .println("     rentry=mlpCreateFineREntry("
+                      .println("     rentry=mlpCreateFineREntry(runningSESE->memoryQueueArray["+ queueID+ "],"
                                + waitingElement
                                .getStatus()
                                + ", &(seseToIssue->common),  (void*)&seseToIssue->"
diff --git a/Robust/src/Runtime/mlp_runtime.h b/Robust/src/Runtime/mlp_runtime.h
index 02ec3c89..1512bdb8 100644
--- a/Robust/src/Runtime/mlp_runtime.h
+++ b/Robust/src/Runtime/mlp_runtime.h
@@ -3,6 +3,8 @@
 
 
 #include <pthread.h>
+#include "runtime.h"
+#include "mem.h"
 #include "Queue.h"
 #include "psemaphore.h"
 #include "mlp_lock.h"
@@ -271,13 +273,13 @@ static inline void RELEASE_REFERENCE_TO( SESEcommon* seseRec ) {
 }
 
 static MemPool* taskpoolcreate( int itemSize ) {
-  MemPool* p    = RUNMALLOC( 1, sizeof( MemPool ) );
+  MemPool* p    = RUNMALLOC( sizeof( MemPool ) );
   SESEcommon *c = (SESEcommon *) p;
   pthread_cond_init( &(c->runningChildrenCond), NULL );
   pthread_mutex_init( &(c->lock), NULL );
 
   p->itemSize   = itemSize;
-  p->head       = RUNMALLOC( 1, itemSize );
+  p->head       = RUNMALLOC( itemSize );
   p->head->next = NULL;
   p->tail       = p->head;
   return p;