- numerous fixes

- socket in non blocking mode (resolve some deadlock, and agent are immune to another agent beeing blocked)

1 files changed, 9 insertions, 2 deletions

diff --git a/src/Makefile.osx b/src/Makefile.osx
index 71e1520..efdaa29 100644
--- a/src/Makefile.osx
+++ b/src/Makefile.osx
@@ -22,18 +22,22 @@ else
 endif
 REGEXP= -DUSE_PCRE_REGEX -DPCRE_OPT=$(PCRE_OPT)
 
-OBJ = ivyloop.o timer.o ivysocket.o ivy.o ivybuffer.o ivybind.o intervalRegexp.o
+OBJ = ivyloop.o timer.o ivysocket.o ivy.o ivybuffer.o ivyfifo.o ivybind.o intervalRegexp.o
 CC=gcc
 LIBTOOL=ar q # linux and solaris
 CFLAGS = -g -Wall $(FPIC)
 
-TARGETS = ivyprobe ivyperf
+TARGETS = ivyprobe ivyperf ivythroughput
 
 # ------------------------------------------------------------------------------------------
 
 .c.o:
 	$(CC) $(CFLAGS) -c $*.c
 
+.cpp.o:
+	$(CPP) $(CFLAGS)  -c $*.cpp
+
+
 all: static-libs commands shared-libs
 
 static-libs: libivy.a
@@ -55,6 +59,9 @@ libivy.dylib: $(OBJ)
 ivyprobe: ivyprobe.o libivy.a
 	$(CC)  $(CFLAGS) -o $@ ivyprobe.o -L. -livy $(PCRELIB) $(EXTRALIB)
 
+ivythroughput: ivythroughput.o libivy.a
+	$(CPP)  $(CFLAGS) $(PCREINC) -o $@ ivythroughput.o -L. -livy -lpcrecpp $(PCRELIB) $(EXTRALIB) 
+
 ivyperf: ivyperf.o libivy.a
 	$(CC)  $(CFLAGS) -o $@ ivyperf.o -L. -livy $(PCRELIB) $(EXTRALIB)