Changeset 145

Timestamp:

Sep 29, 2010, 5:01:19 PM (15 years ago)

Author:

Yuri Dario

Message:

pthread: pthread emulation, 20100217.

Location:

pthread/trunk/src

Files:

• BuildAll.cmd (modified) (1 diff)
• Config.kmk (modified) (1 diff)
• Makefile.kmk (modified) (3 diffs)
• my_os2cond.c (modified) (1 diff)
• pthread.h (modified) (3 diffs)

pthread/trunk/src/BuildAll.cmd ¶

@@ -2 +2 @@
 kmk BUILD_TYPE=release clean
 
+REM
+REM Do not change debug/release order, it is needed to put INSTALL files into
+REM same package.
+REM 
+
 kmk BUILD_TYPE=debug
+kmk BUILD_TYPE=debug BUILD_AOUT=aout
+
 kmk BUILD_TYPE=release
+kmk BUILD_TYPE=release BUILD_AOUT=aout
 
 kmk BUILD_TYPE=debug packing

pthread/trunk/src/Config.kmk ¶

@@ -6 +6 @@
 # in bldlevel informations
 #
-VERSION = 20081018
+VERSION = 20100217
 BUILD   = os2

pthread/trunk/src/Makefile.kmk ¶

@@ -12 +12 @@
 DEPTH = ..
 
-TOOL = GCC3OMF
+BTOOL.aout = GCC3
+BTOOL. = GCC3OMF
 
-LIBRARIES = pthread
+TOOL = $(BTOOL.$(BUILD_AOUT))
 
-pthread_SOURCES = \
+PTHREAD_LIB.debug = pthread_g
+PTHREAD_LIB.release = pthread
+PTHREAD_LIB_TARGET = $(PTHREAD_LIB.$(BUILD_TYPE))
+
+LIBRARIES = $(PTHREAD_LIB_TARGET)
+
+$(PTHREAD_LIB_TARGET)_SOURCES = \
         my_os2cond.c \
         my_os2mutex.c \
@@ -23 +30 @@
         my_os2tls.c
 
-pthread_CFLAGS = -Zomf
-pthread_CFLAGS.release = -s -O3 -march=pentium -mcpu=pentium4 -Wall
-pthread_CFLAGS.debug = -g -O0 -DDEBUG_PRINTF
-pthread_LDFLAGS = -Zomf -Zno-fork -Zmap -Zbin-files
-pthread_LDFLAGS.release = -s
-pthread_LDFLAGS.debug = -g
+$(PTHREAD_LIB_TARGET)_CFLAGS =
+$(PTHREAD_LIB_TARGET)_CFLAGS.release = -s -O3 -march=pentium -mtune=pentium4 -Wall
+$(PTHREAD_LIB_TARGET)_CFLAGS.debug = -g -O0 -DDEBUG_PRINTF
+$(PTHREAD_LIB_TARGET)_LDFLAGS = -Zno-fork -Zmap -Zbin-files
+$(PTHREAD_LIB_TARGET)_LDFLAGS.release = -s
+$(PTHREAD_LIB_TARGET)_LDFLAGS.debug = -g
 
-pthread_DEFS = 
-pthread_INCS = 
+$(PTHREAD_LIB_TARGET)_DEFS = 
+$(PTHREAD_LIB_TARGET)_INCS = 
 
-pthread_CLEAN = $(PATH_LIB)/pthread.lib
+$(PTHREAD_LIB_TARGET)_CLEAN = $(PATH_LIB)/$(PTHREAD_LIB_TARGET).a
 
 
 # packaging stuffs
-ifeq ($(BUILD_TYPE),debug)
-  PACKAGE_NAME = pthread-$(subst .,_,$(VERSION))-$(BUILD)-debug.zip
-else
-  PACKAGE_NAME = pthread-$(subst .,_,$(VERSION))-$(BUILD).zip
-endif
+PACKAGE_NAME = $(PTHREAD_LIB.release)-$(subst .,_,$(VERSION))-$(BUILD).zip
 PACKING += $(PATH_ROOT)/dist/$(PACKAGE_NAME)
-OTHER_CLEAN += $(PATH_ROOT)/dist/$(PACKAGE_NAME) 
+OTHER_CLEAN += $(PATH_ROOT)/dist/$(PACKAGE_NAME)
 
 # now include standard code
@@ -51 +54 @@
 
 # final: zip all files!
-$(PATH_ROOT)/dist/$(PACKAGE_NAME): \
-                $(PATH_LIB)/pthread.lib
+$(PATH_ROOT)/dist/$(PACKAGE_NAME): $(INSTARGET_pthread_g) $(INSTARGET_pthread)
         $(call MSG_L1,Packing $@)
         $(QUIET)$(MKDIR) -p $(PATH_ROOT)/dist                              
-        $(QUIET)$(RM) -f $@
-        $(QUIET)zip -9q -j $@ *.c *.kmk *.h *.cmd $(PATH_LIB)/* 
+        $(QUIET)$(REDIRECT) -C $(DEPTH) -- zip -9q $@ src/* -x src/*~ 
+        $(QUIET)$(REDIRECT) -C $(PATH_INS) -- zip -9q $@ lib/*
+ 
 

pthread/trunk/src/my_os2cond.c ¶

@@ -105 +105 @@
 
 int pthread_cond_timedwait(pthread_cond_t *cond, pthread_mutex_t *mutex,
-                           struct timespec *abstime)
+                           struct timespec const *abstime)
 {
    struct timeb curtime;

pthread/trunk/src/pthread.h ¶

@@ -46 +46 @@
 pthread_t pthread_self(void);
 int pthread_join(  pthread_t thread, pthread_addr_t *status);
+#define pthread_detach( A) pthread_dummy(0)
+
 int pthread_cond_init(pthread_cond_t *cond, const pthread_condattr_t *attr);
 int pthread_cond_wait(pthread_cond_t *cond, pthread_mutex_t *mutex);
 int pthread_cond_timedwait(pthread_cond_t *cond, pthread_mutex_t *mutex,
-                           struct timespec *abstime);
+                           struct timespec const *abstime);
 int pthread_cond_signal(pthread_cond_t *cond);
 int pthread_cond_broadcast(pthread_cond_t *cond);
@@ -64 +66 @@
 #define _REENTRANT                      1
 
-#define pthread_equal(A,B) ((A) == (B))
+static int pthread_equal(pthread_t t1,pthread_t t2) { return ( t1 == t2);};
 
 extern int pthread_mutex_init (pthread_mutex_t *, const pthread_mutexattr_t *);
@@ -93 +95 @@
 #define pthread_mutexattr_destroy(A)    0
 
-#define PTHREAD_ONCE_INIT -1
 typedef int* pthread_once_t;
+#define PTHREAD_ONCE_INIT ((pthread_once_t)-1)
 int pthread_once(pthread_once_t *once_control, void (*init_routine)(void));
 
 int pthread_attr_getstacksize(const pthread_attr_t *attr, size_t *stacksize);
 int pthread_attr_setstacksize(pthread_attr_t *attr, size_t stacksize); 
+
+void pthread_yield(void);
+
+#define PTHREAD_MUTEX_NORMAL 0
+#define PTHREAD_MUTEX_RECURSIVE 1
+#define PTHREAD_MUTEX_ERRORCHECK 2
+#define PTHREAD_MUTEX_DEFAULT  PTHREAD_MUTEX_NORMAL
+#define pthread_mutexattr_settype(A, B) pthread_dummy(0)
 
 #ifdef __cplusplus