changeset 16:7731a4d31baa Univ_dev

new branch -- Univ_dev -- changed headers and PR__malloc
author Sean Halle <seanhalle@yahoo.com>
date Tue, 23 Jul 2013 07:30:42 -0700
parents 7a5228a4a377
children 6386ae5cc770
files ListOfArrays.c ListOfArrays.h __brch__Renamed_VMS_to_PR __brch__Univ_dev
diffstat 4 files changed, 14 insertions(+), 11 deletions(-) [+]
line diff
     1.1 --- a/ListOfArrays.c	Mon Sep 03 15:08:15 2012 -0700
     1.2 +++ b/ListOfArrays.c	Tue Jul 23 07:30:42 2013 -0700
     1.3 @@ -1,9 +1,9 @@
     1.4  
     1.5  #include "ListOfArrays.h"
     1.6 -#include "PR_impl/Services_Offered_by_PR/Memory_Handling/vmalloc.h"
     1.7 +#include "PR__common_includes/Services_Offered_by_PR/Memory_Handling/vmalloc__wrapper_library.h"
     1.8  
     1.9  ListOfArrays* makeListOfArrays(size_t entry_size, int num_entries_per_block){
    1.10 -    ListOfArrays* newLoA = (ListOfArrays*) PR_int__malloc(sizeof(ListOfArrays));
    1.11 +    ListOfArrays* newLoA = (ListOfArrays*) PR__malloc(sizeof(ListOfArrays));
    1.12      newLoA->dim1info = makePrivDynArrayOfSize(&(newLoA->dim1),8);
    1.13         
    1.14      newLoA->entry_size = entry_size;
    1.15 @@ -32,15 +32,15 @@
    1.16  }
    1.17  
    1.18  void freeListOfArrays(ListOfArrays* list){
    1.19 -    freeDynArrayDeep(list->dim1info,&PR_int__free);
    1.20 -    PR_int__free((void*)list);
    1.21 +    freeDynArrayDeep(list->dim1info,&PR_WL__free);
    1.22 +    PR_WL__free((void*)list);
    1.23  }
    1.24  
    1.25  /*
    1.26  void addToListOfArraysDependency(Dependency value, ListOfArrays* list){
    1.27      int offset_in_fragment = list->next_free_index % list->num_entries_per_fragment; 
    1.28      if(offset_in_fragment == 0){ 
    1.29 -        void* newBlock = PR_int__malloc(list->entry_size * list->num_entries_per_fragment); 
    1.30 +        void* newBlock = PR__malloc(list->entry_size * list->num_entries_per_fragment); 
    1.31          addToDynArray(newBlock,list->dim1info); 
    1.32      } 
    1.33      Dependency* typedFragment = (Dependency*) ((list->dim1)[list->dim1info->numInArray -1]); 
    1.34 @@ -51,7 +51,7 @@
    1.35  void addToListOfArraysUnit(Unit value, ListOfArrays* list){
    1.36      int offset_in_fragment = list->next_free_index % list->num_entries_per_fragment; 
    1.37      if(offset_in_fragment == 0){ 
    1.38 -        void* newBlock = PR_int__malloc(list->entry_size * list->num_entries_per_fragment); 
    1.39 +        void* newBlock = PR__malloc(list->entry_size * list->num_entries_per_fragment); 
    1.40          addToDynArray(newBlock,list->dim1info); 
    1.41      } 
    1.42      Unit* typedFragment = (Unit*) ((list->dim1)[list->dim1info->numInArray -1]); 
     2.1 --- a/ListOfArrays.h	Mon Sep 03 15:08:15 2012 -0700
     2.2 +++ b/ListOfArrays.h	Tue Jul 23 07:30:42 2013 -0700
     2.3 @@ -9,6 +9,9 @@
     2.4  #define	_LISTOFARRAYS_H
     2.5  
     2.6  #include<stddef.h>
     2.7 +#include <inttypes.h>
     2.8 +
     2.9 +#include "PR__common_includes/PR__primitive_data_types.h"
    2.10  #include "DynArray/DynArray.h"
    2.11  
    2.12  
    2.13 @@ -31,7 +34,7 @@
    2.14  #define addToListOfArrays(type,value,list) do { \
    2.15      int offset_in_fragment = list->next_free_index % list->num_entries_per_fragment; \
    2.16      if(offset_in_fragment == 0){ \
    2.17 -        void* newBlock = PR_int__malloc(list->entry_size * list->num_entries_per_fragment); \
    2.18 +        void* newBlock = PR__malloc(list->entry_size * list->num_entries_per_fragment); \
    2.19          addToDynArray(newBlock,list->dim1info); \
    2.20      } \
    2.21      type* typedFragment = (type*) ((list->dim1)[list->dim1info->numInArray -1]); \
     3.1 --- a/__brch__Renamed_VMS_to_PR	Mon Sep 03 15:08:15 2012 -0700
     3.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
     3.3 @@ -1,4 +0,0 @@
     3.4 -This branch is for the project structure defined Jan 2012..  the #includes reflect this directory structure.
     3.5 -
     3.6 -More importantly, the MC_shared  version of PR requires a separat malloc implemeted by PR code..  so this branch has modified the library to use the PR-specific malloc.
     3.7 -
     4.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     4.2 +++ b/__brch__Univ_dev	Tue Jul 23 07:30:42 2013 -0700
     4.3 @@ -0,0 +1,4 @@
     4.4 +This branch is for the project structure defined Jan 2012..  the #includes reflect this directory structure.
     4.5 +
     4.6 +More importantly, the MC_shared  version of PR requires a separat malloc implemeted by PR code..  so this branch has modified the library to use the PR-specific malloc.
     4.7 +