Changeset 244

Timestamp:

Jun 6, 2013, 5:39:18 PM (11 years ago)

Author:

brejon

Message:

• Update malloc (remote free)
• bugfix in spin_lock (bad register used in asm inline)
• memo/Makefile clean rule : added "-f" option to rm command
• main Makefile :
  • added spin_lock.o in dhrystone object files
  • added rules to compile spin_lock

Location:

soft/giet_vm

Files:

• Makefile (modified) (2 diffs)
• libs/malloc.c (modified) (50 diffs)
• libs/malloc.h (modified) (1 diff)
• libs/malloc_private.h (modified) (1 diff)
• libs/spin_lock.c (modified) (2 diffs)
• memo/Makefile (modified) (1 diff)
• xml/mapping_info.h (modified) (12 diffs)

soft/giet_vm/Makefile

@@ -43 +43 @@
                  build/libs/utils.o \
                  build/libs/string.o \
+                 build/libs/spin_lock.o \
                  build/libs/malloc.o
 
@@ -151 +152 @@
         $(CC) $(CFLAGS) $(INCLUDE) -c -o $@ $<
 
+build/libs/spin_lock.o: libs/spin_lock.c libs/spin_lock.h
+        $(CC) $(CFLAGS) $(INCLUDE) -c -o $@ $<
+
 ### clean 
 clean:

soft/giet_vm/libs/malloc.c

@@ -6 +6 @@
 heap_ll * _heap_head[NB_TASKS_MAX];
 
-unsigned int _heap_base[NB_TASKS_MAX];
-unsigned int _heap_length[NB_TASKS_MAX];
+heap_ll * _remote_free_list[NB_TASKS_MAX] = { 0 };
+giet_lock_t lock_rf_list[NB_TASKS_MAX] = { {"toto",0} };
+
+unsigned int _heap_base[NB_TASKS_MAX] = { -1 };
+unsigned int _heap_length[NB_TASKS_MAX] = { -1 };
 
 int _first_malloc[NB_TASKS_MAX] = { 0 };
@@ -15 +18 @@
 
 #elif MALLOC_SELECTED == 2
-    heap_ll * _prev_next_last_allocted[NB_TASKS_MAX] = { 0 };
+heap_ll * _prev_next_last_allocted[NB_TASKS_MAX] = { 0 };
 #else
-    #define MAX_SIZE_POW2_TAB 28 
-    #define GET_TAB_INDEX(size) (size == 0x00000008) ? 0 :\
-                            (size <= 0x00000010) ? 1 :\
-                            (size <= 0x00000020) ? 2 :\
-                            (size <= 0x00000040) ? 3 :\
-                            (size <= 0x00000080) ? 4 :\
-                            (size <= 0x00000100) ? 5 :\
-                            (size <= 0x00000200) ? 6 :\
-                            (size <= 0x00000400) ? 7 :\
-                            (size <= 0x00000800) ? 8 :\
-                            (size <= 0x00001000) ? 9 :\
-                            (size <= 0x00002000) ? 10 :\
-                            (size <= 0x00004000) ? 11 :\
-                            (size <= 0x00008000) ? 12 :\
-                            (size <= 0x00010000) ? 13 :\
-                            (size <= 0x00020000) ? 14 :\
-                            (size <= 0x00040000) ? 15 :\
-                            (size <= 0x00080000) ? 16 :\
-                            (size <= 0x00100000) ? 17 :\
-                            (size <= 0x00200000) ? 18 :\
-                            (size <= 0x00400000) ? 19 :\
-                            (size <= 0x00800000) ? 20 :\
-                            (size <= 0x01000000) ? 21 :\
-                            (size <= 0x02000000) ? 22 :\
-                            (size <= 0x04000000) ? 23 :\
-                            (size <= 0x08000000) ? 24 :\
-                            (size <= 0x10000000) ? 25 :\
-                            (size <= 0x20000000) ? 26 :\
-                                                   27
-
-    heap_ll * _pow2tab[NB_TASKS_MAX][MAX_SIZE_POW2_TAB] = {{ 0 }};
+#define MAX_SIZE_POW2_TAB 28 
+#define GET_TAB_INDEX(size)                 (size == 0x00000008) ? 0 :\
+                                            (size <= 0x00000010) ? 1 :\
+                                            (size <= 0x00000020) ? 2 :\
+                                            (size <= 0x00000040) ? 3 :\
+                                            (size <= 0x00000080) ? 4 :\
+                                            (size <= 0x00000100) ? 5 :\
+                                            (size <= 0x00000200) ? 6 :\
+                                            (size <= 0x00000400) ? 7 :\
+                                            (size <= 0x00000800) ? 8 :\
+                                            (size <= 0x00001000) ? 9 :\
+                                            (size <= 0x00002000) ? 10 :\
+                                            (size <= 0x00004000) ? 11 :\
+                                            (size <= 0x00008000) ? 12 :\
+                                            (size <= 0x00010000) ? 13 :\
+                                            (size <= 0x00020000) ? 14 :\
+                                            (size <= 0x00040000) ? 15 :\
+                                            (size <= 0x00080000) ? 16 :\
+                                            (size <= 0x00100000) ? 17 :\
+                                            (size <= 0x00200000) ? 18 :\
+                                            (size <= 0x00400000) ? 19 :\
+                                            (size <= 0x00800000) ? 20 :\
+                                            (size <= 0x01000000) ? 21 :\
+                                            (size <= 0x02000000) ? 22 :\
+                                            (size <= 0x04000000) ? 23 :\
+                                            (size <= 0x08000000) ? 24 :\
+                                            (size <= 0x10000000) ? 25 :\
+                                            (size <= 0x20000000) ? 26 :\
+                                                                   27
+
+heap_ll * _pow2tab[NB_TASKS_MAX][MAX_SIZE_POW2_TAB] = {{ 0 }};
 #endif
 
-/* Todo: meilleure gestion des printf
-//#if DEBUG_MALLOC == 1
-unsigned int debug_level = 2;
-#elif DEBUG_MALLOC == 0
-
-#define giet_printf(level, ...)                 \
-({                                           \
-if (debug_level < level) {              \
-giet_tty_printf(__VA_ARGS__);       \
-}                                       \
-})
-*/
+
+#if DEBUG_MALLOC == 1              
+#define giet_printf(...)                \
+    ({                                      \
+     giet_tty_printf(__VA_ARGS__);       \
+     })                                  
+#else
+#define giet_printf(...) ({   })
+#endif
+
 
 
 #if MALLOC_SELECTED == 1
-
+/*########################################################################*/
+/**************************************************************************/
+/**********                     WORST-FIT                       ***********/
+/**************************************************************************/
+/*########################################################################*/
 heap_ll *get_prev_fit_chunk(unsigned int size) {
     int task_id = giet_global_task_id();
+    int check_remote_free_list = 0;
+after_remote_list_check :
     if (_heap_head[task_id] == 0x0) {
+        if(check_remote_free_list == 0)
+        {
+            heap_ll * poped_block;
+            heap_ll * head_of_rf;
+            check_remote_free_list = 1;
+
+            head_of_rf = pop_ptr();
+
+            while((poped_block = pop_remote_free_list(&head_of_rf)) != 0x0)
+            {
+                update_chunk_list((unsigned int)poped_block, poped_block->chunk_length);
+            }
+            goto after_remote_list_check; 
+        }
         return ((heap_ll *) 0x01);
     }
@@ -87 +108 @@
         ptr_to_chunk_list = ptr_to_chunk_list->next;
     }
-    if (found == 1) {
+    if (found == 1)
+    {
         return prev_tmp; // case when prev_tmp == 0x0 is handled in the calling function
     }
-    else {
+    else
+    {
+        if(check_remote_free_list == 0)
+        {
+            heap_ll * poped_block;
+            heap_ll * head_of_rf;
+            check_remote_free_list = 1;
+
+            head_of_rf = pop_ptr();
+
+            while((poped_block = pop_remote_free_list(&head_of_rf)) != 0x0)
+            {
+                update_chunk_list((unsigned int)poped_block, poped_block->chunk_length);
+            }
+            goto after_remote_list_check; 
+        }
         return (heap_ll *) 0x1;
     }
@@ -100 +137 @@
     int task_id = giet_global_task_id();
 
-#if DEBUG_MALLOC == 1
-    giet_tty_printf("############ MALLOC ############\n\n");
-#endif
+    giet_printf("############ MALLOC ############\n\n");
     if (size == 0) {
-#if DEBUG_MALLOC == 1
-        giet_tty_printf(" SIZE = 0 \n");
-#endif
+
+        giet_printf(" SIZE = 0 \n");
         return 0x0;
     }
@@ -115 +149 @@
 
         if (_heap_length[task_id] == 0) {
-            giet_tty_printf("*** Error: Malloc called in task %d while no heap was defined.\n", task_id);
+            giet_printf("*** Error: Malloc called in task %d and no heap was defined.\n", task_id);
             return 0x0;
         }
@@ -133 +167 @@
 
 
-#if DEBUG_MALLOC == 1
-    giet_tty_printf("Looking for size : %d\n", size_align + 4);
-#endif
+
+    giet_printf("Looking for size : %d\n", size_align + 4);
     /****** Get prev victim from the chunks list ******/
     heap_ll *victim;
@@ -171 +204 @@
         heap_ll * tmp_chunk = victim;
         victim = (heap_ll *) (((unsigned int) victim) + (size_align + 4));
-#if DEBUG_MALLOC == 1
-        giet_tty_printf("NEXT CHUNK is at @ : 0x%x + 0x%x = 0x%x\n",
+
+        giet_printf("NEXT CHUNK is at @ : 0x%x + 0x%x = 0x%x\n",
                 (unsigned int) tmp_chunk,
                 (unsigned int) ((size_align + 4) / 4),
                 (unsigned int) victim);
-#endif
 
         victim->chunk_length = tmp_chunk->chunk_length - (size_align + 4);
@@ -190 +222 @@
     /****** Write Overhead ******/
     *((unsigned int *) victim_vbase) = size_align;      // writing overhead on the first word
-#if DEBUG_MALLOC == 1
-    giet_tty_printf("BLOCK SUCCESSFULLY ALLOCATED at @ 0x%x user will write at @ 0x%x\n\n"\
+
+    giet_printf("BLOCK SUCCESSFULLY ALLOCATED at @ 0x%x user will write at @ 0x%x\n\n"\
             ,(unsigned int)(victim_vbase),(unsigned int) (victim_vbase + 4));
-#endif
     return (unsigned int *) (victim_vbase + 4);
 }
@@ -210 +241 @@
         ((heap_ll *) block_base)->next = 0x0;
         _heap_head[task_id] = ((heap_ll *) block_base);
-#if DEBUG_MALLOC == 1
-        giet_tty_printf("****** NEW BLOCK ******\n"
+
+        giet_printf("****** NEW BLOCK ******\n"
                 "@ : %x\n"
                 "Length : %d o\n"
@@ -217 +248 @@
                 block_base,
                 (unsigned int) (((heap_ll *) block_base)->chunk_length));
-#endif
         return;
     }
@@ -232 +262 @@
         /*  [.....|ptr|block|.....] */
         if ((unsigned int) (ptr_to_chunk_list) + chunk_length == block_base) {
-#if DEBUG_MALLOC == 1
-            giet_tty_printf("****** BLOCK MERGED ******\n"
+
+            giet_printf("****** BLOCK MERGED ******\n"
                     "CHUNK : %x of size %d o\n"
                     "merged with \n"
@@ -241 +271 @@
                     ptr_to_chunk_list->chunk_length, block_base,
                     block_length);
-#endif
 
             /* update the size */
@@ -264 +293 @@
             block_base = (unsigned int) ptr_to_chunk_list;
             block_length = ptr_to_chunk_list->chunk_length;
-#if DEBUG_MALLOC == 1
-            giet_tty_printf("****** NEW BLOCK ******\n"
+
+            giet_printf("****** NEW BLOCK ******\n"
                     "@ : %x\n"
                     "Length : %d o\n"
@@ -271 +300 @@
                     (unsigned int) ptr_to_chunk_list,
                     (unsigned int) (ptr_to_chunk_list->chunk_length));
-#endif
             prev_block_base = prev;
             prev = ptr_to_chunk_list;
@@ -281 +309 @@
         /*  [......|block|ptr|.....] */
         if (block_base + block_length == (unsigned int) ptr_to_chunk_list) {
-#if DEBUG_MALLOC == 1
-            giet_tty_printf("****** BLOCK MERGED ******\n"
+
+            giet_printf("****** BLOCK MERGED ******\n"
                     "BLOCK : %x of size %d o\n"
                     "merged with \n"
@@ -290 +318 @@
                     (unsigned int) ptr_to_chunk_list,
                     ptr_to_chunk_list->chunk_length);
-#endif
 
             /* update the size */
@@ -316 +343 @@
             ptr_to_chunk_list = ((heap_ll *) block_base);
             block_length = ptr_to_chunk_list->chunk_length;
-#if DEBUG_MALLOC == 1
-            giet_tty_printf("****** NEW BLOCK ******\n"
+
+            giet_printf("****** NEW BLOCK ******\n"
                     "@ : %x\n"
                     "Length : %d o\n"
@@ -323 +350 @@
                     (unsigned int) ptr_to_chunk_list,
                     (unsigned int) (ptr_to_chunk_list->chunk_length));
-#endif
             prev_block_base = prev;
             block_merged = 1;
@@ -339 +365 @@
     ((heap_ll *) block_base)->next = 0x0;
     prev->next = ((heap_ll *) block_base);
-#if DEBUG_MALLOC == 1
-    giet_tty_printf("****** NEW BLOCK ******\n"
+
+    giet_printf("****** NEW BLOCK ******\n"
             "@ : %x\n"
             "Length : %d o\n"
@@ -346 +372 @@
             block_base,
             (unsigned int) (((heap_ll *) block_base)->chunk_length));
-#endif
     return;
 
@@ -352 +377 @@
 
 
-static void print_all_heap(void) {
-    int task_id = giet_global_task_id();
-    heap_ll * ptr_to_chunk_list = _heap_head[task_id];
-    giet_tty_printf("################### PRINT ALL HEAP ######################\n");
-    while (ptr_to_chunk_list != 0x0) {
-        giet_tty_printf("CHUNK at @ : %x\n"
-                "OVERHEAD : %d\n"
-                "NEXT : %x\n\n",
-                (unsigned int) ptr_to_chunk_list,
-                ptr_to_chunk_list->chunk_length,
-                (unsigned int) ptr_to_chunk_list->next);
-        ptr_to_chunk_list = ptr_to_chunk_list->next;
-    }
-    giet_tty_printf("#########################################################\n");
-}
-
-
-/* Warning: the division doesn't seem to work well in the giet/soclib ? */
-static void frag(int turn) {
-    int task_id = giet_global_task_id();
-    int nb_blocks = 0;
-    int size = 0;
-    heap_ll * ptr_to_chunk;
-    ptr_to_chunk = _heap_head[task_id];
-    while(ptr_to_chunk != 0x0) {
-        size += ptr_to_chunk->chunk_length;
-        nb_blocks += 1;
-        ptr_to_chunk = ptr_to_chunk->next;
-    }
-    if (size != 0) {
-        giet_tty_printf("%.3f\t%d\n", size / ((double) nb_blocks), turn);
-    }
-}
-
-// End WORST_FIT
+
+/*########################################################################*/
+/**************************************************************************/
+/**********                 END WORST-FIT                       ***********/
+/**************************************************************************/
+/*########################################################################*/
 #elif MALLOC_SELECTED == 2 // Next Fit 
+/*########################################################################*/
+/**************************************************************************/
+/**********                   NEXT-FIT                          ***********/
+/**************************************************************************/
+/*########################################################################*/
 
 heap_ll * get_prev_fit_chunk(unsigned int size) {
     int task_id = giet_global_task_id();
+    int check_remote_free_list = 0;
+after_remote_list_check_n : //n for next_fit
     if (_heap_head[task_id] == 0x0) {
+        if(check_remote_free_list == 0)
+        {
+            heap_ll * poped_block;
+            heap_ll * head_of_rf;
+            check_remote_free_list = 1;
+
+            head_of_rf = pop_ptr();
+
+            while((poped_block = pop_remote_free_list(&head_of_rf)) != 0x0)
+            {
+                update_chunk_list((unsigned int)poped_block, poped_block->chunk_length);
+            }
+            goto after_remote_list_check_n; 
+        }
         return ((heap_ll *) 0x1);
     }
@@ -421 +438 @@
         ptr_to_chunk_list = ptr_to_chunk_list->next;
     } while (ptr_to_chunk_list != tmp_turn);
+    if(check_remote_free_list == 0)
+    {
+        heap_ll * poped_block;
+        heap_ll * head_of_rf;
+        check_remote_free_list = 1;
+
+        head_of_rf = pop_ptr();
+
+        while((poped_block = pop_remote_free_list(&head_of_rf)) != 0x0)
+        {
+            update_chunk_list((unsigned int)poped_block, poped_block->chunk_length);
+        }
+        goto after_remote_list_check_n; 
+    }
 
     return (heap_ll *) 0x1;
@@ -429 +460 @@
 
     int task_id = giet_global_task_id();
-#if DEBUG_MALLOC == 1
-    giet_tty_giet_tty_printf("############ MALLOC ############\n\n");
-#endif
+
+    giet_printf("############ MALLOC ############\n\n");
     if (size == 0) {
-#if DEBUG_MALLOC == 1
-        giet_tty_giet_tty_printf(" SIZE = 0 \n");
-#endif
+
+        giet_printf(" SIZE = 0 \n");
         return 0x0;
     }
@@ -444 +473 @@
 
         if (_heap_length[task_id] == 0) {
-            giet_tty_printf("*** Error: Malloc called in task %d while no heap was defined.\n", task_id);
+            giet_printf("*** Error: Malloc called in task %d while no heap was defined.\n", task_id);
             return 0x0;
         }
@@ -464 +493 @@
 
 
-#if DEBUG_MALLOC == 1
-    giet_tty_giet_tty_printf("Looking for size : %d\n", size_align + 4);
-#endif
+
+    giet_printf("Looking for size : %d\n", size_align + 4);
     /****** Get prev victim from the chunks list ******/
     heap_ll *victim;
@@ -528 +556 @@
         heap_ll * tmp_chunk = victim;
         victim = (heap_ll *) (((unsigned int) victim) + (size_align + 4));
-#if DEBUG_MALLOC == 1
-        giet_tty_giet_tty_printf("NEXT CHUNK is at @ : 0x%x + 0x%x = 0x%x\n",
+
+        giet_printf("NEXT CHUNK is at @ : 0x%x + 0x%x = 0x%x\n",
                 (unsigned int) tmp_chunk,
                 (unsigned int) ((size_align + 4) / 4),
                 (unsigned int) victim);
-#endif
 
         victim->chunk_length = tmp_chunk->chunk_length - (size_align + 4);
@@ -559 +586 @@
     /****** Write Overhead ******/
     *((unsigned int *) victim_vbase) = size_align;      // writing overhead on the first word
-#if DEBUG_MALLOC == 1
-    giet_tty_giet_tty_printf("BLOCK SUCCESSFULLY ALLOCATED at @ 0x%x user will write at @ 0x%x\n\n"\
+
+    giet_printf("BLOCK SUCCESSFULLY ALLOCATED at @ 0x%x user will write at @ 0x%x\n\n"\
             ,(unsigned int)(victim_vbase),(unsigned int )(victim_vbase + 4));
-#endif
     return (unsigned int *) (victim_vbase + 4);
 }
@@ -579 +605 @@
         ((heap_ll *) block_base)->next = 0x0;
         _heap_head[task_id] = ((heap_ll *) block_base);
-#if DEBUG_MALLOC == 1
-        giet_tty_giet_tty_printf("****** NEW BLOCK ******\n"
+
+        giet_printf("****** NEW BLOCK ******\n"
                 "@ : %x\n"
                 "Length : %d o\n"
@@ -586 +612 @@
                 block_base,
                 (unsigned int) (((heap_ll *) block_base)->chunk_length));
-#endif
         return;
     }
@@ -600 +625 @@
         /*  [.....|ptr|block|.....] */
         if ((unsigned int) (ptr_to_chunk_list) + chunk_length == block_base) {
-#if DEBUG_MALLOC == 1
-            giet_tty_giet_tty_printf("****** BLOCK MERGED ******\n"
+
+            giet_printf("****** BLOCK MERGED ******\n"
                     "CHUNK : %x of size %d o\n"
                     "merged with \n"
@@ -609 +634 @@
                     ptr_to_chunk_list->chunk_length, block_base,
                     block_length);
-#endif
             if (_prev_next_last_allocted[task_id] == ptr_to_chunk_list) {
                 _prev_next_last_allocted[task_id] = ptr_to_chunk_list->next;
@@ -636 +660 @@
             block_base = (unsigned int) ptr_to_chunk_list;
             block_length = ptr_to_chunk_list->chunk_length;
-#if DEBUG_MALLOC == 1
-            giet_tty_giet_tty_printf("****** NEW BLOCK ******\n"
+
+            giet_printf("****** NEW BLOCK ******\n"
                     "@ : %x\n"
                     "Length : %d o\n"
@@ -643 +667 @@
                     (unsigned int) ptr_to_chunk_list,
                     (unsigned int) (ptr_to_chunk_list->chunk_length));
-#endif
             prev_block_base = prev;
             prev = ptr_to_chunk_list;
@@ -653 +676 @@
         /*  [......|block|ptr|.....] */
         if (block_base + block_length == (unsigned int) ptr_to_chunk_list) {
-#if DEBUG_MALLOC == 1
-            giet_tty_giet_tty_printf("****** BLOCK MERGED ******\n"
+
+            giet_printf("****** BLOCK MERGED ******\n"
                     "BLOCK : %x of size %d o\n"
                     "merged with \n"
@@ -662 +685 @@
                     (unsigned int) ptr_to_chunk_list,
                     ptr_to_chunk_list->chunk_length);
-#endif
 
             if (_prev_next_last_allocted[task_id] == ptr_to_chunk_list) {
@@ -698 +720 @@
             ptr_to_chunk_list = ((heap_ll *) block_base);
             block_length = ptr_to_chunk_list->chunk_length;
-#if DEBUG_MALLOC == 1
-            giet_tty_giet_tty_printf("****** NEW BLOCK ******\n"
+
+            giet_printf("****** NEW BLOCK ******\n"
                     "@ : %x\n"
                     "Length : %d o\n"
@@ -705 +727 @@
                     (unsigned int) ptr_to_chunk_list,
                     (unsigned int) (ptr_to_chunk_list->chunk_length));
-#endif
             prev_block_base = prev;
             block_merged = 1;
@@ -725 +746 @@
     prev->next = ((heap_ll *) block_base);
 
-#if DEBUG_MALLOC == 1
-    giet_tty_giet_tty_printf("****** NEW BLOCK ******\n"
+
+    giet_printf("****** NEW BLOCK ******\n"
             "@ : %x\n"
             "Length : %d o\n"
@@ -732 +753 @@
             block_base,
             (unsigned int) (((heap_ll *) block_base)->chunk_length));
-#endif
     return;
 }
 
 
-void print_all_heap(void) {
-    int task_id = giet_global_task_id();
-    heap_ll * ptr_to_chunk_list = _heap_head[task_id];
-    giet_tty_printf("################### PRINT ALL HEAP ######################\n");
-    while (ptr_to_chunk_list != 0x0) {
-        giet_tty_printf("CHUNK at @ : %x\n"
-                "OVERHEAD : %d\n"
-                "NEXT : %x\n\n",
-                (unsigned int) ptr_to_chunk_list,
-                ptr_to_chunk_list->chunk_length,
-                (unsigned int) ptr_to_chunk_list->next);
-        ptr_to_chunk_list = ptr_to_chunk_list->next;
-    }
-    giet_tty_printf("#########################################################\n");
-}
-
-
-void frag(int turn) {
-    int task_id = giet_global_task_id();
-    int nb_blocks = 0;
-    int size = 0;
-    heap_ll * ptr_to_chunk;
-    ptr_to_chunk = _heap_head[task_id];
-    while (ptr_to_chunk != 0x0) {
-        size += ptr_to_chunk->chunk_length;
-        nb_blocks += 1;
-        ptr_to_chunk = ptr_to_chunk->next;
-    }
-    //   assert(size != 0 || nb_blocks == 0);
-    if (size != 0) {
-        giet_tty_printf("%.3f\t%d\n", size / ((double) nb_blocks), turn);
-    }
-}
-
-
-
+
+/*########################################################################*/
+/**************************************************************************/
+/**********                 END NEXT-FIT                        ***********/
+/**************************************************************************/
+/*########################################################################*/
 
 #else // Default case : New Fit
+
+/*########################################################################*/
+/**************************************************************************/
+/**********                    CLOSE-FIT                        ***********/
+/**************************************************************************/
+/*########################################################################*/
 
 
 int get_prev_fit_chunk(unsigned int size) {
     int task_id = giet_global_task_id();
-    int index = GET_TAB_INDEX(size);
+    int check_remote_free_list = 0;
+    int index;
+after_remote_list_check_c : //c for close fit
+    index = GET_TAB_INDEX(size);
     while (index != MAX_SIZE_POW2_TAB) {
         if (_pow2tab[task_id][index] != 0x0) {
@@ -786 +785 @@
         index++;
     }
+
+    if(check_remote_free_list == 0)
+    {
+        heap_ll * poped_block;
+        heap_ll * head_of_rf;
+        check_remote_free_list = 1;
+
+        head_of_rf = pop_ptr();
+
+        while((poped_block = pop_remote_free_list(&head_of_rf)) != 0x0)
+        {
+            update_chunk_list((unsigned int)poped_block, poped_block->chunk_length);
+        }
+        goto after_remote_list_check_c; 
+    }
+
     return -1;
 }
@@ -793 +808 @@
 void * malloc(unsigned int size) {
     int task_id = giet_global_task_id();
-#if DEBUG_MALLOC == 1
-    giet_tty_printf("############ MALLOC ############\n\n");
-#endif
+
+    giet_printf("############ MALLOC ############\n\n");
     if(size == 0) {
-#if DEBUG_MALLOC == 1
-        giet_tty_printf(" SIZE = 0 \n");
-#endif
+
+        giet_printf(" SIZE = 0 \n");
         return 0x0;
     }
     if (size > 0x20000000) {
-#if DEBUG_MALLOC == 1
-        giet_tty_printf("ERROR max size = %d\n",0x20000000); 
-#endif
+
+        giet_printf("ERROR max size = %d\n",0x20000000); 
         return 0x0;
     }
@@ -817 +829 @@
 
         if (_heap_length[task_id] == 0) {
-            giet_tty_printf("*** Error: Malloc called in task %d while no heap was defined.\n", task_id);
+            giet_printf("*** Error: Malloc called in task %d while no heap was defined.\n", task_id);
             return 0x0;
         }
@@ -838 +850 @@
     }
 
-#if DEBUG_MALLOC == 1
-    giet_tty_printf("Looking for size : %d %d = %d\n", size_align, 4,size_align+4);
-#endif
+
+    giet_printf("Looking for size : %d %d = %d\n", size_align, 4,size_align+4);
 
 
@@ -871 +882 @@
         _pow2tab[task_id][new_index] = new_chunk;
 
-#if DEBUG_MALLOC == 1
-        giet_tty_printf("NEXT CHUNK is at @ : 0x%x + 0x%x = 0x%x : @ of size over the block : %x\n",
+
+        giet_printf("NEXT CHUNK is at @ : 0x%x + 0x%x = 0x%x : @ of size over the block : %x\n",
                 (unsigned int) victim,
                 (unsigned int) ((size_align + 4) / 4),
                 (unsigned int) new_chunk,
                 ((unsigned int) new_chunk + new_chunk->chunk_length) - 4);
-#endif
     }
 
     /****** Write Overhead ******/
     *((unsigned int *) victim_vbase) = size_align;      // writing overhead on the first word
-#if DEBUG_MALLOC == 1
-    giet_tty_printf("BLOCK SUCCESSFULLY ALLOCATED at @ 0x%x user will write at @ 0x%x\n\n",\
+
+    giet_printf("BLOCK SUCCESSFULLY ALLOCATED at @ 0x%x user will write at @ 0x%x\n\n",\
             (unsigned int)(victim_vbase), (unsigned int ) (victim_vbase + 4));
-#endif
 
     return (unsigned int *) (victim_vbase + 4);
@@ -910 +919 @@
     if (block_base - 4 >= _heap_base[task_id]) {
 
-#if DEBUG_MALLOC == 1
-        giet_tty_printf("############# LEFT MERGE #############\n\n");
-#endif
+
+        giet_printf("############# LEFT MERGE #############\n\n");
         left_block_size = *((unsigned int *) (block_base - 4));
         left_block_index = GET_TAB_INDEX(left_block_size);
@@ -920 +928 @@
 
     if ((block_base + block_length) <= (_heap_base[task_id] + _heap_length[task_id]) - 8) {
-#if DEBUG_MALLOC == 1
-        giet_tty_printf("############# RIGHT MERGE #############\n\n");
-#endif
+
+        giet_printf("############# RIGHT MERGE #############\n\n");
         right_block_size = ((heap_ll *)(block_base + block_length))->chunk_length;
         right_block_index = GET_TAB_INDEX(right_block_size);
@@ -929 +936 @@
     }
 
-#if DEBUG_MALLOC == 1
-    giet_tty_printf("############# END PREP MERGE #############\n\n");
-#endif
+
+    giet_printf("############# END PREP MERGE #############\n\n");
 
     heap_ll * ptr_to_chunk = 0x0;
@@ -1012 +1018 @@
     _pow2tab[task_id][new_index] = new_addr;
 
+    giet_printf("########################  UPDT SUCCESS ######################\n");
+
     return;
 }
 
 
-static void print_all_heap(void) {
+
+
+/*########################################################################*/
+/**************************************************************************/
+/**********                 END CLOSE-FIT                       ***********/
+/**************************************************************************/
+/*########################################################################*/
+
+#endif // New Fit
+
+heap_ll * pop_remote_free_list(heap_ll ** head)
+{
+
+    heap_ll * poped_block;
+
+    if (*head == 0x0)
+    {
+        giet_printf(" no block to pop\n");
+        return 0x0;
+    }
+    else
+    {
+        poped_block = *head;
+        *head = (*head)->next;
+
+        giet_printf(" : @%x, size : %x\n", poped_block, poped_block->chunk_length);
+    }
+
+    return poped_block;
+}
+
+heap_ll * pop_ptr(void)
+{
     int task_id = giet_global_task_id();
+    heap_ll * head_of_rf_list;
+    giet_printf(" -- POP lock acquire -- for %d : @ : %x\n", task_id, &lock_rf_list[task_id]);
+    lock_acquire(&lock_rf_list[task_id]);
+    giet_printf(" -- POP lock acquired --\n");
+
+    head_of_rf_list = _remote_free_list[task_id];
+    _remote_free_list[task_id] = 0x0;
+
+    lock_release(&lock_rf_list[task_id]);
+    return head_of_rf_list;
+
+}
+
+void insert_in_remote_free_list(unsigned int remote_owner_id, unsigned int block_base, unsigned int block_length)
+{
+
+    giet_printf("############### INSERT \n");
+    ((heap_ll *)block_base)->chunk_length = block_length;
+
+    giet_printf(" -- INSERT lock acquire -- for %d : @ : %x\n", remote_owner_id, &lock_rf_list[remote_owner_id]);
+    lock_acquire(&lock_rf_list[remote_owner_id]);
+
+    giet_printf(" -- INSERT lock acquired -- \n");
+
+    // insertion en début de liste
+    giet_printf("  in remote_owner %d ...\n", remote_owner_id);
+    if (_remote_free_list[remote_owner_id] == 0x0)
+    {
+        ((heap_ll *)block_base)->next = 0x0;
+    } 
+    else
+    {
+        ((heap_ll *)block_base)->next = _remote_free_list[remote_owner_id];
+    }
+    _remote_free_list[remote_owner_id] = ((heap_ll *)block_base);
+
+    giet_printf("  : OK\n\n");
+    giet_printf(" new head : %x : of size : %x, with next : %x\n", _remote_free_list[remote_owner_id], _remote_free_list[remote_owner_id]->chunk_length, _remote_free_list[remote_owner_id]->next);
+
+    lock_release(&lock_rf_list[remote_owner_id]);
+
+    return;
+}
+
+void free(void * ptr) {
     int i = 0;
-    int nb_blocks = 0;
-    heap_ll * ptr_to_chunk_list;
-    giet_tty_printf("################### PRINT ALL HEAP ######################\n");
-    while (i != MAX_SIZE_POW2_TAB) {
-        ptr_to_chunk_list = _pow2tab[task_id][i];
-
-        if (ptr_to_chunk_list != 0x0) {
-            giet_tty_printf("###################### %d ####################\n", i);
-        }
-        while (ptr_to_chunk_list != 0x0) {
-            giet_tty_printf("CHUNK at @ : %x\n"
-                    "OVERHEAD : %d\n"
-                    "NEXT : %x\n\n",
-                    (unsigned int) ptr_to_chunk_list,
-                    ptr_to_chunk_list->chunk_length,
-                    (unsigned int) ptr_to_chunk_list->next);
-            ptr_to_chunk_list = ptr_to_chunk_list->next;
-            nb_blocks++;
+    while (i != NB_TASKS_MAX)
+    {
+        if( _heap_base[i] == -1)
+        {
+            continue;
+        }
+        if ((unsigned int)ptr > _heap_base[i] && (unsigned int)ptr < _heap_base[i] + _heap_length[i])
+        {
+            break;
         }
         i++;
     }
-    giet_tty_printf("####################### ##%d## ##########################\n", nb_blocks);
-}
-
-
-static void frag(int turn) {
-    int task_id = giet_global_task_id();
-    int i = 0;
-    int nb_blocks = 0;
-    int size = 0;
-    heap_ll * ptr_to_chunk;
-    while (i != MAX_SIZE_POW2_TAB) {
-        ptr_to_chunk = _pow2tab[task_id][i];
-        while (ptr_to_chunk != 0x0) {
-            size += ptr_to_chunk->chunk_length;
-            nb_blocks += 1;
-            ptr_to_chunk = ptr_to_chunk->next;
-        }
-        i++;
-    }
-    if (size != 0) {
-        giet_tty_printf("%.3f\t%d\n",size / ((double) nb_blocks), turn);
-    }
-}
-
-
-
-#endif // New Fit
-
-
-void free(void * ptr) {
+
     int task_id = giet_global_task_id();
     unsigned int * to_free = ptr;
-    unsigned int heapB = _heap_base[task_id];
-    unsigned int heapL = _heap_length[task_id];
+    unsigned int heapB;
+    unsigned int heapL;
     unsigned int overhead;
     unsigned int block_base;
     unsigned int block_length;
-
-#if DEBUG_MALLOC == 1
-    giet_tty_printf("############# FREE  #############\n\n");
-#endif
+    unsigned int remote_free_needed;
+    unsigned int remote_owner_id;
+    if (i == task_id)
+    {
+
+        giet_printf("############# FREE  #############\n\n");
+        remote_free_needed = 0;
+        remote_owner_id = -1;
+        heapB = _heap_base[task_id];
+        heapL = _heap_length[task_id];
+    }
+    else
+    {
+
+        giet_printf("############# REMOTE FREE  #############\n\n");
+        remote_free_needed = 1;
+        remote_owner_id = i;
+        heapB = _heap_base[remote_owner_id];
+        heapL = _heap_length[remote_owner_id];
+    }
+
+
     /****** CHECK PTR ******/
     if (to_free == 0x0) {
-#if DEBUG_MALLOC == 1
-        giet_tty_printf("free == 0x0\n");
-#endif
+
+        giet_printf("free == 0x0\n");
         return;
     }
     // check alignement of ptr
     if (((unsigned int) to_free) % 4 != 0) {
-#if DEBUG_MALLOC == 1
-        giet_tty_printf("allignement of ptr  %x = %d\n", (unsigned int) to_free, (unsigned int) to_free % 4);
-#endif
+
+        giet_printf("allignement of ptr  %x = %d\n", (unsigned int) to_free, (unsigned int) to_free % 4);
         return;
     }
     // check if the @ of ptr matches the range of the heap
     if (!((unsigned int) to_free >= heapB && (unsigned int) to_free < heapB + heapL)) {
-#if DEBUG_MALLOC == 1
-        giet_tty_printf("check if it matches the range of the heap\n");
-#endif
+
+        giet_printf("check if it matches the range of the heap\n");
         return;
     }
@@ -1107 +1169 @@
     // check alignement of overhead
     if (overhead % 4 != 0) {
-#if DEBUG_MALLOC == 1
-        giet_tty_printf("check alignement of overhead\n");
-#endif
+
+        giet_printf("check alignement of overhead\n");
         return;
     }
     // check if (overhead + to_free) matches the range of the heap
     if ((((unsigned int) (to_free) + overhead) - 4) > heapB + heapL) {
-#if DEBUG_MALLOC == 1
-        giet_tty_printf ("check if (overhead + to_free) matches the range of the heap\n");
-#endif
+
+        giet_printf ("check if (overhead + to_free) matches the range of the heap\n");
         return;
     }
@@ -1123 +1183 @@
     block_length = overhead + 4;
 
-#if DEBUG_MALLOC == 1
-    giet_tty_printf("############# UPDATE CL :  FREE %x of size %d #############\n\n",block_base, block_length);
-#endif
-    update_chunk_list(block_base, block_length);
-
-#if DEBUG_MALLOC == 1
-    giet_tty_printf("BLOCK SUCCESSFULLY FREED\n\n");
-#endif
+    if (remote_free_needed == 0)
+    {
+
+        giet_printf("############# UPDATE CL :  FREE %x of size %d #############\n\n",block_base, block_length);
+        update_chunk_list(block_base, block_length);
+    }
+    else
+    {
+
+        giet_printf("############# INSERT IN RF %d :  FREE %x of size %d #############\n\n", remote_owner_id, block_base, block_length);
+        insert_in_remote_free_list(remote_owner_id, block_base, block_length);
+    }
+
+
+    giet_printf("BLOCK SUCCESSFULLY FREED\n\n");
 
     return;

soft/giet_vm/libs/malloc.h

@@ -8 +8 @@
 #ifndef _MALLOC_H_
 #define _MALLOC_H_
+//#define DEBUG_MALLOC 1
 
 #include "giet_config.h"
+#include "spin_lock.h"
 
 //#define MALLOC_SELECTED 2

soft/giet_vm/libs/malloc_private.h

@@ -15 +15 @@
 } heap_ll;
 
+void insert_in_remote_free_list(unsigned int remote_owner_id, unsigned int block_base, unsigned int block_length);
+heap_ll * pop_remote_free_list(heap_ll ** head);
+heap_ll * pop_ptr(void);
+void update_chunk_list(unsigned int block_base, unsigned int block_length);
+
 #if MALLOC_SELECTED == 1 || MALLOC_SELECTED == 2
-static heap_ll * get_prev_fit_chunk(unsigned int size);
+    static heap_ll * get_prev_fit_chunk(unsigned int size);
 #else
-int get_prev_fit_chunk(unsigned int size);
+    int get_prev_fit_chunk(unsigned int size);
 #endif
 
-static void print_all_heap(void);
-static void frag(int turn);
 
 #endif

soft/giet_vm/libs/spin_lock.c

@@ -32 +32 @@
 
     asm volatile (
-            "giet_lock_try:                 \n"
-            "ll   $2,    0(%0)              \n" /* $2 <= lock current value */
+            "move $16, %0                   \n"
+            "giet_lock_try :                \n"
+            "ll   $2,    0($16)             \n" /* $2 <= lock current value */
             "bnez $2,    giet_lock_delay    \n" /* retry if lock already taken */
             "li   $3,    1                  \n" /* $3 <= argument for sc */
-            "sc   $3,    0(%0)              \n" /* try to get lock */
+            "sc   $3,    0($16)             \n" /* try to get lock */
             "bnez $3,    giet_lock_ok       \n" /* exit if atomic */
 
@@ -53 +54 @@
             :
             :"r"(plock)
-            :"$2", "$3", "$4");
+            :"$2", "$3", "$4", "$16");
 }
 

soft/giet_vm/memo/Makefile

@@ -18 +18 @@
 
 clean:
-        rm *.x
+        rm -f *.x

soft/giet_vm/xml/mapping_info.h

@@ -101 +101 @@
 ///////////////////////////////
 
-typedef struct mapping_header_s 
+typedef struct __attribute__((packed))  mapping_header_s 
 {
     unsigned int signature;          // must contain MAPPING_SIGNATURE
@@ -138 +138 @@
 
 ////////////////////////////////
-typedef struct mapping_cluster_s 
+typedef struct __attribute__((packed))  mapping_cluster_s 
 {
     unsigned int psegs;          // number of psegs in cluster
@@ -155 +155 @@
 
 /////////////////////////////
-typedef struct mapping_pseg_s  
+typedef struct __attribute__((packed))  mapping_pseg_s  
 {
     char         name[32];       // pseg name (unique in a cluster)
@@ -167 +167 @@
 
 ///////////////////////////////
-typedef struct mapping_vspace_s 
+typedef struct __attribute__((packed))  mapping_vspace_s 
 {
     char         name[32];       // virtual space name
@@ -181 +181 @@
 
 /////////////////////////////
-typedef struct mapping_vseg_s 
+typedef struct __attribute__((packed))  mapping_vseg_s 
 {
     char         name[32];       // vseg name (unique in vspace)
@@ -196 +196 @@
 
 /////////////////////////////
-typedef struct mapping_task_s 
+typedef struct __attribute__((packed))  mapping_task_s 
 {
     char         name[32];       // task name (unique in vspace)
@@ -214 +214 @@
 
 /////////////////////////////
-typedef struct mapping_vobj_s 
+typedef struct __attribute__((packed))  mapping_vobj_s 
 {
     char         name[32];       // vobj name (unique in a vspace)
@@ -228 +228 @@
 
 /////////////////////////////
-typedef struct mapping_proc_s 
+typedef struct __attribute__((packed))  mapping_proc_s 
 {
     unsigned int irqs;           // number of IRQs allocated to processor
@@ -236 +236 @@
 
 /////////////////////////////
-typedef struct mapping_irq_s 
+typedef struct __attribute__((packed))  mapping_irq_s 
 {
     unsigned int type;           // 0 => HW_IRQ  / 1 => SW_IRQ
@@ -246 +246 @@
 
 ///////////////////////////////
-typedef struct mapping_coproc_s 
+typedef struct __attribute__((packed))  mapping_coproc_s 
 {
     char         name[32];       // coprocessor name
@@ -256 +256 @@
 
 ////////////////////////////////
-typedef struct mapping_cp_port_s 
+typedef struct __attribute__((packed))  mapping_cp_port_s 
 {
     unsigned int direction;      // TO_COPROC == 0 / FROM_COPROC == 1
@@ -265 +265 @@
 
 ///////////////////////////////
-typedef struct mapping_periph_s 
+typedef struct __attribute__((packed))  mapping_periph_s 
 {
     unsigned int type;           // IOC / TTY / TIM / DMA / FBF / NIC / IOB