Changeset 445 for trunk/user/sort

Timestamp:

May 29, 2018, 9:27:23 AM (7 years ago)

Author:

alain

Message:

Restructure the mini_libc.

Location:

trunk/user/sort

Files:

• Makefile (modified) (1 diff)
• sort.c (modified) (7 diffs)

trunk/user/sort/Makefile

@@ -11 +11 @@
 OBJS = build/sort.o
 
-INCLUDES = -I. -I$(LIBC_INCLUDE) -I$(LIBPTHREAD_INCLUDE) -I$(LIBALMOSMKH_INCLUDE) -I$(SHARED_INCLUDE)
+INCLUDES = -I.                      \
+           -I$(LIBC_INCLUDE)        \
+           -I$(LIBPTHREAD_INCLUDE)  \
+           -I$(LIBALMOSMKH_INCLUDE) \
+           -I$(SHARED_INCLUDE)
 
 compile: dirs build/sort.elf
 
 build/sort.elf : $(OBJS) sort.ld
-        $(LD) -o $@ -T sort.ld $(OBJS) -nostdlib -L$(LIBC) -L$(LIBPTHREAD) -L$(LIBALMOSMKH) -lpthread -lalmos-mkh -lc
+        $(LD) -o $@ -T sort.ld $(OBJS) -L$(LIBC) -L$(LIBPTHREAD) -L$(LIBALMOSMKH) -lc -lpthread -lalmosmkh -lpthread -lc
         $(DU) -D $@ > $@.txt
 

trunk/user/sort/sort.c

@@ -25 +25 @@
 #include <stdlib.h>
 #include <pthread.h>
-#include <almos-mkh.h>
+#include <almosmkh.h>
 
 #define ARRAY_LENGTH        0x400    // 1024 values
@@ -163 +163 @@
     bubbleSort( array0, items, items * thread_uid );
 
-    printf("\n[SORT] thread[%d] / stage 0 completed\n", thread_uid );
+    printf("\n[SORT] thread[%d] : stage 0 completed\n", thread_uid );
 
     /////////////////////////////////
@@ -177 +177 @@
         if( (thread_uid & ((1<<i)-1)) == 0 )
         {
-            printf("\n[SORT] thread[%d] / stage %d start\n", thread_uid , i );
+            printf("\n[SORT] thread[%d] : stage %d start\n", thread_uid , i );
 
             if((i % 2) == 1)               // odd stage 
@@ -197 +197 @@
                    items * thread_uid );
 
-            printf("\n[SORT] thread[%d] / stage %d completed\n", thread_uid , i );
+            printf("\n[SORT] thread[%d] : stage %d completed\n", thread_uid , i );
         }
 
@@ -328 +328 @@
 
 #if INTERACTIVE_MODE
-idbg();
+// idbg();
 #endif
             }
@@ -336 +336 @@
     get_cycle( &cycle );
     printf("\n[SORT] main completes threads create at cycle %d\n", (unsigned int)cycle );
-
-    // main run also the sort() function
-    sort( &arg[main_uid] );
 
 #if INTERACTIVE_MODE
@@ -344 +341 @@
 #endif
     
+    // the main thread run also the sort() function
+    sort( &arg[main_uid] );
+
     // Check result
     int    success = 1;