Changeset 440 for trunk/libs

Timestamp:

May 3, 2018, 5:51:22 PM (6 years ago)

Author:

alain

Message:

1/ Fix a bug in the Multithreaded "sort" applicationr:
The pthread_create() arguments must be declared as global variables.
2/ The exit syscall can be called by any thread of a process..

Location:

trunk/libs

Files:

• mini-libc/Makefile (modified) (1 diff)
• mini-libpthread/Makefile (modified) (1 diff)
• mini-libpthread/pthread.c (modified) (4 diffs)

trunk/libs/mini-libc/Makefile

@@ -32 +32 @@
 build/lib/libc.a: build $(OBJS)
         $(AR) rc $@ $(OBJS)
-        ranlib $@
+        $(RANLIB) $@
         cp $(SRCS:.c=.h) $(HAL)/generic/hal_user.h $(KERNEL)/syscalls/shared_syscalls.h build/include/.
 

trunk/libs/mini-libpthread/Makefile

@@ -34 +34 @@
 build/lib/libpthread.a: build $(OBJS)
         $(AR) rc $@ $(OBJS) $(OBJS_LIBC)
-        ranlib $@
+        $(RANLIB) $@
         cp $(SRCS:.c=.h) $(HAL)/generic/hal_user.h $(KERNEL)/syscalls/shared_syscalls.h build/include/.
 

trunk/libs/mini-libpthread/pthread.c

@@ -2 +2 @@
  * pthread.c - User side pthread related functions implementation.
  * 
- * Author     Alain Greiner (2016,2017)
+ * Author     Alain Greiner (2016,2017,2018)
  *
  * Copyright (c) UPMC Sorbonne Universites
@@ -113 +113 @@
 
 #if PTHREAD_BARRIER_DEBUG
-printf("\n[BARRIER] %s : sqt_node[%d][%d][%d] : arity = %d / parent = %x\n"
-"child0 = %x / child1 = %x / child2 = %x / child3 = %x\n", 
-__FUNCTION__, x, y, level, node->arity, node->parent, 
+printf("\n[BARRIER] %s : sqt_node[%d][%d][%d] / arity %d / desc %x\n"
+"parent %x / child0 %x / child1 %x / child2 %x / child3 %x\n", 
+__FUNCTION__, x, y, level, node->arity, node, node->parent, 
 node->child[0], node->child[1], node->child[2], node->child[3] );
 #endif
@@ -159 +159 @@
 
 #if PTHREAD_BARRIER_DEBUG
-printf("\n[BARRIER] %s : sqt_node[%d][%d][%d] : arity = %d / parent = %x\n"
-"child0 = %x / child1 = %x / child2 = %x / child3 = %x\n", 
-__FUNCTION__, x, y, level, node->arity, node->parent,
+printf("\n[BARRIER] %s : sqt_node[%d][%d][%d] / arity %d / desc %x\n"
+"parent %x / child0 %x / child1 %x / child2 %x / child3 %x\n", 
+__FUNCTION__, x, y, level, node->arity, node, node->parent,
 node->child[0], node->child[1], node->child[2], node->child[3] );
 #endif
@@ -250 +250 @@
                      barrier->node[x][y][l] = node;
 
-#if PTHREAD_BARRIER_DEBUG
-printf("\n[BARRIER] %s : sqt_node[%d][%d][%d] : vaddr = %x\n",
-__FUNCTION__ , x , y , l , node );
-#endif
                  }
             }