libflexipix

@@ -1,3 +1,7 @@

+1.0.6 2010-12-30

+----------------

+adaptions to code and Makefile for Windows (MINGW32)

+

 1.0.5 2010-12-22

 ----------------

 adpations to Makefile for Mac OS X

@@ -1,5 +1,5 @@

 # FlexiPix library

-# !version: 1.0.5! !date: 2010-12-22!

+# !version: 1.0.6! !date: 2010-12-30!

 #

 # Copyright 2010 Stefan Schuermans <stefan schuermans info>

 #

@@ -16,83 +16,108 @@

 # You should have received a copy of the GNU Lesser General Public License

 # along with this program. If not, see <http://www.gnu.org/licenses/>.

-LIBTARGET=libflexipix

-VER=1

-VERMIN=0

-VERREV=5

-

-OS:=$(shell uname -s)

-ifeq ($(OS),Linux)

-  SED_I=sed -i

-  CC=gcc

-  AR=ar

-  SHLIBFLAGS=-shared -Wl,-soname,$(LIBTARGET).so.$(VER)

-  SHLIBEXT=so

-  RANLIB=ranlib

-  INSTALL=install

-  STOW_DIR=/usr/local/stow

-  DEF_PREFIX=/usr/local

-else

-  ifeq ($(OS),Darwin)

-    SED_I=sed -i ""

-    CC=gcc

-    AR=ar

-    SHLIBFLAGS=-dynamiclib

-    SHLIBEXT=dylib

-    RANLIB=ranlib

-    INSTALL=install

-    STOW_DIR=/usr/local/stow

-    DEF_PREFIX=/usr/local

-  else

-    $(error unsupported OS)

-  endif

-endif

+LIBTARGET := libflexipix

+VER_MAJ   := 1

+VER_MIN   := 0

+VER_REV   := 6

+

+SRCS    := $(wildcard src/*.c)

+EX_SRCS := $(wildcard examples/src/*.c)

-SRCS=$(wildcard src/*.c)

-EX_SRCS=$(wildcard examples/src/*.c)

-

-CFLAGS=-W -Wall -fPIC -O3

-DEFINES=-DFLP_VER_MAJ=$(VER) -DFLP_VER_MIN=$(VERMIN) -DFLP_VER_REV=$(VERREV)

-INCLUDES=-Iinclude

-LDFLAGS=-Llib

-LIBS=-lm -lpthread -lflexipix

-

-SRCS_BASE=$(patsubst %.c,%,$(SRCS))

-DEPS=$(addsuffix .d,$(SRCS_BASE))

-OBJS=$(addsuffix .o,$(SRCS_BASE))

-EX_SRCS_BASE=$(patsubst %.c,%,$(EX_SRCS))

-EX_DEPS=$(addsuffix .d,$(EX_SRCS_BASE))

-EX_OBJS=$(addsuffix .o,$(EX_SRCS_BASE))

-EX_TARGETS=$(EX_SRCS_BASE)

-

-LIBTGA = lib/$(LIBTARGET).a

-LIBTGSO = lib/$(LIBTARGET).$(SHLIBEXT).$(VER)

-LIBTGSOM = $(LIBTGSO).$(VERMIN)

-LIBTGSOR = $(LIBTGSOM).$(VERREV)

-

-VERSION = $(VER).$(VERMIN).$(VERREV)

+VERSION  := $(VER_MAJ).$(VER_MIN).$(VER_REV)

 DATE     := $(shell date +%Y-%m-%d)

-PACKNAME = $(LIBTARGET)-$(VERSION)_$(DATE)

-PACKDATA = ChangeLog COPYING COPYING.LESSER Makefile \

+PACKNAME := $(LIBTARGET)-$(VERSION)_$(DATE)

+PACKDATA := ChangeLog COPYING COPYING.LESSER Makefile \

             examples include README src

-ENV_PREFIX=$(shell echo $$PREFIX)

-STOW_PREFIX=$(STOW_DIR)/libflexipix-$(VERSION)

+CFLAGS     := -W -Wall -O3

+DEFINES    := -DFLP_VER_MAJ=$(VER_MAJ) -DFLP_VER_MIN=$(VER_MIN) \

+              -DFLP_VER_REV=$(VER_REV)

+INCLUDES   := -Iinclude

+SH_LDFLAGS :=

+SH_LIBS    :=

+EX_LDFLAGS := -Llib

+EX_LIBS    := -lm -lflexipix

+STOW_DIR   := /usr/local/stow

+DEF_PREFIX := /usr/local

+

+OS_RAW := $(shell uname -s)

+ifeq ($(OS_RAW),Linux)

+  OS         := linux

+  CC         := gcc

+  AR         := ar

+  RANLIB     := ranlib

+  LEXT       := so

+  LEXTSUF    := .$(VERSION)

+  BSUF       :=

+  INSTALL    := install

+  CFLAGS     += -fPIC

+  SH_LDFLAGS += -shared -Wl,-soname,$(LIBTARGET).so.$(VER_MAJ)

+  EX_LDFLAGS += -Wl,-rpath,\$$ORIGIN/../../lib

+  EX_LIBS    += -lpthread

+endif

+

+ifeq ($(OS_RAW),Darwin)

+  OS         := darwin

+  CC         := gcc

+  AR         := ar

+  RANLIB     := ranlib

+  LEXT       := dylib

+  LEXTSUF    :=

+  BSUF       :=

+  INSTALL    := install

+  CFLAGS     += -fPIC

+  SH_LDFLAGS += -dynamiclib

+  EX_LIBS    += -lpthread

+endif

+

+ifeq ($(patsubst MINGW32%,MINGW32,$(OS_RAW)),MINGW32)

+  OS         := mingw32

+  CC         := gcc

+  AR         := ar

+  RANLIB     := ranlib

+  LEXT       := dll

+  LEXTSUF    :=

+  BSUF       := .exe

+  INSTALL    := install

+  DEFINES    += -DWINDOWS

+  SH_LDFLAGS += -shared

+  SH_LIBS    += -lwsock32

+  EX_LIBS    += -lwsock32

+endif

+

+ifeq ($(OS),)

+  $(error unsupported operating system $(OS_RAW))

+endif

+

+SRCS_BASE    := $(patsubst %.c,%,$(SRCS))

+DEPS         := $(addsuffix .d,$(SRCS_BASE))

+OBJS         := $(addsuffix .o,$(SRCS_BASE))

+EX_SRCS_BASE := $(patsubst %.c,%,$(EX_SRCS))

+EX_DEPS      := $(addsuffix .d,$(EX_SRCS_BASE))

+EX_OBJS      := $(addsuffix .o,$(EX_SRCS_BASE))

+EX_TARGETS   := $(addsuffix $(BSUF),$(EX_SRCS_BASE))

+

+TARGET    := lib/$(LIBTARGET).a

+SH_TARGET := lib/$(LIBTARGET).$(LEXT)$(LEXTSUF)

+

+ENV_PREFIX := $(shell echo $$PREFIX)

+STOW_PREFIX := $(STOW_DIR)/libflexipix-$(VERSION)

 ifneq ($(ENV_PREFIX),)

-  PREFIX=$(ENV_PREFIX)

+  PREFIX := $(ENV_PREFIX)

 else

   ifeq ($(shell if [ -d $(STOW_DIR) ]; then echo stow; fi),stow)

-    PREFIX=$(STOW_PREFIX)

+    PREFIX := $(STOW_PREFIX)

   else

-    PREFIX=$(DEF_PREFIX)

+    PREFIX := $(DEF_PREFIX)

   endif

 endif

-.PHONY: all clean pack install uninstall

+.PHONY: all clean install uninstall ver pack

 .SECONDARY:

 .SUFFIXES:

-all: deps $(LIBTGA) $(LIBTGSO) $(EX_TARGETS)

+all: deps $(TARGET) $(SH_TARGET) $(EX_TARGETS)

 ifneq ($(MAKECMDGOALS),clean)

   include deps

@@ -103,40 +128,69 @@ deps: $(DEPS) $(EX_DEPS)

 %.d: %.c

 	$(CC) $(CFLAGS) $(DEFINES) $(INCLUDES) -M -o $@ $<

-	$(SED_I) 's!^$(basename $(notdir $<))!$(dir $<)&!' $@

+	sed 's!^$(basename $(notdir $<))!$(dir $<)&!' <$@ >$@.tmp

+	mv $@.tmp $@

 %.o: %.c

 	$(CC) $(CFLAGS) $(DEFINES) $(INCLUDES) -c -o $@ $<

-%: %.o $(LIBTGA) $(LIBTGSO)

-	$(CC) $(LDFLAGS) -o $@ $< $(LIBS)

+%$(BSUF): %.o $(LTA) $(LTSO)

+	$(CC) $(EX_LDFLAGS) -o $@ $< $(EX_LIBS)

 lib:

 	mkdir -p lib

-$(LIBTGA): $(OBJS) lib

+$(TARGET): $(OBJS) | lib

 	$(AR) cr $@ $(filter-out lib,$+)

 	$(RANLIB) $@

-$(LIBTGSOR): $(OBJS)

-	$(CC) $(SHLIBFLAGS) $(LDFLAGS) -o $@ $+

-

-$(LIBTGSOM): $(LIBTGSOR)

-	rm -f $@

-	ln -s $(notdir $<) $@

-

-$(LIBTGSO): $(LIBTGSOM)

-	rm -f $@

-	ln -s $(notdir $<) $@

+$(SH_TARGET): $(OBJS) | lib

+	$(CC) $(SH_LDFLAGS) -o $@ $+ $(SH_LIBS)

+ifeq ($(OS),linux)

+	cd $(dir $@); \

+	  ln -s $(notdir $@) \

+	        $(patsubst %.$(VER_REV),%,$(notdir $@))

+	cd $(dir $@); \

+	  ln -s $(patsubst %.$(VER_REV),%,$(notdir $@)) \

+	        $(patsubst %.$(VER_MIN).$(VER_REV),%,$(notdir $@))

+	cd $(dir $@); \

+	  ln -s $(patsubst %.$(VER_MIN).(VER_REV),%,$(notdir $@)) \

+	        $(patsubst %.$(VER_MAJ).$(VER_MIN).$(VER_REV),%,$(notdir $@))

+endif

 clean:

 	rm -rf deps $(DEPS) $(OBJS) lib \

 	       $(EX_DEPS) $(EX_OBJS) $(EX_TARGETS)

+install: all

+	$(INSTALL) -d $(PREFIX)/include/flexipix

+	$(INSTALL) -m 644 -t $(PREFIX)/include/flexipix $(wildcard include/flexipix/*.h)

+	$(INSTALL) -d $(PREFIX)/lib

+	$(INSTALL) -m 644 -t $(PREFIX)/lib $(TARGET) $(SH_TARGET)

+ifeq ($(OS),linux)

+	ln -s $(LIBTARGET).$(LEXT).$(VER_MAJ).$(VER_MIN).$(VER_REV) \

+	   $(PREFIX)/lib/$(LIBTARGET).$(LEXT).$(VER_MAJ).$(VER_MIN)

+	ln -s $(LIBTARGET).$(LEXT).$(VER_MAJ).$(VER_MIN) \

+	   $(PREFIX)/lib/$(LIBTARGET).$(LEXT).$(VER_MAJ)

+endif

+

+uninstall:

+	rm -f $(PREFIX)/lib/$(notdir $(SH_TARGET))

+	rm -f $(PREFIX)/lib/$(notdir $(TARGET))

+	rm -rf $(PREFIX)/include/flexipix

+

+ver:

+	$(MAKE) clean

+	for FILE in $$(find $(PACKDATA) -type f); \

+	do \

+	  <$$FILE sed 's/!version: [0-9.]*!/!version: $(VERSION)!/g' \

+	    | sed 's/!date: [0-9-]*!/!date: $(DATE)!/g' >$$FILE.tmp; \

+	  mv $$FILE.tmp $$FILE; \

+	done

+

 pack:

 	$(MAKE) clean

-	$(SED_I) 's/!version: [0-9.]*!/!version: $(VERSION)!/g' $$(find $(PACKDATA) -type f)

-	$(SED_I) 's/!date: [0-9-]*!/!date: $(DATE)!/g' $$(find $(PACKDATA) -type f)

+	$(MAKE) ver

 	$(MAKE)

 	$(MAKE) clean

 	mkdir -p pack/$(PACKNAME)

@@ -145,18 +199,3 @@ pack:

 	rm -rf pack/$(PACKNAME)

 	$(MAKE) clean

-install: all

-	$(INSTALL) -d $(PREFIX)/include/flexipix

-	$(INSTALL) -m 644 -t $(PREFIX)/include/flexipix $(wildcard include/flexipix/*.h)

-	$(INSTALL) -d $(PREFIX)/lib

-	$(INSTALL) -m 644 -t $(PREFIX)/lib $(LIBTGA) $(LIBTGSO)

-	ln -sf $(notdir $(LIBTGSO)) $(PREFIX)/lib/$(notdir $(LIBTGSOM))

-	ln -sf $(notdir $(LIBTGSOM)) $(PREFIX)/lib/$(notdir $(LIBTGSOR))

-

-uninstall:

-	rm -f $(PREFIX)/lib/$(notdir $(LIBTGA))

-	rm -f $(PREFIX)/lib/$(notdir $(LIBTGSOR))

-	rm -f $(PREFIX)/lib/$(notdir $(LIBTGSOM))

-	rm -f $(PREFIX)/lib/$(notdir $(LIBTGSO))

-	rm -rf $(PREFIX)/include/flexipix

-

@@ -1,5 +1,5 @@

 FlexiPix library

-!version: 1.0.5! !date: 2010-12-22!

+!version: 1.0.6! !date: 2010-12-30!

 FlexPix is a large scale display architecure that is driven using UDP/IP.

 It consists of single pixels that are connected to chains. A number of those

@@ -4,6 +4,10 @@

 #include <flexipix/flexipix.h>

+#ifdef WINDOWS

+#include <winsock.h>

+#endif

+

 /* just an example for some data */

 typedef struct userdata_s {

   int i;

@@ -57,6 +61,13 @@ int main(int argc, char *argv[])

   }

   config = argv[1];

+#ifdef WINDOWS

+  {

+    WSADATA data;

+    WSAStartup(MAKEWORD(1,1), &data);

+  }

+#endif

+

   /* create a display, take the configuration from a file,

      deliver messages to the callback function msg(),

      the last parameter is passed as first parameter to msg()

@@ -87,6 +98,11 @@ int main(int argc, char *argv[])

   printf("done\n");

   flp_display_free(p_display);

+

+#ifdef WINDOWS

+  WSACleanup();

+#endif

+

   return 0;

 }

@@ -4,6 +4,10 @@

 #include <flexipix/flexipix.h>

+#ifdef WINDOWS

+#include <winsock.h>

+#endif

+

 /* just an example for some data */

 typedef struct userdata_s {

   int i;

@@ -58,6 +62,13 @@ int main(int argc, char *argv[])

   }

   config = argv[1];

+#ifdef WINDOWS

+  {

+    WSADATA data;

+    WSAStartup(MAKEWORD(1,1), &data);

+  }

+#endif

+

   /* create a displayer that manages a display in the background

      and takes care that data is sent periodically to the distributors

      to prevent that the pixels turn off after a timeout,

@@ -125,6 +136,11 @@ int main(int argc, char *argv[])

   free(p_image);

   flp_displayer_free(p_displayer);

+

+#ifdef WINDOWS

+  WSACleanup();

+#endif

+

   return 0;

 }

@@ -4,6 +4,10 @@

 #include <flexipix/flexipix.h>

+#ifdef WINDOWS

+#include <winsock.h>

+#endif

+

 /* just an example for some data */

 typedef struct userdata_s {

   int i;

@@ -57,6 +61,13 @@ int main(int argc, char *argv[])

   }

   config = argv[1];

+#ifdef WINDOWS

+  {

+    WSADATA data;

+    WSAStartup(MAKEWORD(1,1), &data);

+  }

+#endif

+

   /* create a display, take the configuration from a file,

      deliver messages to the callback function msg(),

      the last parameter is passed as first parameter to msg()

@@ -97,6 +108,11 @@ int main(int argc, char *argv[])

   free(p_image);

   flp_display_free(p_display);

+

+#ifdef WINDOWS

+  WSACleanup();

+#endif

+

   return 0;

 }

@@ -1,6 +1,6 @@

 /*

  * FlexiPix library

- * !version: 1.0.5! !date: 2010-12-22!

+ * !version: 1.0.6! !date: 2010-12-30!

  *

  * Copyright 2010 Stefan Schuermans <stefan schuermans info>

  *

@@ -1,6 +1,6 @@

 /*

  * FlexiPix library

- * !version: 1.0.5! !date: 2010-12-22!

+ * !version: 1.0.6! !date: 2010-12-30!

  *

  * Copyright 2010 Stefan Schuermans <stefan schuermans info>

  *

@@ -1,6 +1,6 @@

 /*

  * FlexiPix library

- * !version: 1.0.5! !date: 2010-12-22!

+ * !version: 1.0.6! !date: 2010-12-30!

  *

  * Copyright 2010 Stefan Schuermans <stefan schuermans info>

  *

@@ -1,6 +1,6 @@

 /*

  * FlexiPix library

- * !version: 1.0.5! !date: 2010-12-22!

+ * !version: 1.0.6! !date: 2010-12-30!

  *

  * Copyright 2010 Stefan Schuermans <stefan schuermans info>

  *

@@ -1,6 +1,6 @@

 /*

  * FlexiPix library

- * !version: 1.0.5! !date: 2010-12-22!

+ * !version: 1.0.6! !date: 2010-12-30!

  *

  * Copyright 2010 Stefan Schuermans <stefan schuermans info>

  *

@@ -1,6 +1,6 @@

 /*

  * FlexiPix library

- * !version: 1.0.5! !date: 2010-12-22!

+ * !version: 1.0.6! !date: 2010-12-30!

  *

  * Copyright 2010 Stefan Schuermans <stefan schuermans info>

  *

@@ -1,6 +1,6 @@

 /*

  * FlexiPix library

- * !version: 1.0.5! !date: 2010-12-22!

+ * !version: 1.0.6! !date: 2010-12-30!

  *

  * Copyright 2010 Stefan Schuermans <stefan schuermans info>

  *

@@ -1,6 +1,6 @@

 /*

  * FlexiPix library

- * !version: 1.0.5! !date: 2010-12-22!

+ * !version: 1.0.6! !date: 2010-12-30!

  *

  * Copyright 2010 Stefan Schuermans <stefan schuermans info>

  *

@@ -1,6 +1,6 @@

 /*

  * FlexiPix library

- * !version: 1.0.5! !date: 2010-12-22!

+ * !version: 1.0.6! !date: 2010-12-30!

  *

  * Copyright 2010 Stefan Schuermans <stefan schuermans info>

  *

@@ -1,6 +1,6 @@

 /*

  * FlexiPix library

- * !version: 1.0.5! !date: 2010-12-22!

+ * !version: 1.0.6! !date: 2010-12-30!

  *

  * Copyright 2010 Stefan Schuermans <stefan schuermans info>

  *

@@ -21,13 +21,15 @@

 #ifndef FLP_DISPLAYER_H

 #define FLP_DISPLAYER_H

+#include <intern/thread.h>

+

 /**

  * \brief output thread of displayer object

  *

  * \param[in] vp_displayer pointer to displayer object

  * \return unused, always NULL

  */

-void * flp_displayer_thread(void *vp_displayer);

+FLP_THREAD_FUNC(flp_displayer_thread);

 #endif /* #ifndef FLP_DISPLAYER_H */

@@ -1,6 +1,6 @@

 /*

  * FlexiPix library

- * !version: 1.0.5! !date: 2010-12-22!

+ * !version: 1.0.6! !date: 2010-12-30!

  *

  * Copyright 2010 Stefan Schuermans <stefan schuermans info>

  *

@@ -0,0 +1,37 @@

+/*

+ * FlexiPix library

+ * !version: 1.0.6! !date: 2010-12-30!

+ *

+ * Copyright 2010 Stefan Schuermans <stefan schuermans info>

+ *

+ * This program is free software: you can redistribute it and/or modify

+ * it under the terms of the GNU General Public License as published by

+ * the Free Software Foundation, version 3 of the License.

+ *

+ *

+ * This program is distributed in the hope that it will be useful,

+ * but WITHOUT ANY WARRANTY; without even the implied warranty of

+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

+ * GNU General Public License for more details.

+ *

+ * You should have received a copy of the GNU Lesser General Public License

+ * along with this program. If not, see <http://www.gnu.org/licenses/>.

+ */

+

+#ifndef FLP_MISSING_H

+#define FLP_MISSING_H

+

+#include <string.h>

+

+#ifdef WINDOWS

+extern inline char * strerror_r(int errnum, char *buf, size_t buflen)

+{

+  strncpy(buf, strerror(errnum), buflen);

+  if (buflen >= 1)

+    buf[buflen - 1] = 0;

+  return buf;

+}

+#endif

+

+#endif /* #ifndef FLP_MISSING_H */

+

@@ -1,6 +1,6 @@

 /*

  * FlexiPix library

- * !version: 1.0.5! !date: 2010-12-22!

+ * !version: 1.0.6! !date: 2010-12-30!

  *

  * Copyright 2010 Stefan Schuermans <stefan schuermans info>

  *

@@ -22,15 +22,72 @@

 #define FLP_NET_H

 #ifdef WINDOWS

+#  include <stdint.h>

 #  include <winsock2.h>

 #else

-#define closesocket close

 #  include <arpa/inet.h>

+#  include <errno.h>

 #  include <netdb.h>

 #  include <netinet/in.h>

+#  include <string.h>

 #  include <sys/socket.h>

 #  include <unistd.h>

 #endif

+/** type of socket descriptor */

+#ifdef WINDOWS

+typedef SOCKET flp_sock_t;

+#else

+typedef int flp_sock_t;

+#endif

+

+#ifdef WINDOWS

+/** IP address type missing on Windows */

+typedef uint32_t in_addr_t;

+#endif

+

+#ifdef WINDOWS

+/** port type missing on Windows */

+typedef uint16_t in_port_t;

+#endif

+

+#ifndef WINDOWS

+/** closesocket() only exists for Windows,other OSes just use close() */

+extern inline int closesocket(int fd)

+{

+  return close(fd);

+}

+#endif

+

+/**

+ * \brief check a socket descriptor

+ * \param[in] sock socket descriptor to check

+ * \return 1 if valid, 0 if not valid

+ */

+extern inline int flp_sock_is_valid(flp_sock_t sock)

+{

+#ifdef WINDOWS

+  return sock != INVALID_SOCKET;

+#else

+  return sock >= 0;

+#endif

+}

+

+/**

+ * \brief get error of last socket call as text

+ * \param[in] buf pointer to buffer to place text into

+ * \param[in] buflen size of buffer

+ */

+extern inline void flp_sock_get_last_error(char *buf, size_t buflen)

+{

+#ifdef WINDOWS

+  int err = WSAGetLastError();

+  FormatMessage(FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS,

+                NULL, err, 0, buf, buflen, NULL);

+#else

+  strerror_r(errno, buf, buflen);

+#endif

+}

+

 #endif /* #ifndef FLP_NET_H */

@@ -1,6 +1,6 @@

 /*

  * FlexiPix library

- * !version: 1.0.5! !date: 2010-12-22!

+ * !version: 1.0.6! !date: 2010-12-30!

  *

  * Copyright 2010 Stefan Schuermans <stefan schuermans info>

  *

@@ -1,6 +1,6 @@

 /*

  * FlexiPix library

- * !version: 1.0.5! !date: 2010-12-22!

+ * !version: 1.0.6! !date: 2010-12-30!

  *

  * Copyright 2010 Stefan Schuermans <stefan schuermans info>

  *

@@ -0,0 +1,256 @@

+/*

+ * FlexiPix library

+ * !version: 1.0.6! !date: 2010-12-30!

+ *

+ * Copyright 2010 Stefan Schuermans <stefan schuermans info>

+ *

+ * This program is free software: you can redistribute it and/or modify

+ * it under the terms of the GNU General Public License as published by

+ * the Free Software Foundation, version 3 of the License.

+ *

+ *

+ * This program is distributed in the hope that it will be useful,

+ * but WITHOUT ANY WARRANTY; without even the implied warranty of

+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

+ * GNU General Public License for more details.

+ *

+ * You should have received a copy of the GNU Lesser General Public License

+ * along with this program. If not, see <http://www.gnu.org/licenses/>.

+ */

+

+#ifndef FLP_THREAD_H

+#define FLP_THREAD_H

+

+#ifdef WINDOWS

+#  include <windows.h>

+#else

+#  include <errno.h>

+#  include <pthread.h>

+#  include <sys/time.h>

+#  include <stdlib.h>

+#endif

+

+/** signature to define or declare thread function */

+#ifdef WINDOWS

+#  define FLP_THREAD_FUNC(func) DWORD (__stdcall func)(LPVOID vp_displayer)

+#else

+#  define FLP_THREAD_FUNC(func) void * (func)(void *vp_displayer)

+#endif

+

+/** return a void pointer from a thread function */

+#ifdef WINDOWS

+#  define FLP_THREAD_RETURN(vp) return (DWORD)(vp);

+#else

+#  define FLP_THREAD_RETURN(vp) return (vp);

+#endif

+

+/** type for a thread ID */

+#ifdef WINDOWS

+typedef HANDLE flp_thread_id_t;

+#else

+typedef pthread_t flp_thread_id_t;

+#endif

+

+/** type for a mutex */

+#ifdef WINDOWS

+typedef HANDLE flp_thread_mutex_t;

+#else

+typedef pthread_mutex_t flp_thread_mutex_t;

+#endif

+

+/** type for a condition */

+#ifdef WINDOWS

+typedef HANDLE flp_thread_cond_t;

+#else

+typedef pthread_cond_t flp_thread_cond_t;

+#endif

+

+/**

+ * \brief create a thread

+ * \param[out] *p_tid thread ID

+ * \param[in] func thread function

+ * \param[in] p_data user data pointer

+ * \return 1 if successful, 0 on error

+ */

+extern inline int flp_thread_create(flp_thread_id_t *p_tid,

+                                    FLP_THREAD_FUNC(*func),

+                                    void * p_data)

+{

+#ifdef WINDOWS

+  HANDLE h = CreateThread(NULL, 0, func, (LPVOID)p_data, 0, NULL);

+  if (h != NULL)

+    *p_tid = h;

+  return h != NULL;

+#else

+  return pthread_create(p_tid, NULL, func, p_data) == 0;

+#endif

+}

+

+/**

+ * \brief join a thread

+ * \param[in] tid thread ID

+ */

+extern inline void flp_thread_join(flp_thread_id_t tid)

+{

+#ifdef WINDOWS

+  WaitForSingleObject(tid, INFINITE);

+  CloseHandle(tid);

+#else

+  pthread_join(tid, NULL);

+#endif

+}

+

+/**

+ * \brief initialize mutex

+ * \param[in] *p_mtx mutex variable

+ * \return 1 if successful, 0 on error

+ */

+extern inline int flp_thread_mutex_init(flp_thread_mutex_t *p_mtx)

+{

+#ifdef WINDOWS

+  HANDLE h = CreateMutex(NULL, FALSE, NULL);

+  if (h != NULL)

+    *p_mtx = h;

+  return h != NULL;

+#else

+  return pthread_mutex_init(p_mtx, NULL) == 0;

+#endif

+}

+

+/**

+ * \brief destroy mutex

+ * \param[in] *p_mtx mutex variable

+ */

+extern inline void flp_thread_mutex_destroy(flp_thread_mutex_t *p_mtx)

+{

+#ifdef WINDOWS

+  CloseHandle(*p_mtx);

+#else

+  pthread_mutex_destroy(p_mtx);

+#endif

+}

+

+/**

+ * \brief lock mutex

+ * \param[in] *p_mtx mutex variable

+ */

+extern inline void flp_thread_mutex_lock(flp_thread_mutex_t *p_mtx)

+{

+#ifdef WINDOWS

+  WaitForSingleObject(*p_mtx, INFINITE);

+#else

+  pthread_mutex_lock(p_mtx);

+#endif

+}

+

+/**

+ * \brief unlock mutex

+ * \param[in] *p_mtx mutex variable

+ */

+extern inline void flp_thread_mutex_unlock(flp_thread_mutex_t *p_mtx)

+{

+#ifdef WINDOWS

+  ReleaseMutex(*p_mtx);

+#else

+  pthread_mutex_unlock(p_mtx);

+#endif

+}

+

+/**

+ * \brief initialize condition

+ * \param[in] *p_cond conition variable

+ * \return 1 if successful, 0 on error

+ */

+extern inline int flp_thread_cond_init(flp_thread_cond_t *p_cond)

+{

+#ifdef WINDOWS

+  HANDLE h = CreateEvent(NULL, FALSE, FALSE, NULL);

+  if (h != NULL)

+    *p_cond = h;

+  return h != NULL;

+#else

+  return pthread_cond_init(p_cond, NULL) == 0;

+#endif

+}

+

+/**

+ * \brief destroy condition

+ * \param[in] *p_cond condition variable

+ */

+extern inline void flp_thread_cond_destroy(flp_thread_cond_t *p_cond)

+{

+#ifdef WINDOWS

+  CloseHandle(*p_cond);

+#else

+  pthread_cond_destroy(p_cond);

+#endif

+}

+

+/**

+ * \brief signal condition

+ * \param[in] *p_cond condition variable

+ */

+extern inline void flp_thread_cond_signal(flp_thread_cond_t *p_cond)

+{

+#ifdef WINDOWS

+  SetEvent(*p_cond);

+#else

+  pthread_cond_signal(p_cond);

+#endif

+}

+

+/**

+ * \brief wait for condition

+ * \param[in] *p_cond condition variable

+ * \param[in] *p_mtx mutex variable to unlock while waiting

+ */

+extern inline void flp_thread_cond_wait(flp_thread_cond_t *p_cond,

+                                        flp_thread_mutex_t *p_mtx)

+{

+#ifdef WINDOWS

+  /* the unlock/wait-begin and wait-end/lock are atomic for pthread,

+     but this is not needed for libflexipix... */

+  ReleaseMutex(*p_mtx); /* unlock mutex */

+  WaitForSingleObject(*p_cond, INFINITE); /* wait for condition */

+  WaitForSingleObject(*p_mtx, INFINITE); /* lock mutex again */

+#else

+  pthread_cond_wait(p_cond, p_mtx);

+#endif

+}

+

+/**

+ * \brief wait for condition with timeout

+ * \param[in] *p_cond condition variable

+ * \param[in] *p_mtx mutex variable to unlock while waiting

+ * \param[in] *p_now current time

+ * \param[in] millisecs number of milliseconds to wait at most

+ * \return 0 for condition singnaled, 1 for timeout

+ */

+extern inline int flp_thread_cond_timedwait(flp_thread_cond_t *p_cond,

+                                            flp_thread_mutex_t *p_mtx,

+                                            struct timeval *p_now,

+                                            unsigned int millisecs)

+{

+#ifdef WINDOWS

+  int ret;

+  /* the unlock/wait-begin and wait-end/lock are atomic for pthread,

+     but this is not needed for libflexipix... */

+  ReleaseMutex(*p_mtx); /* unlock mutex */

+  ret = WaitForSingleObject(*p_cond, millisecs); /* wait for condition */

+  WaitForSingleObject(*p_mtx, INFINITE); /* lock mutex again */

+  return ret == WAIT_TIMEOUT;

+  (void)p_now;

+#else

+  struct timespec until;

+  until.tv_sec = p_now->tv_sec + millisecs / 1000;

+  until.tv_nsec = p_now->tv_usec * 1000 + (millisecs % 1000) * 1000000;

+  if (until.tv_nsec > 1000000000) {

+    until.tv_nsec -= 1000000000;

+    until.tv_sec++;

+  }

+  return pthread_cond_timedwait(p_cond, p_mtx, &until) == ETIMEDOUT;

+#endif

+}

+

+#endif /* #ifndef FLP_THREAD_H */

+

@@ -1,6 +1,6 @@

 /*

  * FlexiPix library

- * !version: 1.0.5! !date: 2010-12-22!

+ * !version: 1.0.6! !date: 2010-12-30!

  *

  * Copyright 2010 Stefan Schuermans <stefan schuermans info>

  *

@@ -21,11 +21,10 @@

 #ifndef FLP_TYPES_H

 #define FLP_TYPES_H

-#include <pthread.h>

-

 #include <flexipix/types.h>

 #include <intern/constants.h>

 #include <intern/net.h>

+#include <intern/thread.h>

 /** mapping information

  *

@@ -73,7 +72,7 @@ struct flp_display_s {

   unsigned int distri_cnt;            /**< total number of distris */

   unsigned int output_cnt;            /**< total number of outputs */

   unsigned long pixel_cnt;            /**< total number of pixels */

-  int sock;                           /**< socket to send UDP packets */

+  flp_sock_t sock;                    /**< socket to send UDP packets */

 };

 /** a displayer

@@ -82,9 +81,9 @@ struct flp_display_s {

  */

 struct flp_displayer_s {

   flp_display_t *p_display; /**< display managed by this displayer */

-  pthread_mutex_t mtx;      /**< mutex to lock msg_buf of distris */

-  pthread_cond_t cond;      /**< condition to wake up thread on new frame */

-  pthread_t tid;            /**< id of output thread */

+  flp_thread_mutex_t mtx;   /**< mutex to lock msg_buf of distris */

+  flp_thread_cond_t cond;   /**< condition to wake up thread on new frame */

+  flp_thread_id_t tid;      /**< id of output thread */

   volatile int active;      /**< if to output to distris */

   volatile int send;        /**< set to force immediate sending to distris */

   volatile int end;         /**< set to signal end to thread */

@@ -1,6 +1,6 @@

 /*

  * FlexiPix library

- * !version: 1.0.5! !date: 2010-12-22!

+ * !version: 1.0.6! !date: 2010-12-30!

  *

  * Copyright 2010 Stefan Schuermans <stefan schuermans info>

  *

@@ -29,6 +29,7 @@

 #include <intern/constants.h>

 #include <intern/config.h>

 #include <intern/mapping.h>

+#include <intern/missing.h>

 #include <intern/net.h>

 #include <intern/parse.h>

 #include <intern/strtod_noloc.h>

@@ -1,6 +1,6 @@

 /*

  * FlexiPix library

- * !version: 1.0.5! !date: 2010-12-22!

+ * !version: 1.0.6! !date: 2010-12-30!

  *

  * Copyright 2010 Stefan Schuermans <stefan schuermans info>

  *

@@ -1,6 +1,6 @@

 /*

  * FlexiPix library

- * !version: 1.0.5! !date: 2010-12-22!

+ * !version: 1.0.6! !date: 2010-12-30!

  *

  * Copyright 2010 Stefan Schuermans <stefan schuermans info>

  *

@@ -79,11 +79,11 @@ flp_display_t *flp_display_create(const char *sz_config_file,

   /* create socket */

   p_display->sock = socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP);

-  if (p_display->sock < 0) {

+  if (!flp_sock_is_valid(p_display->sock)) {

     flp_display_free(p_display);

     if (p_msg_func) {

       char errmsg[256];

-      strerror_r(errno, errmsg, sizeof(errmsg));

+      flp_sock_get_last_error(errmsg, sizeof(errmsg));

       p_msg_func(p_msg_ctx, flp_msg_type_err,

                  "could not create UDP socket: %s\n", errmsg);

     }

@@ -96,7 +96,7 @@ flp_display_t *flp_display_create(const char *sz_config_file,

     flp_display_free(p_display);

     if (p_msg_func) {

       char errmsg[256];

-      strerror_r(errno, errmsg, sizeof(errmsg));

+      flp_sock_get_last_error(errmsg, sizeof(errmsg));

       p_msg_func(p_msg_ctx, flp_msg_type_err,

                  "could not bind UDP socket to \"%s:%u\": %s\n",

                  inet_ntoa(p_display->bind_addr.sin_addr),

@@ -134,7 +134,7 @@ void flp_display_free(flp_display_t *p_display)

     }