Merge pull request Meridian59#338 from ckirmse/master

fix up blakserv makefile, mutex for linux

blakserv/makefile.linux

@@ -6,7 +6,7 @@ TOPDIR=..
 
 include $(TOPDIR)/common.mak.linux
 
-CFLAGS += -I $(BLAKINCLUDEDIR)
+CFLAGS += -I $(BLAKINCLUDEDIR) -pthread
 
 SOURCEDIR = .
 
@@ -96,9 +96,7 @@ $(OUTDIR)/md5.obj : $(TOPDIR)/util/md5.c
 
 $(OUTDIR)/blakserv: $(OBJS)
 	$(CC) $(CFLAGS) -o $@ -c $(SOURCEDIR)/version.c
-	$(LINK) $(LIBS) $^ -o$@ $(LINKFLAGS)
+	$(LINK) $^ $(LIBS) -o$@ $(LINKFLAGS)
 	$(CP) $@ $(BLAKSERVRUNDIR)
 
-#	$(LINK)	$@ $(LIBS) $(LINKFLAGS)
-
 include $(TOPDIR)/rules.mak.linux

blakserv/mutex_linux.c

@@ -22,20 +22,13 @@ bool MutexAcquire(Mutex mutex) {
 }
 
 bool MutexAcquireWithTimeout(Mutex mutex, int timeoutMs) {
-	// we'd like to do this to be clean, but it doesn't exist:
+	timespec ts;
 
-	//timespec ts;
+	clock_gettime(CLOCK_REALTIME, &ts);
+	ts.tv_sec += (timeoutMs / 1000L);
+	ts.tv_nsec += (timeoutMs - ((timeoutMs / 1000L) * 1000L)) * 1000000L;
 
-	//clock_gettime(CLOCK_REALTIME, &ts);
-	//ts.tv_sec += (timeoutMs / 1000L);
-	//ts.tv_nsec += (timeoutMs - ((timeoutMs / 1000L) * 1000L)) * 1000000L;
-
-	//return pthread_mutex_timedlock(&mutex->mutex, &ts);
-
-	// since we only have one thread in the linux version of the server,
-	// this locking is pointless anyway, so just wait as long as necessary
-	// (which will always be no waiting at all)
-	return pthread_mutex_lock(&mutex->mutex) == 0;
+	return pthread_mutex_timedlock(&mutex->mutex, &ts) == 0;
 }
 
 bool MutexRelease(Mutex mutex) {

blakserv/session.c

@@ -448,12 +448,8 @@ void CloseSession(int session_id)
 			DeleteBufferList(s->send_list);
 			s->send_list = NULL;
 
-			/* no need to release mutex... we're closing it */
-			/*
 			if (!MutexRelease(s->muxSend))
-			eprintf("File %s line %i release of non-owned mutex\n",__FILE__,__LINE__);
-			*/
-
+				eprintf("File %s line %i release of non-owned mutex\n",__FILE__,__LINE__);
 		}
 
 		if (!MutexAcquireWithTimeout(s->muxReceive,10000))
@@ -463,14 +459,10 @@ void CloseSession(int session_id)
 			DeleteBufferList(s->receive_list);
 			s->receive_list = NULL;
 
-			/* no need to release mutex... we're closing it */
-			/*
 			if (!MutexRelease(s->muxReceive))
-			eprintf("File %s line %i release of non-owned mutex\n",__FILE__,__LINE__);
-			*/
-
+				eprintf("File %s line %i release of non-owned mutex\n",__FILE__,__LINE__);
 		}
-		
+
 		if (!MutexClose(s->muxSend))
 			eprintf("CloseSession error (%s) closing send mutex %i in session %i\n",
 			GetLastErrorStr(),s->muxSend,s->session_id);

rules.mak.linux

@@ -10,7 +10,7 @@ $(OUTDIR)/%.obj : $(OUTDIR)/%.c
 	$(CC) $(CFLAGS) -I $(SOURCEDIR) -o $@ -c $< 
 
 makedirs:
-	-@mkdir $(OUTDIR)
+	-@mkdir -p $(OUTDIR)
 
 clean:
 	@$(RM) $(OUTDIR)/*