# HG changeset patch
# User Merten Sach <msach@mailbox.tu-berlin.de>
# Date 1316685682 -7200
# Node ID b37c384186379aae3f4c938fd3be66367a784234
# Parent  2c146b6b38900f26a1581df4c6179b1b39458978
changed memory allocation to distributed version

diff -r 2c146b6b3890 -r b37c38418637 SSR_PluginFns.c
--- a/SSR_PluginFns.c	Mon Aug 29 14:17:43 2011 +0200
+++ b/SSR_PluginFns.c	Thu Sep 22 12:01:22 2011 +0200
@@ -85,7 +85,11 @@
          default:
             break;
        }
-      
+      if(req->reqType == dissipate)
+      {
+          handleDissipate(requestingPr, semEnv);
+          break;
+      }
       req = VMS__take_next_request_out_of( requestingPr );
     } //while( req != NULL )
 
@@ -112,8 +116,6 @@
          break;
       case transfer_out:    handleTransferOut(  semReq,        semEnv);
          break;
-      case malloc_req:      handleMalloc(       semReq, reqPr, semEnv);
-         break;
       case free_req:        handleFree(         semReq, reqPr, semEnv);
          break;
       case singleton_fn_start:  handleStartFnSingleton(semReq, reqPr, semEnv);
@@ -141,7 +143,7 @@
 handleDissipate( VirtProcr *requestingPr, SSRSemEnv *semEnv )
  {
       //free any semantic data allocated to the virt procr
-   VMS__free( requestingPr->semanticData );
+   //VMS__free( requestingPr->semanticData );
 
       //Now, call VMS to free_all AppVP state -- stack and so on
    VMS__dissipate_procr( requestingPr );
diff -r 2c146b6b3890 -r b37c38418637 SSR_Request_Handlers.c
--- a/SSR_Request_Handlers.c	Mon Aug 29 14:17:43 2011 +0200
+++ b/SSR_Request_Handlers.c	Thu Sep 22 12:01:22 2011 +0200
@@ -344,18 +344,6 @@
 
  }
 
-
-/*
- */
-void
-handleMalloc( SSRSemReq *semReq, VirtProcr *requestingPr, SSRSemEnv *semEnv )
- { void *ptr;
-
-   ptr = VMS__malloc( semReq->sizeToMalloc );
-   requestingPr->dataRetFromReq = ptr;
-   resume_procr( requestingPr, semEnv );
- }
-
 /*
  */
 void
diff -r 2c146b6b3890 -r b37c38418637 SSR_Request_Handlers.h
--- a/SSR_Request_Handlers.h	Mon Aug 29 14:17:43 2011 +0200
+++ b/SSR_Request_Handlers.h	Thu Sep 22 12:01:22 2011 +0200
@@ -29,10 +29,6 @@
 inline void
 handleTransferOut( SSRSemReq *semReq, SSRSemEnv *semEnv);
 inline void
-handleMalloc( SSRSemReq *semReq, VirtProcr *requestingPr, SSRSemEnv *semEnv);
-inline void
-handleFree( SSRSemReq *semReq, VirtProcr *requestingPr, SSRSemEnv *semEnv );
-inline void
 handleTransEnd(SSRSemReq *semReq, VirtProcr *requestingPr, SSRSemEnv*semEnv);
 inline void
 handleTransStart( SSRSemReq *semReq, VirtProcr *requestingPr,
diff -r 2c146b6b3890 -r b37c38418637 SSR_lib.c
--- a/SSR_lib.c	Mon Aug 29 14:17:43 2011 +0200
+++ b/SSR_lib.c	Thu Sep 22 12:01:22 2011 +0200
@@ -320,15 +320,8 @@
 
 void *
 SSR__malloc_to( int32 sizeToMalloc, VirtProcr *owningPr )
- { SSRSemReq reqData;
-
-   reqData.reqType      = malloc_req;
-   reqData.sendPr       = owningPr;
-   reqData.sizeToMalloc = sizeToMalloc;
-
-   VMS__send_sem_request( &reqData, owningPr );
-
-   return owningPr->dataRetFromReq;
+ { 
+    return VMS__malloc_in_lib(sizeToMalloc, owningPr);
  }