Upgrade in AVATAR code generator: pthread_cond_init and pthread_mutex_init

executablecode/Makefile

-TARGET_ARCH = linux
-
+UNAME := $(shell uname -s)
 CC     = gcc
 #CC     = test2.sh
 #CC = /packages/gcc_3.2.2/bin/g++32
@@ -10,13 +9,12 @@ OPT    = -O1 -pthread
 LOPT_UNIX   = -O1 -pthread -ldl -lrt
 LOPT_MAC = -O1 -pthread -ldl
 
-LOPT = $(LOPT_MAC)
-
 DEBUG  = -g
 OTHER  = -Wall
 TRY    = 
 CFLAGS = $(OPT) $(OTHER) $(TRY)
-LFLAGS = $(LOPT) $(OTHER) $(TRY)
+LFLAGS_MAC = $(LOPT_MAC) $(OTHER) $(TRY)
+LFLAGS_UNIX = $(LOPT_UNIX) $(OTHER) $(TRY)
 # CFLAGS = $(DEBUG) $(OTHER)
 OBJDIR = lib
 

executablecode/Makefile.defs

@@ -11,7 +11,12 @@ EXE    = $(MODULE).x
 
 
 $(EXE): makedir $(OBJS) $(OBJS_executor) 
-	$(CC) $(LFLAGS) $(INCDIR) $(LIBDIR) -o $@ $(OBJS) $(OBJS_executor) $(LIBS) 2>&1 | c++filt
+ifeq ($(UNAME),Darwin)
+	$(CC) $(LFLAGS_MAC) $(INCDIR) $(LIBDIR) -o $@ $(OBJS) $(OBJS_executor) $(LIBS) 2>&1 | c++filt
+endif
+ifneq ($(UNAME),Darwin)
+	$(CC) $(LFLAGS_UNIX) $(INCDIR) $(LIBDIR) -o $@ $(OBJS) $(OBJS_executor) $(LIBS) 2>&1 | c++filt
+endif
 
 makedir:
 	echo Making directories

executablecode/Makefile.src

-SRCS = generated_src/main.c generated_src/Block0.c 
\ No newline at end of file
+SRCS = generated_src/main.c generated_src/Wallet.c generated_src/CoffeeMachine.c generated_src/CoffeeButton.c generated_src/TeaButton.c 
\ No newline at end of file

src/avatartranslator/toexecutable/AVATAR2CPOSIX.java

@@ -315,6 +315,8 @@ public class AVATAR2CPOSIX {
 		
 		s+= CR + "char * __myname = (char *)arg;" + CR;
 		
+		s+= CR + "pthread_cond_init(&__myCond, NULL);" + CR;
+		
 		s+= CR + "fillListOfRequests(&__list, __myname, &__myCond, &__mainMutex);" + CR; 
 		
 		s+= "printf(\"my name = %s\\n\", __myname);" + CR;
@@ -629,7 +631,11 @@ public class AVATAR2CPOSIX {
 		}
 		
 		mainFile.appendToMainCode("/* Activating randomness */" + CR); 
-		mainFile.appendToMainCode("initRandom();" + CR);  
+		mainFile.appendToMainCode("initRandom();" + CR); 
+		
+		mainFile.appendToMainCode("/* Initializing the main mutex */" + CR);
+		mainFile.appendToMainCode("if (pthread_mutex_init(&__mainMutex, NULL) < 0) { exit(-1);}" + CR + CR);
+		
 		
 		mainFile.appendToMainCode(CR + CR + mainDebugMsg("Starting tasks"));
 		for(TaskFile taskFile: taskFiles) {