]> rtime.felk.cvut.cz Git - orte.git/commitdiff
OCERA SF CVS tree of ORTE framework updated to
authorppisa <ppisa>
Wed, 11 Feb 2004 00:38:24 +0000 (00:38 +0000)
committerppisa <ppisa>
Wed, 11 Feb 2004 00:38:24 +0000 (00:38 +0000)
the actual Petr Smolik's tree state.

115 files changed:
Makefile.in
Makefile.omk
Makefile.rules
aclocal.m4
admin/config.guess
admin/config.sub
admin/install-sh
admin/linux.m4
admin/missing
admin/mkinstalldirs
authors
configure
configure.in
orte.kdevelop
orte/Makefile.in
orte/contrib/shape/MainFrm.ui
orte/contrib/shape/MainFrm.ui.h
orte/contrib/shape/Makefile
orte/contrib/shape/MulticlipForm.ui
orte/contrib/shape/MulticlipForm.ui.h
orte/contrib/shape/Orte_demo.db [deleted file]
orte/contrib/shape/Orte_demo.pro [deleted file]
orte/contrib/shape/Publisher.cpp
orte/contrib/shape/Publisher.h
orte/contrib/shape/Subscriber.cpp
orte/contrib/shape/Subscriber.h
orte/contrib/shape/ViewFrm.cpp
orte/contrib/shape/ViewFrm.h
orte/contrib/shape/define.h [deleted file]
orte/contrib/shape/main.cpp
orte/contrib/shape/ortedemo.pro [new file with mode: 0644]
orte/contrib/shape/ortedemo_types.c [new file with mode: 0644]
orte/contrib/shape/ortedemo_types.h [new file with mode: 0644]
orte/examples/Makefile.am
orte/examples/Makefile.in
orte/examples/Makefile.omk
orte/examples/hello/HelloWorldPublisher.c
orte/examples/hello/HelloWorldSubscriber.c
orte/examples/hello/Makefile.am
orte/examples/hello/Makefile.in
orte/examples/hello/Makefile.omk
orte/examples/ping/Makefile [new file with mode: 0644]
orte/examples/ping/Makefile.am [new file with mode: 0644]
orte/examples/ping/Makefile.in [new file with mode: 0644]
orte/examples/ping/Makefile.omk [new file with mode: 0644]
orte/examples/ping/msvc/getopt.c [new file with mode: 0644]
orte/examples/ping/msvc/getopt_long.c [new file with mode: 0644]
orte/examples/ping/msvc/m.bat [new file with mode: 0755]
orte/examples/ping/msvc/makefile.msc [new file with mode: 0644]
orte/examples/ping/orteping.c [new file with mode: 0644]
orte/examples/reliable/Makefile.am
orte/examples/reliable/Makefile.in
orte/examples/reliable/Makefile.omk
orte/examples/reliable/publisher.c [moved from orte/examples/reliable/ReliablePublisher.c with 68% similarity]
orte/examples/reliable/subscriberbesteffort.c [moved from orte/examples/reliable/BestEffortSubscriber.c with 92% similarity]
orte/examples/reliable/subscriberreliable.c [moved from orte/examples/reliable/ReliableSubscriber.c with 92% similarity]
orte/examples/spy/Makefile [new file with mode: 0644]
orte/examples/spy/Makefile.am [new file with mode: 0644]
orte/examples/spy/Makefile.in [new file with mode: 0644]
orte/examples/spy/Makefile.omk [new file with mode: 0644]
orte/examples/spy/ortespy.c [new file with mode: 0644]
orte/examples/type/readme.txt [new file with mode: 0644]
orte/include/config.h.in
orte/include/defines_api.h
orte/include/orte_all.h
orte/include/orte_api.h
orte/include/orte_config_omk_rtl.h [new file with mode: 0644]
orte/include/orte_config_omk_unix.h [new file with mode: 0644]
orte/include/protos.h
orte/include/protos_api.h
orte/include/rtai/compat.h
orte/include/rtai/rtai_posix.h.patched
orte/include/rtl/compat.h
orte/include/typedefs.h
orte/include/typedefs_api.h
orte/include/win32/semaphore.h [new file with mode: 0644]
orte/liborte/Makefile.am
orte/liborte/Makefile.in
orte/liborte/Makefile.omk
orte/liborte/ORTEAppRecvUserdataThread.c
orte/liborte/ORTEAppSendThread.c
orte/liborte/ORTEDomain.c
orte/liborte/ORTEDomainApp.c
orte/liborte/ORTEDomainMgr.c
orte/liborte/ORTEInit.c
orte/liborte/ORTEMisc.c [moved from orte/include/config.h.undef with 62% similarity]
orte/liborte/ORTEPublication.c
orte/liborte/ORTESubscription.c
orte/liborte/ORTEThreadUtils.c
orte/liborte/ORTETypeRegister.c
orte/liborte/RTPSAck.c
orte/liborte/RTPSCSTReaderProc.c
orte/liborte/RTPSCSTReaderTimer.c
orte/liborte/RTPSCSTWriter.c
orte/liborte/RTPSCSTWriterTimer.c
orte/liborte/RTPSHeardBeat.c
orte/liborte/RTPSVar.c
orte/liborte/conv.c
orte/liborte/event.c
orte/liborte/htimerNtp.c
orte/liborte/objectEntryTimer.c
orte/liborte/objectUtils.c
orte/liborte/rtl/Makefile.am
orte/liborte/rtl/Makefile.in
orte/liborte/rtl/Makefile.omk
orte/liborte/sock.c
orte/liborte/ul_gavlprim.c
orte/liborte/usedSections.txt
orte/manager/Makefile.am
orte/manager/Makefile.in
orte/manager/Makefile.omk
orte/manager/make_with_ccmalloc [deleted file]
orte/manager/ortemanager.c [moved from orte/manager/ORTEManager.c with 82% similarity]
orte/manager/rc/ortemanagerd [moved from orte/manager/rc/ORTEManagerd with 79% similarity]
readme

index ba5d7a2be78c7a5ba299818429c9511a656faae5..c254f4aa38e234de39a788a089a8864cf5971a8a 100644 (file)
@@ -68,6 +68,7 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 AMTAR = @AMTAR@
 AWK = @AWK@
 CC = @CC@
+CONFIG_ORTE_KERNEL = @CONFIG_ORTE_KERNEL@
 CONFIG_ORTE_RT = @CONFIG_ORTE_RT@
 DEPDIR = @DEPDIR@
 INCLUDES = @INCLUDES@
@@ -126,9 +127,8 @@ RECURSIVE_TARGETS = info-recursive dvi-recursive install-info-recursive \
        uninstall-recursive check-recursive installcheck-recursive
 DIST_COMMON = ./orte/include/config.h.in Makefile.am Makefile.in \
        aclocal.m4 admin/compile admin/config.guess admin/config.sub \
-       admin/depcomp admin/install-sh admin/ltconfig admin/ltmain.sh \
-       admin/missing admin/mkinstalldirs configure configure.in \
-       modtool.in
+       admin/depcomp admin/install-sh admin/missing \
+       admin/mkinstalldirs configure configure.in modtool.in
 DIST_SUBDIRS = $(SUBDIRS)
 all: all-recursive
 
index 1c27e8c0d5519e9466fd84020ebc45d0979dfd9f..9f55536fcfa3e960ccf688505a7b509dd2acd7eb 100644 (file)
@@ -1,2 +1 @@
-#SUBDIRS += RTL_UDP
-SUBDIRS += orte
+SUBDIRS = orte
index 49cf9a9bd8c114ca9b55caeec1ec2053ca566749..4286f142e8789ac7f93cb79f8c3d9ec5e528f6bc 100644 (file)
@@ -61,7 +61,7 @@ USER_UTILS_DIR   := $(OCERA_DIR)/$(COMPILED_DIR_NAME)/user/utils
 USER_BIN_DIR     := $(OCERA_DIR)/$(COMPILED_DIR_NAME)/user/bin
 USER_BUILD_DIR   := $(OCERA_DIR)/$(BUILD_DIR_NAME)/user/orte
 LINUX_DIR        := $(OCERA_DIR)/kernel/linux
-#RTL_DIR      := $(OCERA_DIR)/kernel/rtlinux
+#RTL_DIR         := $(OCERA_DIR)/kernel/rtlinux
 CONFIG_FILE      := $(OCERA_DIR)/emdebsys/.config 
 else 
 KERN_INCLUDE_DIR := $(MAKERULES_DIR)/$(COMPILED_DIR_NAME)/include-kern
@@ -83,7 +83,11 @@ endif
 
 export SOURCES_DIR MAKERULES_DIR RELATIVE_DIR LINUX_DIR LINUX_VERSION RTL_DIR
 
-CFLAGS = -O2 -ggdb
+CFLAGS += -ggdb
+CFLAGS += -O2 
+CFLAGS += -Wall
+CXXFLAGS += -Wall
+
 
 CPPFLAGS  += -I $(USER_INCLUDE_DIR)
 
@@ -240,9 +244,9 @@ ifdef RTL_DIR
 include $(RTL_DIR)/rtl.mk
 
 KERN_CC = $(CC)
-INCLUDES := -I $(KERN_INCLUDE_DIR) $(INCLUDE) $(rtlinux_INCLUDES) $(kernel_INCLUDES)
+kern_GCCLIB_DIR=$(shell $(CC) -print-search-dirs | sed -n -e 's/^install: \(.*\)$$/\1/p' )INCLUDES := -I $(KERN_INCLUDE_DIR) $(INCLUDE) $(rtlinux_INCLUDES) $(kernel_INCLUDES)
 #-DEXPORT_NO_SYMBOLS
-c_o_kern_COMPILE = $(KERN_CC) $(INCLUDES) $(CFLAGS) -DEXPORT_SYMTAB 
+c_o_kern_COMPILE = $(KERN_CC) $(INCLUDES) -I$(kern_GCCLIB_DIR)/include $(CFLAGS) -DEXPORT_SYMTAB  -nostdinc
 cc_o_kern_COMPILE = $(CXX) $(INCLUDES) $(CXXFLAGS) -DEXPORT_SYMTAB
 KERN_EXE_SUFFIX := .o
 KERN_ARCH = $(ARCH)
@@ -254,10 +258,11 @@ include $(KERN_MODULES_DIR)/kernel.mk
 
 ifdef LINUX_CC
 KERN_CC = $(LINUX_CC)
+kern_GCCLIB_DIR=$(shell $(CC) -print-search-dirs | sed -n -e 's/^install: \(.*\)$$/\1/p' )INCLUDES := -I $(KERN_INCLUDE_DIR) $(INCLUDE) $(rtlinux_INCLUDES) $(kernel_INCLUDES)
 else
 KERN_CC = echo KERN_CC not defined - compilation skipped
 endif
-c_o_kern_COMPILE = $(KERN_CC) $(kernel_INCLUDES) $(LINUX_CFLAGS) -DEXPORT_SYMTAB 
+c_o_kern_COMPILE = $(KERN_CC) $(kernel_INCLUDES) -I$(kern_GCCLIB_DIR)/include $(LINUX_CFLAGS) -DEXPORT_SYMTAB -nostdinc
 cc_o_kern_COMPILE = $(KERN_CC) $(kernel_INCLUDES) $(LINUX_CFLAGS) -DEXPORT_SYMTAB
 KERN_EXE_SUFFIX := $(LINUX_MODULE_EXT)
 KERN_LDFLAGS = $(LINUX_LDFLAGS)
index 5041087184a841899ae10ca7013badbdad317837..c531f970ef28767b005c75158255ae707d0ae879 100644 (file)
@@ -872,7 +872,6 @@ AC_DEFUN([AM_MAINTAINER_MODE],
 )
 
 
-
 AC_DEFUN(DS_LINUX_DIR,
 [
        AC_ARG_WITH([linuxdir],
@@ -881,50 +880,18 @@ AC_DEFUN(DS_LINUX_DIR,
                [LINUX_DIR="${withval}"],
                [LINUX_DIR=default])
 
-       if test "${LINUX_DIR}" != "default" ; then
-               DS_TRY_LINUX_DIR([${LINUX_DIR}], , AC_MSG_ERROR([Linux dir not found]) )
-       fi
-
-       if test "${LINUX_DIR}" = "default" ; then
-               dir="/lib/modules/`uname -r`/build";
-               DS_TRY_LINUX_DIR([${dir}], [LINUX_DIR=${dir}], )
-       fi
-       if test "${LINUX_DIR}" = "default" ; then
-               dir="../linux";
-               DS_TRY_LINUX_DIR([${dir}], [LINUX_DIR=${dir}], )
-       fi
-       if test "${LINUX_DIR}" = "default" ; then
-               dir="/usr/src/linux";
-               DS_TRY_LINUX_DIR([${dir}], [LINUX_DIR=${dir}], )
-       fi
-
-#      if test "${LINUX_DIR}" = "default" ; then
-#              AC_MSG_ERROR([Linux source directory not found])
-#      fi
 
        AC_SUBST(LINUX_DIR)
 ])
 
-AC_DEFUN(DS_TRY_LINUX_DIR,
-       [AC_MSG_CHECKING(for Linux in $1)
-
-       if test -f "$1/Makefile" ; then
-               result=yes
-               $2
-       else
-               result="not found"
-               $3
-       fi
-
-       AC_MSG_RESULT($result)
-])
 
 AC_DEFUN(DS_LINUX,
 [
+
        DS_LINUX_DIR()
        
         AC_MSG_CHECKING([Linux version])
-       
+       
        if test "${LINUX_DIR}" != "default" ; then
 
           if [[ ! -f "${LINUX_DIR}/.config" ]];then
@@ -958,11 +925,21 @@ AC_DEFUN(DS_LINUX,
                AC_MSG_ERROR([Unknown Linux major.minor $LINUX_VERSION_MAJOR.$LINUX_VERSION_MINOR])
                ;;
          esac
+
+         CONFIG_ORTE_KERNEL=yes
+          AC_DEFINE([CONFIG_ORTE_KERNEL],[1],[Define if linux kernel is found])          
+
        else
           AC_MSG_RESULT(["none"])      
+         
+         CONFIG_ORTE_KERNEL=no
+                 
        fi
   
-  DS_RT()
+        AC_SUBST(CONFIG_ORTE_KERNEL)   
+       AM_CONDITIONAL([CONFIG_ORTE_KERNEL],[test ${CONFIG_ORTE_KERNEL} == "yes"])
+    
+        DS_RT()
 ])
 
 AC_DEFUN(DS_LINUX_2_6,
@@ -1130,6 +1107,8 @@ AC_DEFUN(DS_RTAI,
                        fi
                fi
                $1
+                RT_GCCLIB_DIR=`gcc -print-search-dirs | sed -n -e 's/^install: \(.*\)$/\1/p'`
+               RTAI_CFLAGS="${RTAI_CFLAGS} -I${RT_GCCLIB_DIR}/include -nostdinc"
                AC_MSG_RESULT([found])
                AC_DEFINE([CONFIG_ORTE_RTAI],[1],[Define if kernel is RTAI patched])
        else
@@ -1144,20 +1123,37 @@ AC_DEFUN(DS_RTLINUX,
        AC_ARG_WITH([rtlinuxdir],
                [AC_HELP_STRING([--with-rtlinuxdir=DIR],
                        [specify path to RTLinux source directory])],
-               [RTL_DIR="${withval}"],
-               [RTL_DIR=/usr/src/rtlinux])
+               [RTLINUX_DIR="${withval}"],
+               [RTLINUX_DIR=/usr/src/rtlinux])
+               
+       AC_ARG_WITH([rtlinuxudpdir],
+               [AC_HELP_STRING([--with-rtlinuxudpdir=DIR],
+                       [specify path to RTLinux UDP source directory])],
+               [RTLINUXUDP_DIR="${withval}"],
+               [RTLINUXUDP_DIR="${RTLINUX_DIR}"])
 
        DS_LINUX_CONFIG_OPTION_MODULE([CONFIG_RTLINUX])
 
        if test "${CONFIG_RTLINUX}" != "no" ; then
-               AC_MSG_CHECKING([RTLinux directory ${RTL_DIR} for rtl.mk])
-               if [[ -d ${RTL_DIR}/include ]] ; then
-                        RTLINUX_CFLAGS=`sed -n -e 's/^CFLAGS *=\(.*\)$/\1/p' ${RTL_DIR}/rtl.mk`
+               AC_MSG_CHECKING([RTLinux directory ${RTLINUX_DIR} for rtl.mk])
+               if [[ -d ${RTLINUX_DIR}/include ]] ; then
+                        RTLINUX_CFLAGS=`sed -n -e 's/^CFLAGS *=\(.*\)$/\1/p' ${RTLINUX_DIR}/rtl.mk`
                else
                        AC_MSG_ERROR([incorrect RTLinux directory?])
                fi
                AC_MSG_RESULT([found])
                AC_DEFINE([CONFIG_ORTE_RTL],[1],[Define if kernel is RTLinux patched])
+               AC_MSG_CHECKING([RTLinux for UDP])
+                if [[ ! -e "${RTLINUXUDP_DIR}/include/udp.h" -o \
+                     ! -e "${RTLINUXUDP_DIR}/include/nic.h" -o \ 
+                     ! -e "${RTLINUXUDP_DIR}/include/ip.h" -o \ 
+                     ! -e "${RTLINUXUDP_DIR}/include/ethernet.h" -o \ 
+                     ! -e "${RTLINUXUDP_DIR}/include/nictab.h" ]] ; then 
+                       AC_MSG_ERROR([incorrect RTLinux UDP directory!!!])
+               fi
+                RT_GCCLIB_DIR=`gcc -print-search-dirs | sed -n -e 's/^install: \(.*\)$/\1/p'`
+               RTLINUX_CFLAGS="${RTLINUX_CFLAGS} -I${RTLINUXUDP_DIR}/include -I${RT_GCCLIB_DIR}/include -nostdinc"
+               AC_MSG_RESULT([found])
                $1
        else
                $2
index cd430f6d1faee0d82f07ac5bec021901993bdc09..500ee74b047e6c6ea95e13d9786e01defba86328 100755 (executable)
@@ -1,9 +1,9 @@
 #! /bin/sh
 # Attempt to guess a canonical system name.
-#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
-#   Free Software Foundation, Inc.
+#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
+#   2000, 2001, 2002, 2003 Free Software Foundation, Inc.
 
-timestamp='2001-08-21'
+timestamp='2003-10-03'
 
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@@ -24,8 +24,9 @@ timestamp='2001-08-21'
 # configuration script generated by Autoconf, you may include it under
 # the same distribution terms that you use for the rest of that program.
 
-# Written by Per Bothner <bothner@cygnus.com>.
-# Please send patches to <config-patches@gnu.org>.
+# Originally written by Per Bothner <per@bothner.com>.
+# Please send patches to <config-patches@gnu.org>.  Submit a context
+# diff and a properly formatted ChangeLog entry.
 #
 # This script attempts to guess a canonical system name similar to
 # config.sub.  If it succeeds, it prints the system name on stdout, and
@@ -87,30 +88,42 @@ if test $# != 0; then
   exit 1
 fi
 
+trap 'exit 1' 1 2 15
 
-dummy=dummy-$$
-trap 'rm -f $dummy.c $dummy.o $dummy.rel $dummy; exit 1' 1 2 15
+# CC_FOR_BUILD -- compiler used by this script. Note that the use of a
+# compiler to aid in system detection is discouraged as it requires
+# temporary files to be created and, as you can see below, it is a
+# headache to deal with in a portable fashion.
 
-# CC_FOR_BUILD -- compiler used by this script.
 # Historically, `CC_FOR_BUILD' used to be named `HOST_CC'. We still
 # use `HOST_CC' if defined, but it is deprecated.
 
-set_cc_for_build='case $CC_FOR_BUILD,$HOST_CC,$CC in
- ,,)    echo "int dummy(){}" > $dummy.c ;
-       for c in cc gcc c89 ; do
-         ($c $dummy.c -c -o $dummy.o) >/dev/null 2>&1 ;
-         if test $? = 0 ; then
+# Portable tmp directory creation inspired by the Autoconf team.
+
+set_cc_for_build='
+trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ;
+trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ;
+: ${TMPDIR=/tmp} ;
+ { tmp=`(umask 077 && mktemp -d -q "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
+ { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } ||
+ { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } ||
+ { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ;
+dummy=$tmp/dummy ;
+tmpfiles="$dummy.c $dummy.o $dummy.rel $dummy" ;
+case $CC_FOR_BUILD,$HOST_CC,$CC in
+ ,,)    echo "int x;" > $dummy.c ;
+       for c in cc gcc c89 c99 ; do
+         if ($c -c -o $dummy.o $dummy.c) >/dev/null 2>&1 ; then
             CC_FOR_BUILD="$c"; break ;
          fi ;
        done ;
-       rm -f $dummy.c $dummy.o $dummy.rel ;
        if test x"$CC_FOR_BUILD" = x ; then
          CC_FOR_BUILD=no_compiler_found ;
        fi
        ;;
  ,,*)   CC_FOR_BUILD=$CC ;;
  ,*,*)  CC_FOR_BUILD=$HOST_CC ;;
-esac'
+esac ;'
 
 # This is needed to find uname on a Pyramid OSx when run in the BSD universe.
 # (ghazi@noc.rutgers.edu 1994-08-24)
@@ -127,29 +140,30 @@ UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
 
 case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
     *:NetBSD:*:*)
-       # Netbsd (nbsd) targets should (where applicable) match one or
+       # NetBSD (nbsd) targets should (where applicable) match one or
        # more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*,
        # *-*-netbsdecoff* and *-*-netbsd*.  For targets that recently
        # switched to ELF, *-*-netbsd* would select the old
        # object file format.  This provides both forward
        # compatibility and a consistent mechanism for selecting the
        # object file format.
-       # Determine the machine/vendor (is the vendor relevant).
-       case "${UNAME_MACHINE}" in
-           amiga) machine=m68k-unknown ;;
-           arm32) machine=arm-unknown ;;
-           atari*) machine=m68k-atari ;;
-           sun3*) machine=m68k-sun ;;
-           mac68k) machine=m68k-apple ;;
-           macppc) machine=powerpc-apple ;;
-           hp3[0-9][05]) machine=m68k-hp ;;
-           ibmrt|romp-ibm) machine=romp-ibm ;;
-           *) machine=${UNAME_MACHINE}-unknown ;;
+       #
+       # Note: NetBSD doesn't particularly care about the vendor
+       # portion of the name.  We always set it to "unknown".
+       sysctl="sysctl -n hw.machine_arch"
+       UNAME_MACHINE_ARCH=`(/sbin/$sysctl 2>/dev/null || \
+           /usr/sbin/$sysctl 2>/dev/null || echo unknown)`
+       case "${UNAME_MACHINE_ARCH}" in
+           armeb) machine=armeb-unknown ;;
+           arm*) machine=arm-unknown ;;
+           sh3el) machine=shl-unknown ;;
+           sh3eb) machine=sh-unknown ;;
+           *) machine=${UNAME_MACHINE_ARCH}-unknown ;;
        esac
        # The Operating System including object format, if it has switched
        # to ELF recently, or will in the future.
-       case "${UNAME_MACHINE}" in
-           i386|sparc|amiga|arm*|hp300|mvme68k|vax|atari|luna68k|mac68k|news68k|next68k|pc532|sun3*|x68k)
+       case "${UNAME_MACHINE_ARCH}" in
+           arm*|i386|m68k|ns32k|sh3*|sparc|vax)
                eval $set_cc_for_build
                if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
                        | grep __ELF__ >/dev/null
@@ -166,75 +180,112 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
                ;;
        esac
        # The OS release
-       release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
+       # Debian GNU/NetBSD machines have a different userland, and
+       # thus, need a distinct triplet. However, they do not need
+       # kernel version information, so it can be replaced with a
+       # suitable tag, in the style of linux-gnu.
+       case "${UNAME_VERSION}" in
+           Debian*)
+               release='-gnu'
+               ;;
+           *)
+               release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
+               ;;
+       esac
        # Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM:
        # contains redundant information, the shorter form:
        # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
        echo "${machine}-${os}${release}"
        exit 0 ;;
+    amiga:OpenBSD:*:*)
+       echo m68k-unknown-openbsd${UNAME_RELEASE}
+       exit 0 ;;
+    arc:OpenBSD:*:*)
+       echo mipsel-unknown-openbsd${UNAME_RELEASE}
+       exit 0 ;;
+    hp300:OpenBSD:*:*)
+       echo m68k-unknown-openbsd${UNAME_RELEASE}
+       exit 0 ;;
+    mac68k:OpenBSD:*:*)
+       echo m68k-unknown-openbsd${UNAME_RELEASE}
+       exit 0 ;;
+    macppc:OpenBSD:*:*)
+       echo powerpc-unknown-openbsd${UNAME_RELEASE}
+       exit 0 ;;
+    mvme68k:OpenBSD:*:*)
+       echo m68k-unknown-openbsd${UNAME_RELEASE}
+       exit 0 ;;
+    mvme88k:OpenBSD:*:*)
+       echo m88k-unknown-openbsd${UNAME_RELEASE}
+       exit 0 ;;
+    mvmeppc:OpenBSD:*:*)
+       echo powerpc-unknown-openbsd${UNAME_RELEASE}
+       exit 0 ;;
+    pmax:OpenBSD:*:*)
+       echo mipsel-unknown-openbsd${UNAME_RELEASE}
+       exit 0 ;;
+    sgi:OpenBSD:*:*)
+       echo mipseb-unknown-openbsd${UNAME_RELEASE}
+       exit 0 ;;
+    sun3:OpenBSD:*:*)
+       echo m68k-unknown-openbsd${UNAME_RELEASE}
+       exit 0 ;;
+    wgrisc:OpenBSD:*:*)
+       echo mipsel-unknown-openbsd${UNAME_RELEASE}
+       exit 0 ;;
+    *:OpenBSD:*:*)
+       echo ${UNAME_MACHINE}-unknown-openbsd${UNAME_RELEASE}
+       exit 0 ;;
     alpha:OSF1:*:*)
        if test $UNAME_RELEASE = "V4.0"; then
                UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
        fi
+       # According to Compaq, /usr/sbin/psrinfo has been available on
+       # OSF/1 and Tru64 systems produced since 1995.  I hope that
+       # covers most systems running today.  This code pipes the CPU
+       # types through head -n 1, so we only detect the type of CPU 0.
+       ALPHA_CPU_TYPE=`/usr/sbin/psrinfo -v | sed -n -e 's/^  The alpha \(.*\) processor.*$/\1/p' | head -n 1`
+       case "$ALPHA_CPU_TYPE" in
+           "EV4 (21064)")
+               UNAME_MACHINE="alpha" ;;
+           "EV4.5 (21064)")
+               UNAME_MACHINE="alpha" ;;
+           "LCA4 (21066/21068)")
+               UNAME_MACHINE="alpha" ;;
+           "EV5 (21164)")
+               UNAME_MACHINE="alphaev5" ;;
+           "EV5.6 (21164A)")
+               UNAME_MACHINE="alphaev56" ;;
+           "EV5.6 (21164PC)")
+               UNAME_MACHINE="alphapca56" ;;
+           "EV5.7 (21164PC)")
+               UNAME_MACHINE="alphapca57" ;;
+           "EV6 (21264)")
+               UNAME_MACHINE="alphaev6" ;;
+           "EV6.7 (21264A)")
+               UNAME_MACHINE="alphaev67" ;;
+           "EV6.8CB (21264C)")
+               UNAME_MACHINE="alphaev68" ;;
+           "EV6.8AL (21264B)")
+               UNAME_MACHINE="alphaev68" ;;
+           "EV6.8CX (21264D)")
+               UNAME_MACHINE="alphaev68" ;;
+           "EV6.9A (21264/EV69A)")
+               UNAME_MACHINE="alphaev69" ;;
+           "EV7 (21364)")
+               UNAME_MACHINE="alphaev7" ;;
+           "EV7.9 (21364A)")
+               UNAME_MACHINE="alphaev79" ;;
+       esac
        # A Vn.n version is a released version.
        # A Tn.n version is a released field test version.
        # A Xn.n version is an unreleased experimental baselevel.
        # 1.2 uses "1.2" for uname -r.
-       cat <<EOF >$dummy.s
-       .data
-\$Lformat:
-       .byte 37,100,45,37,120,10,0     # "%d-%x\n"
-
-       .text
-       .globl main
-       .align 4
-       .ent main
-main:
-       .frame \$30,16,\$26,0
-       ldgp \$29,0(\$27)
-       .prologue 1
-       .long 0x47e03d80 # implver \$0
-       lda \$2,-1
-       .long 0x47e20c21 # amask \$2,\$1
-       lda \$16,\$Lformat
-       mov \$0,\$17
-       not \$1,\$18
-       jsr \$26,printf
-       ldgp \$29,0(\$26)
-       mov 0,\$16
-       jsr \$26,exit
-       .end main
-EOF
-       eval $set_cc_for_build
-       $CC_FOR_BUILD $dummy.s -o $dummy 2>/dev/null
-       if test "$?" = 0 ; then
-               case `./$dummy` in
-                       0-0)
-                               UNAME_MACHINE="alpha"
-                               ;;
-                       1-0)
-                               UNAME_MACHINE="alphaev5"
-                               ;;
-                       1-1)
-                               UNAME_MACHINE="alphaev56"
-                               ;;
-                       1-101)
-                               UNAME_MACHINE="alphapca56"
-                               ;;
-                       2-303)
-                               UNAME_MACHINE="alphaev6"
-                               ;;
-                       2-307)
-                               UNAME_MACHINE="alphaev67"
-                               ;;
-                       2-1307)
-                               UNAME_MACHINE="alphaev68"
-                               ;;
-               esac
-       fi
-       rm -f $dummy.s $dummy
        echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[VTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
        exit 0 ;;
+    Alpha*:OpenVMS:*:*)
+       echo alpha-hp-vms
+       exit 0 ;;
     Alpha\ *:Windows_NT*:*)
        # How do we know it's Interix rather than the generic POSIX subsystem?
        # Should we change UNAME_MACHINE based on the output of uname instead
@@ -247,29 +298,11 @@ EOF
     Amiga*:UNIX_System_V:4.0:*)
        echo m68k-unknown-sysv4
        exit 0;;
-    amiga:OpenBSD:*:*)
-       echo m68k-unknown-openbsd${UNAME_RELEASE}
-       exit 0 ;;
     *:[Aa]miga[Oo][Ss]:*:*)
        echo ${UNAME_MACHINE}-unknown-amigaos
        exit 0 ;;
-    arc64:OpenBSD:*:*)
-       echo mips64el-unknown-openbsd${UNAME_RELEASE}
-       exit 0 ;;
-    arc:OpenBSD:*:*)
-       echo mipsel-unknown-openbsd${UNAME_RELEASE}
-       exit 0 ;;
-    hkmips:OpenBSD:*:*)
-       echo mips-unknown-openbsd${UNAME_RELEASE}
-       exit 0 ;;
-    pmax:OpenBSD:*:*)
-       echo mipsel-unknown-openbsd${UNAME_RELEASE}
-       exit 0 ;;
-    sgi:OpenBSD:*:*)
-       echo mips-unknown-openbsd${UNAME_RELEASE}
-       exit 0 ;;
-    wgrisc:OpenBSD:*:*)
-       echo mipsel-unknown-openbsd${UNAME_RELEASE}
+    *:[Mm]orph[Oo][Ss]:*:*)
+       echo ${UNAME_MACHINE}-unknown-morphos
        exit 0 ;;
     *:OS/390:*:*)
        echo i370-ibm-openedition
@@ -291,6 +324,13 @@ EOF
     NILE*:*:*:dcosx)
        echo pyramid-pyramid-svr4
        exit 0 ;;
+    DRS?6000:unix:4.0:6*)
+       echo sparc-icl-nx6
+       exit 0 ;;
+    DRS?6000:UNIX_SV:4.2*:7*)
+       case `/usr/bin/uname -p` in
+           sparc) echo sparc-icl-nx7 && exit 0 ;;
+       esac ;;
     sun4H:SunOS:5.*:*)
        echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
        exit 0 ;;
@@ -319,7 +359,7 @@ EOF
        echo m68k-sun-sunos${UNAME_RELEASE}
        exit 0 ;;
     sun*:*:4.2BSD:*)
-       UNAME_RELEASE=`(head -1 /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null`
+       UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null`
        test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3
        case "`/bin/arch`" in
            sun3)
@@ -333,12 +373,6 @@ EOF
     aushp:SunOS:*:*)
        echo sparc-auspex-sunos${UNAME_RELEASE}
        exit 0 ;;
-    sparc*:NetBSD:*)
-       echo `uname -p`-unknown-netbsd${UNAME_RELEASE}
-       exit 0 ;;
-    atari*:OpenBSD:*:*)
-       echo m68k-unknown-openbsd${UNAME_RELEASE}
-       exit 0 ;;
     # The situation for MiNT is a little confusing.  The machine name
     # can be virtually everything (everything which is not
     # "atarist" or "atariste" at least should have a processor
@@ -365,18 +399,6 @@ EOF
     *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
         echo m68k-unknown-mint${UNAME_RELEASE}
         exit 0 ;;
-    sun3*:OpenBSD:*:*)
-       echo m68k-unknown-openbsd${UNAME_RELEASE}
-       exit 0 ;;
-    mac68k:OpenBSD:*:*)
-       echo m68k-unknown-openbsd${UNAME_RELEASE}
-       exit 0 ;;
-    mvme68k:OpenBSD:*:*)
-       echo m68k-unknown-openbsd${UNAME_RELEASE}
-       exit 0 ;;
-    mvme88k:OpenBSD:*:*)
-       echo m88k-unknown-openbsd${UNAME_RELEASE}
-       exit 0 ;;
     powerpc:machten:*:*)
        echo powerpc-apple-machten${UNAME_RELEASE}
        exit 0 ;;
@@ -393,6 +415,7 @@ EOF
        echo clipper-intergraph-clix${UNAME_RELEASE}
        exit 0 ;;
     mips:*:*:UMIPS | mips:*:*:RISCos)
+       eval $set_cc_for_build
        sed 's/^        //' << EOF >$dummy.c
 #ifdef __cplusplus
 #include <stdio.h>  /* for printf() prototype */
@@ -414,16 +437,20 @@ EOF
          exit (-1);
        }
 EOF
-       eval $set_cc_for_build
-       $CC_FOR_BUILD $dummy.c -o $dummy \
-         && ./$dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \
-         && rm -f $dummy.c $dummy && exit 0
-       rm -f $dummy.c $dummy
+       $CC_FOR_BUILD -o $dummy $dummy.c \
+         && $dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \
+         && exit 0
        echo mips-mips-riscos${UNAME_RELEASE}
        exit 0 ;;
     Motorola:PowerMAX_OS:*:*)
        echo powerpc-motorola-powermax
        exit 0 ;;
+    Motorola:*:4.3:PL8-*)
+       echo powerpc-harris-powermax
+       exit 0 ;;
+    Night_Hawk:*:*:PowerMAX_OS | Synergy:PowerMAX_OS:*:*)
+       echo powerpc-harris-powermax
+       exit 0 ;;
     Night_Hawk:Power_UNIX:*:*)
        echo powerpc-harris-powerunix
        exit 0 ;;
@@ -484,6 +511,7 @@ EOF
        exit 0 ;;
     *:AIX:2:3)
        if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then
+               eval $set_cc_for_build
                sed 's/^                //' << EOF >$dummy.c
                #include <sys/systemcfg.h>
 
@@ -495,9 +523,7 @@ EOF
                        exit(0);
                        }
 EOF
-               eval $set_cc_for_build
-               $CC_FOR_BUILD $dummy.c -o $dummy && ./$dummy && rm -f $dummy.c $dummy && exit 0
-               rm -f $dummy.c $dummy
+               $CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0
                echo rs6000-ibm-aix3.2.5
        elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then
                echo rs6000-ibm-aix3.2.4
@@ -506,7 +532,7 @@ EOF
        fi
        exit 0 ;;
     *:AIX:*:[45])
-       IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | head -1 | awk '{ print $1 }'`
+       IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
        if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
                IBM_ARCH=rs6000
        else
@@ -546,10 +572,8 @@ EOF
            9000/31? )            HP_ARCH=m68000 ;;
            9000/[34]?? )         HP_ARCH=m68k ;;
            9000/[678][0-9][0-9])
-              case "${HPUX_REV}" in
-                11.[0-9][0-9])
-                  if [ -x /usr/bin/getconf ]; then
-                    sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`
+               if [ -x /usr/bin/getconf ]; then
+                   sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`
                     sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
                     case "${sc_cpu_version}" in
                       523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
@@ -558,12 +582,13 @@ EOF
                         case "${sc_kernel_bits}" in
                           32) HP_ARCH="hppa2.0n" ;;
                           64) HP_ARCH="hppa2.0w" ;;
+                         '') HP_ARCH="hppa2.0" ;;   # HP-UX 10.20
                         esac ;;
                     esac
-                  fi ;;
-              esac
-              if [ "${HP_ARCH}" = "" ]; then
-              sed 's/^              //' << EOF >$dummy.c
+               fi
+               if [ "${HP_ARCH}" = "" ]; then
+                   eval $set_cc_for_build
+                   sed 's/^              //' << EOF >$dummy.c
 
               #define _HPUX_SOURCE
               #include <stdlib.h>
@@ -596,12 +621,21 @@ EOF
                   exit (0);
               }
 EOF
-       eval $set_cc_for_build
-       (CCOPTS= $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null ) && HP_ARCH=`./$dummy`
-       if test -z "$HP_ARCH"; then HP_ARCH=hppa; fi
-       rm -f $dummy.c $dummy
-       fi ;;
+                   (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy`
+                   test -z "$HP_ARCH" && HP_ARCH=hppa
+               fi ;;
        esac
+       if [ ${HP_ARCH} = "hppa2.0w" ]
+       then
+           # avoid double evaluation of $set_cc_for_build
+           test -n "$CC_FOR_BUILD" || eval $set_cc_for_build
+           if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E -) | grep __LP64__ >/dev/null
+           then
+               HP_ARCH="hppa2.0w"
+           else
+               HP_ARCH="hppa64"
+           fi
+       fi
        echo ${HP_ARCH}-hp-hpux${HPUX_REV}
        exit 0 ;;
     ia64:HP-UX:*:*)
@@ -609,6 +643,7 @@ EOF
        echo ia64-hp-hpux${HPUX_REV}
        exit 0 ;;
     3050*:HI-UX:*:*)
+       eval $set_cc_for_build
        sed 's/^        //' << EOF >$dummy.c
        #include <unistd.h>
        int
@@ -634,9 +669,7 @@ EOF
          exit (0);
        }
 EOF
-       eval $set_cc_for_build
-       $CC_FOR_BUILD $dummy.c -o $dummy && ./$dummy && rm -f $dummy.c $dummy && exit 0
-       rm -f $dummy.c $dummy
+       $CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0
        echo unknown-hitachi-hiuxwe2
        exit 0 ;;
     9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* )
@@ -664,9 +697,6 @@ EOF
     parisc*:Lites*:*:*)
        echo hppa1.1-hp-lites
        exit 0 ;;
-    hppa*:OpenBSD:*:*)
-       echo hppa-unknown-openbsd
-       exit 0 ;;
     C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*)
        echo c1-convex-bsd
         exit 0 ;;
@@ -685,9 +715,6 @@ EOF
     C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*)
        echo c4-convex-bsd
         exit 0 ;;
-    CRAY*X-MP:*:*:*)
-       echo xmp-cray-unicos
-        exit 0 ;;
     CRAY*Y-MP:*:*:*)
        echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
        exit 0 ;;
@@ -700,27 +727,21 @@ EOF
     CRAY*TS:*:*:*)
        echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
        exit 0 ;;
-    CRAY*T3D:*:*:*)
-       echo alpha-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-       exit 0 ;;
     CRAY*T3E:*:*:*)
        echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
        exit 0 ;;
     CRAY*SV1:*:*:*)
        echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
        exit 0 ;;
-    CRAY-2:*:*:*)
-       echo cray2-cray-unicos
-        exit 0 ;;
+    *:UNICOS/mp:*:*)
+       echo nv1-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
+       exit 0 ;;
     F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
        FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
         FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
         FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
         echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
         exit 0 ;;
-    hp300:OpenBSD:*:*)
-       echo m68k-unknown-openbsd${UNAME_RELEASE}
-       exit 0 ;;
     i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
        echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
        exit 0 ;;
@@ -730,11 +751,22 @@ EOF
     *:BSD/OS:*:*)
        echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
        exit 0 ;;
-    *:FreeBSD:*:*)
-       echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
-       exit 0 ;;
-    *:OpenBSD:*:*)
-       echo ${UNAME_MACHINE}-unknown-openbsd`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
+    *:FreeBSD:*:*|*:GNU/FreeBSD:*:*)
+       # Determine whether the default compiler uses glibc.
+       eval $set_cc_for_build
+       sed 's/^        //' << EOF >$dummy.c
+       #include <features.h>
+       #if __GLIBC__ >= 2
+       LIBC=gnu
+       #else
+       LIBC=
+       #endif
+EOF
+       eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=`
+       # GNU/FreeBSD systems have a "k" prefix to indicate we are using
+       # FreeBSD's kernel, but not the complete OS.
+       case ${LIBC} in gnu) kernel_only='k' ;; esac
+       echo ${UNAME_MACHINE}-unknown-${kernel_only}freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`${LIBC:+-$LIBC}
        exit 0 ;;
     i*:CYGWIN*:*)
        echo ${UNAME_MACHINE}-pc-cygwin
@@ -745,11 +777,17 @@ EOF
     i*:PW*:*)
        echo ${UNAME_MACHINE}-pc-pw32
        exit 0 ;;
+    x86:Interix*:[34]*)
+       echo i586-pc-interix${UNAME_RELEASE}|sed -e 's/\..*//'
+       exit 0 ;;
+    [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
+       echo i${UNAME_MACHINE}-pc-mks
+       exit 0 ;;
     i*:Windows_NT*:* | Pentium*:Windows_NT*:*)
        # How do we know it's Interix rather than the generic POSIX subsystem?
        # It also conflicts with pre-2.0 versions of AT&T UWIN. Should we
        # UNAME_MACHINE based on the output of uname instead of i386?
-       echo i386-pc-interix
+       echo i586-pc-interix
        exit 0 ;;
     i*:UWIN*:*)
        echo ${UNAME_MACHINE}-pc-uwin
@@ -769,17 +807,52 @@ EOF
     arm*:Linux:*:*)
        echo ${UNAME_MACHINE}-unknown-linux-gnu
        exit 0 ;;
+    cris:Linux:*:*)
+       echo cris-axis-linux-gnu
+       exit 0 ;;
     ia64:Linux:*:*)
-       echo ${UNAME_MACHINE}-unknown-linux
+       echo ${UNAME_MACHINE}-unknown-linux-gnu
        exit 0 ;;
     m68*:Linux:*:*)
        echo ${UNAME_MACHINE}-unknown-linux-gnu
        exit 0 ;;
     mips:Linux:*:*)
-       case `sed -n '/^byte/s/^.*: \(.*\) endian/\1/p' < /proc/cpuinfo` in
-         big)    echo mips-unknown-linux-gnu && exit 0 ;;
-         little) echo mipsel-unknown-linux-gnu && exit 0 ;;
-       esac
+       eval $set_cc_for_build
+       sed 's/^        //' << EOF >$dummy.c
+       #undef CPU
+       #undef mips
+       #undef mipsel
+       #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
+       CPU=mipsel
+       #else
+       #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
+       CPU=mips
+       #else
+       CPU=
+       #endif
+       #endif
+EOF
+       eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
+       test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0
+       ;;
+    mips64:Linux:*:*)
+       eval $set_cc_for_build
+       sed 's/^        //' << EOF >$dummy.c
+       #undef CPU
+       #undef mips64
+       #undef mips64el
+       #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
+       CPU=mips64el
+       #else
+       #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
+       CPU=mips64
+       #else
+       CPU=
+       #endif
+       #endif
+EOF
+       eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
+       test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0
        ;;
     ppc:Linux:*:*)
        echo powerpc-unknown-linux-gnu
@@ -815,6 +888,9 @@ EOF
     s390:Linux:*:* | s390x:Linux:*:*)
        echo ${UNAME_MACHINE}-ibm-linux
        exit 0 ;;
+    sh64*:Linux:*:*)
+       echo ${UNAME_MACHINE}-unknown-linux-gnu
+       exit 0 ;;
     sh*:Linux:*:*)
        echo ${UNAME_MACHINE}-unknown-linux-gnu
        exit 0 ;;
@@ -828,7 +904,8 @@ EOF
        # The BFD linker knows what the default object file format is, so
        # first see if it will tell us. cd to the root directory to prevent
        # problems with other programs or directories called `ld' in the path.
-       ld_supported_targets=`cd /; ld --help 2>&1 \
+       # Set LC_ALL=C to ensure ld outputs messages in English.
+       ld_supported_targets=`cd /; LC_ALL=C ld --help 2>&1 \
                         | sed -ne '/supported targets:/!d
                                    s/[         ][      ]*/ /g
                                    s/.*supported targets: *//
@@ -840,7 +917,7 @@ EOF
                ;;
          a.out-i386-linux)
                echo "${UNAME_MACHINE}-pc-linux-gnuaout"
-               exit 0 ;;               
+               exit 0 ;;
          coff-i386)
                echo "${UNAME_MACHINE}-pc-linux-gnucoff"
                exit 0 ;;
@@ -851,33 +928,32 @@ EOF
                exit 0 ;;
        esac
        # Determine whether the default compiler is a.out or elf
-       cat >$dummy.c <<EOF
-#include <features.h>
-#ifdef __cplusplus
-#include <stdio.h>  /* for printf() prototype */
-       int main (int argc, char *argv[]) {
-#else
-       int main (argc, argv) int argc; char *argv[]; {
-#endif
-#ifdef __ELF__
-# ifdef __GLIBC__
-#  if __GLIBC__ >= 2
-    printf ("%s-pc-linux-gnu\n", argv[1]);
-#  else
-    printf ("%s-pc-linux-gnulibc1\n", argv[1]);
-#  endif
-# else
-   printf ("%s-pc-linux-gnulibc1\n", argv[1]);
-# endif
-#else
-  printf ("%s-pc-linux-gnuaout\n", argv[1]);
-#endif
-  return 0;
-}
-EOF
        eval $set_cc_for_build
-       $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null && ./$dummy "${UNAME_MACHINE}" && rm -f $dummy.c $dummy && exit 0
-       rm -f $dummy.c $dummy
+       sed 's/^        //' << EOF >$dummy.c
+       #include <features.h>
+       #ifdef __ELF__
+       # ifdef __GLIBC__
+       #  if __GLIBC__ >= 2
+       LIBC=gnu
+       #  else
+       LIBC=gnulibc1
+       #  endif
+       # else
+       LIBC=gnulibc1
+       # endif
+       #else
+       #ifdef __INTEL_COMPILER
+       LIBC=gnu
+       #else
+       LIBC=gnuaout
+       #endif
+       #endif
+       #ifdef __dietlibc__
+       LIBC=dietlibc
+       #endif
+EOF
+       eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=`
+       test x"${LIBC}" != x && echo "${UNAME_MACHINE}-pc-linux-${LIBC}" && exit 0
        test x"${TENTATIVE}" != x && echo "${TENTATIVE}" && exit 0
        ;;
     i*86:DYNIX/ptx:4*:*)
@@ -894,6 +970,23 @@ EOF
         # Use sysv4.2uw... so that sysv4* matches it.
        echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
        exit 0 ;;
+    i*86:OS/2:*:*)
+       # If we were able to find `uname', then EMX Unix compatibility
+       # is probably installed.
+       echo ${UNAME_MACHINE}-pc-os2-emx
+       exit 0 ;;
+    i*86:XTS-300:*:STOP)
+       echo ${UNAME_MACHINE}-unknown-stop
+       exit 0 ;;
+    i*86:atheos:*:*)
+       echo ${UNAME_MACHINE}-unknown-atheos
+       exit 0 ;;
+    i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*)
+       echo i386-unknown-lynxos${UNAME_RELEASE}
+       exit 0 ;;
+    i*86:*DOS:*:*)
+       echo ${UNAME_MACHINE}-pc-msdosdjgpp
+       exit 0 ;;
     i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*)
        UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'`
        if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then
@@ -915,22 +1008,19 @@ EOF
                UNAME_REL=`sed -n 's/.*Version //p' </usr/options/cb.name`
                echo ${UNAME_MACHINE}-pc-isc$UNAME_REL
        elif /bin/uname -X 2>/dev/null >/dev/null ; then
-               UNAME_REL=`(/bin/uname -X|egrep Release|sed -e 's/.*= //')`
-               (/bin/uname -X|egrep i80486 >/dev/null) && UNAME_MACHINE=i486
-               (/bin/uname -X|egrep '^Machine.*Pentium' >/dev/null) \
+               UNAME_REL=`(/bin/uname -X|grep Release|sed -e 's/.*= //')`
+               (/bin/uname -X|grep i80486 >/dev/null) && UNAME_MACHINE=i486
+               (/bin/uname -X|grep '^Machine.*Pentium' >/dev/null) \
                        && UNAME_MACHINE=i586
-               (/bin/uname -X|egrep '^Machine.*Pent ?II' >/dev/null) \
+               (/bin/uname -X|grep '^Machine.*Pent *II' >/dev/null) \
                        && UNAME_MACHINE=i686
-               (/bin/uname -X|egrep '^Machine.*Pentium Pro' >/dev/null) \
+               (/bin/uname -X|grep '^Machine.*Pentium Pro' >/dev/null) \
                        && UNAME_MACHINE=i686
                echo ${UNAME_MACHINE}-pc-sco$UNAME_REL
        else
                echo ${UNAME_MACHINE}-pc-sysv32
        fi
        exit 0 ;;
-    i*86:*DOS:*:*)
-       echo ${UNAME_MACHINE}-pc-msdosdjgpp
-       exit 0 ;;
     pc:*:*:*)
        # Left here for compatibility:
         # uname -m prints for DJGPP always 'pc', but it prints nothing about
@@ -954,9 +1044,15 @@ EOF
        # "miniframe"
        echo m68010-convergent-sysv
        exit 0 ;;
+    mc68k:UNIX:SYSTEM5:3.51m)
+       echo m68k-convergent-sysv
+       exit 0 ;;
+    M680?0:D-NIX:5.3:*)
+       echo m68k-diab-dnix
+       exit 0 ;;
     M68*:*:R3V[567]*:*)
        test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;;
-    3[34]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 4850:*:4.0:3.0)
+    3[34]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0)
        OS_REL=''
        test -r /etc/.relid \
        && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
@@ -973,9 +1069,6 @@ EOF
     mc68030:UNIX_System_V:4.*:*)
        echo m68k-atari-sysv4
        exit 0 ;;
-    i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*)
-       echo i386-unknown-lynxos${UNAME_RELEASE}
-       exit 0 ;;
     TSUNAMI:LynxOS:2.*:*)
        echo sparc-unknown-lynxos${UNAME_RELEASE}
        exit 0 ;;
@@ -1047,6 +1140,9 @@ EOF
     SX-5:SUPER-UX:*:*)
        echo sx5-nec-superux${UNAME_RELEASE}
        exit 0 ;;
+    SX-6:SUPER-UX:*:*)
+       echo sx6-nec-superux${UNAME_RELEASE}
+       exit 0 ;;
     Power*:Rhapsody:*:*)
        echo powerpc-apple-rhapsody${UNAME_RELEASE}
        exit 0 ;;
@@ -1054,18 +1150,24 @@ EOF
        echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE}
        exit 0 ;;
     *:Darwin:*:*)
-       echo `uname -p`-apple-darwin${UNAME_RELEASE}
+       case `uname -p` in
+           *86) UNAME_PROCESSOR=i686 ;;
+           powerpc) UNAME_PROCESSOR=powerpc ;;
+       esac
+       echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
        exit 0 ;;
     *:procnto*:*:* | *:QNX:[0123456789]*:*)
-       if test "${UNAME_MACHINE}" = "x86pc"; then
+       UNAME_PROCESSOR=`uname -p`
+       if test "$UNAME_PROCESSOR" = "x86"; then
+               UNAME_PROCESSOR=i386
                UNAME_MACHINE=pc
        fi
-       echo `uname -p`-${UNAME_MACHINE}-nto-qnx
+       echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE}
        exit 0 ;;
     *:QNX:*:4*)
        echo i386-pc-qnx
        exit 0 ;;
-    NSR-[KW]:NONSTOP_KERNEL:*:*)
+    NSR-[DGKLNPTVWY]:NONSTOP_KERNEL:*:*)
        echo nsr-tandem-nsk${UNAME_RELEASE}
        exit 0 ;;
     *:NonStop-UX:*:*)
@@ -1088,11 +1190,6 @@ EOF
        fi
        echo ${UNAME_MACHINE}-unknown-plan9
        exit 0 ;;
-    i*86:OS/2:*:*)
-       # If we were able to find `uname', then EMX Unix compatibility
-       # is probably installed.
-       echo ${UNAME_MACHINE}-pc-os2-emx
-       exit 0 ;;
     *:TOPS-10:*:*)
        echo pdp10-unknown-tops10
        exit 0 ;;
@@ -1111,14 +1208,15 @@ EOF
     *:ITS:*:*)
        echo pdp10-unknown-its
        exit 0 ;;
-    i*86:XTS-300:*:STOP)
-       echo ${UNAME_MACHINE}-unknown-stop
+    SEI:*:*:SEIUX)
+        echo mips-sei-seiux${UNAME_RELEASE}
        exit 0 ;;
 esac
 
 #echo '(No uname command or uname output not recognized.)' 1>&2
 #echo "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" 1>&2
 
+eval $set_cc_for_build
 cat >$dummy.c <<EOF
 #ifdef _SEQUENT_
 # include <sys/types.h>
@@ -1233,9 +1331,7 @@ main ()
 }
 EOF
 
-eval $set_cc_for_build
-$CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null && ./$dummy && rm -f $dummy.c $dummy && exit 0
-rm -f $dummy.c $dummy
+$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && $dummy && exit 0
 
 # Apollos put the system type in the environment.
 
index 12ebc7875a338e7bd8966295ac129848d96f8dce..1f31816b97a13e14c63f276bea226a8dde6887b5 100755 (executable)
@@ -1,9 +1,9 @@
 #! /bin/sh
 # Configuration validation subroutine script.
-#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
-#   Free Software Foundation, Inc.
+#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
+#   2000, 2001, 2002, 2003 Free Software Foundation, Inc.
 
-timestamp='2001-08-13'
+timestamp='2003-08-18'
 
 # This file is (in principle) common to ALL GNU software.
 # The presence of a machine in this file suggests that SOME GNU software
@@ -29,7 +29,8 @@ timestamp='2001-08-13'
 # configuration script generated by Autoconf, you may include it under
 # the same distribution terms that you use for the rest of that program.
 
-# Please send patches to <config-patches@gnu.org>.
+# Please send patches to <config-patches@gnu.org>.  Submit a context
+# diff and a properly formatted ChangeLog entry.
 #
 # Configuration subroutine to validate and canonicalize a configuration type.
 # Supply the specified configuration type as an argument.
@@ -117,7 +118,7 @@ esac
 # Here we must recognize all the valid KERNEL-OS combinations.
 maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
 case $maybe_os in
-  nto-qnx* | linux-gnu* | storm-chaos* | os2-emx* | windows32-*)
+  nto-qnx* | linux-gnu* | linux-dietlibc | kfreebsd*-gnu* | netbsd*-gnu* | storm-chaos* | os2-emx* | rtmk-nova*)
     os=-$maybe_os
     basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
     ;;
@@ -226,31 +227,46 @@ case $basic_machine in
        1750a | 580 \
        | a29k \
        | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
+       | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
+       | am33_2.0 \
        | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \
        | c4x | clipper \
-       | d10v | d30v | dsp16xx \
-       | fr30 \
+       | d10v | d30v | dlx | dsp16xx \
+       | fr30 | frv \
        | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
        | i370 | i860 | i960 | ia64 \
+       | ip2k | iq2000 \
        | m32r | m68000 | m68k | m88k | mcore \
-       | mips16 | mips64 | mips64el | mips64orion | mips64orionel \
-       | mips64vr4100 | mips64vr4100el | mips64vr4300 \
-       | mips64vr4300el | mips64vr5000 | mips64vr5000el \
-       | mipsbe | mipsel | mipsle | mipstx39 | mipstx39el \
+       | mips | mipsbe | mipseb | mipsel | mipsle \
+       | mips16 \
+       | mips64 | mips64el \
+       | mips64vr | mips64vrel \
+       | mips64orion | mips64orionel \
+       | mips64vr4100 | mips64vr4100el \
+       | mips64vr4300 | mips64vr4300el \
+       | mips64vr5000 | mips64vr5000el \
+       | mipsisa32 | mipsisa32el \
+       | mipsisa32r2 | mipsisa32r2el \
+       | mipsisa64 | mipsisa64el \
+       | mipsisa64r2 | mipsisa64r2el \
+       | mipsisa64sb1 | mipsisa64sb1el \
+       | mipsisa64sr71k | mipsisa64sr71kel \
+       | mipstx39 | mipstx39el \
        | mn10200 | mn10300 \
+       | msp430 \
        | ns16k | ns32k \
-       | openrisc \
+       | openrisc | or32 \
        | pdp10 | pdp11 | pj | pjl \
        | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
        | pyramid \
-       | s390 | s390x \
-       | sh | sh[34] | sh[34]eb | shbe | shle \
-       | sparc | sparc64 | sparclet | sparclite | sparcv9 | sparcv9b \
+       | sh | sh[1234] | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \
+       | sh64 | sh64le \
+       | sparc | sparc64 | sparc86x | sparclet | sparclite | sparcv9 | sparcv9b \
        | strongarm \
-       | tahoe | thumb | tic80 | tron \
-       | v850 \
+       | tahoe | thumb | tic4x | tic80 | tron \
+       | v850 | v850e \
        | we32k \
-       | x86 | xscale \
+       | x86 | xscale | xstormy16 | xtensa \
        | z8k)
                basic_machine=$basic_machine-unknown
                ;;
@@ -277,38 +293,56 @@ case $basic_machine in
        580-* \
        | a29k-* \
        | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
-       | alphapca5[67]-* | arc-* \
-       | arm-*  | armbe-* | armle-* | armv*-* \
+       | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
+       | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
+       | arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
+       | avr-* \
        | bs2000-* \
-       | c[123]* | c30-* | [cjt]90-* | c54x-* \
-       | clipper-* | cray2-* | cydra-* \
-       | d10v-* | d30v-* \
+       | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \
+       | clipper-* | cydra-* \
+       | d10v-* | d30v-* | dlx-* \
        | elxsi-* \
-       | f30[01]-* | f700-* | fr30-* | fx80-* \
+       | f30[01]-* | f700-* | fr30-* | frv-* | fx80-* \
        | h8300-* | h8500-* \
        | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
        | i*86-* | i860-* | i960-* | ia64-* \
+       | ip2k-* | iq2000-* \
        | m32r-* \
-       | m68000-* | m680[01234]0-* | m68360-* | m683?2-* | m68k-* \
+       | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
        | m88110-* | m88k-* | mcore-* \
-       | mips-* | mips16-* | mips64-* | mips64el-* | mips64orion-* \
-       | mips64orionel-* | mips64vr4100-* | mips64vr4100el-* \
-       | mips64vr4300-* | mips64vr4300el-* | mipsbe-* | mipsel-* \
-       | mipsle-* | mipstx39-* | mipstx39el-* \
-       | none-* | np1-* | ns16k-* | ns32k-* \
+       | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
+       | mips16-* \
+       | mips64-* | mips64el-* \
+       | mips64vr-* | mips64vrel-* \
+       | mips64orion-* | mips64orionel-* \
+       | mips64vr4100-* | mips64vr4100el-* \
+       | mips64vr4300-* | mips64vr4300el-* \
+       | mips64vr5000-* | mips64vr5000el-* \
+       | mipsisa32-* | mipsisa32el-* \
+       | mipsisa32r2-* | mipsisa32r2el-* \
+       | mipsisa64-* | mipsisa64el-* \
+       | mipsisa64r2-* | mipsisa64r2el-* \
+       | mipsisa64sb1-* | mipsisa64sb1el-* \
+       | mipsisa64sr71k-* | mipsisa64sr71kel-* \
+       | mipstx39-* | mipstx39el-* \
+       | msp430-* \
+       | none-* | np1-* | nv1-* | ns16k-* | ns32k-* \
        | orion-* \
        | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
        | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
        | pyramid-* \
        | romp-* | rs6000-* \
-       | s390-* | s390x-* \
-       | sh-* | sh[34]-* | sh[34]eb-* | shbe-* | shle-* \
-       | sparc-* | sparc64-* | sparc86x-* | sparclite-* \
-       | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* \
-       | t3e-* | tahoe-* | thumb-* | tic30-* | tic54x-* | tic80-* | tron-* \
-       | v850-* | vax-* \
+       | sh-* | sh[1234]-* | sh[23]e-* | sh[34]eb-* | shbe-* \
+       | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
+       | sparc-* | sparc64-* | sparc86x-* | sparclet-* | sparclite-* \
+       | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \
+       | tahoe-* | thumb-* \
+       | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
+       | tron-* \
+       | v850-* | v850e-* | vax-* \
        | we32k-* \
-       | x86-* | x86_64-* | xmp-* | xps100-* | xscale-* \
+       | x86-* | x86_64-* | xps100-* | xscale-* | xstormy16-* \
+       | xtensa-* \
        | ymp-* \
        | z8k-*)
                ;;
@@ -342,6 +376,9 @@ case $basic_machine in
                basic_machine=a29k-none
                os=-bsd
                ;;
+       amd64)
+               basic_machine=x86_64-pc
+               ;;
        amdahl)
                basic_machine=580-amdahl
                os=-sysv
@@ -373,6 +410,10 @@ case $basic_machine in
                basic_machine=ns32k-sequent
                os=-dynix
                ;;
+       c90)
+               basic_machine=c90-cray
+               os=-unicos
+               ;;
        convex-c1)
                basic_machine=c1-convex
                os=-bsd
@@ -393,16 +434,8 @@ case $basic_machine in
                basic_machine=c38-convex
                os=-bsd
                ;;
-       cray | ymp)
-               basic_machine=ymp-cray
-               os=-unicos
-               ;;
-       cray2)
-               basic_machine=cray2-cray
-               os=-unicos
-               ;;
-       [cjt]90)
-               basic_machine=${basic_machine}-cray
+       cray | j90)
+               basic_machine=j90-cray
                os=-unicos
                ;;
        crds | unos)
@@ -417,6 +450,14 @@ case $basic_machine in
        decstation | decstation-3100 | pmax | pmax-* | pmin | dec3100 | decstatn)
                basic_machine=mips-dec
                ;;
+       decsystem10* | dec10*)
+               basic_machine=pdp10-dec
+               os=-tops10
+               ;;
+       decsystem20* | dec20*)
+               basic_machine=pdp10-dec
+               os=-tops20
+               ;;
        delta | 3300 | motorola-3300 | motorola-delta \
              | 3300-motorola | delta-motorola)
                basic_machine=m68k-motorola
@@ -597,14 +638,6 @@ case $basic_machine in
                basic_machine=m68k-atari
                os=-mint
                ;;
-       mipsel*-linux*)
-               basic_machine=mipsel-unknown
-               os=-linux-gnu
-               ;;
-       mips*-linux*)
-               basic_machine=mips-unknown
-               os=-linux-gnu
-               ;;
        mips3*-*)
                basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`
                ;;
@@ -619,6 +652,10 @@ case $basic_machine in
                basic_machine=m68k-rom68k
                os=-coff
                ;;
+       morphos)
+               basic_machine=powerpc-unknown
+               os=-morphos
+               ;;
        msdos)
                basic_machine=i386-pc
                os=-msdos
@@ -691,6 +728,10 @@ case $basic_machine in
        np1)
                basic_machine=np1-gould
                ;;
+       nv1)
+               basic_machine=nv1-cray
+               os=-unicosmp
+               ;;
        nsr-tandem)
                basic_machine=nsr-tandem
                ;;
@@ -698,6 +739,10 @@ case $basic_machine in
                basic_machine=hppa1.1-oki
                os=-proelf
                ;;
+       or32 | or32-*)
+               basic_machine=or32-unknown
+               os=-coff
+               ;;
        OSE68000 | ose68000)
                basic_machine=m68000-ericsson
                os=-ose
@@ -720,49 +765,55 @@ case $basic_machine in
        pbb)
                basic_machine=m68k-tti
                ;;
-        pc532 | pc532-*)
+       pc532 | pc532-*)
                basic_machine=ns32k-pc532
                ;;
-       pentium | p5 | k5 | k6 | nexgen)
+       pentium | p5 | k5 | k6 | nexgen | viac3)
                basic_machine=i586-pc
                ;;
-       pentiumpro | p6 | 6x86 | athlon)
+       pentiumpro | p6 | 6x86 | athlon | athlon_*)
                basic_machine=i686-pc
                ;;
-       pentiumii | pentium2)
+       pentiumii | pentium2 | pentiumiii | pentium3)
                basic_machine=i686-pc
                ;;
-       pentium-* | p5-* | k5-* | k6-* | nexgen-*)
+       pentium4)
+               basic_machine=i786-pc
+               ;;
+       pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*)
                basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'`
                ;;
        pentiumpro-* | p6-* | 6x86-* | athlon-*)
                basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
                ;;
-       pentiumii-* | pentium2-*)
+       pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*)
                basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
                ;;
+       pentium4-*)
+               basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'`
+               ;;
        pn)
                basic_machine=pn-gould
                ;;
        power)  basic_machine=power-ibm
                ;;
        ppc)    basic_machine=powerpc-unknown
-               ;;
+               ;;
        ppc-*)  basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
                ;;
        ppcle | powerpclittle | ppc-le | powerpc-little)
                basic_machine=powerpcle-unknown
-               ;;
+               ;;
        ppcle-* | powerpclittle-*)
                basic_machine=powerpcle-`echo $basic_machine | sed 's/^[^-]*-//'`
                ;;
        ppc64)  basic_machine=powerpc64-unknown
-               ;;
+               ;;
        ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'`
                ;;
        ppc64le | powerpc64little | ppc64-le | powerpc64-little)
                basic_machine=powerpc64le-unknown
-               ;;
+               ;;
        ppc64le-* | powerpc64little-*)
                basic_machine=powerpc64le-`echo $basic_machine | sed 's/^[^-]*-//'`
                ;;
@@ -783,10 +834,26 @@ case $basic_machine in
        rtpc | rtpc-*)
                basic_machine=romp-ibm
                ;;
+       s390 | s390-*)
+               basic_machine=s390-ibm
+               ;;
+       s390x | s390x-*)
+               basic_machine=s390x-ibm
+               ;;
        sa29200)
                basic_machine=a29k-amd
                os=-udi
                ;;
+       sb1)
+               basic_machine=mipsisa64sb1-unknown
+               ;;
+       sb1el)
+               basic_machine=mipsisa64sb1el-unknown
+               ;;
+       sei)
+               basic_machine=mips-sei
+               os=-seiux
+               ;;
        sequent)
                basic_machine=i386-sequent
                ;;
@@ -794,7 +861,10 @@ case $basic_machine in
                basic_machine=sh-hitachi
                os=-hms
                ;;
-       sparclite-wrs)
+       sh64)
+               basic_machine=sh64-unknown
+               ;;
+       sparclite-wrs | simso-wrs)
                basic_machine=sparclite-wrs
                os=-vxworks
                ;;
@@ -861,19 +931,35 @@ case $basic_machine in
                os=-dynix
                ;;
        t3e)
-               basic_machine=t3e-cray
+               basic_machine=alphaev5-cray
+               os=-unicos
+               ;;
+       t90)
+               basic_machine=t90-cray
                os=-unicos
                ;;
        tic54x | c54x*)
                basic_machine=tic54x-unknown
                os=-coff
                ;;
+       tic55x | c55x*)
+               basic_machine=tic55x-unknown
+               os=-coff
+               ;;
+       tic6x | c6x*)
+               basic_machine=tic6x-unknown
+               os=-coff
+               ;;
        tx39)
                basic_machine=mipstx39-unknown
                ;;
        tx39el)
                basic_machine=mipstx39el-unknown
                ;;
+       toad1)
+               basic_machine=pdp10-xkl
+               os=-tops20
+               ;;
        tower | tower-32)
                basic_machine=m68k-ncr
                ;;
@@ -898,8 +984,8 @@ case $basic_machine in
                os=-vms
                ;;
        vpp*|vx|vx-*)
-               basic_machine=f301-fujitsu
-               ;;
+               basic_machine=f301-fujitsu
+               ;;
        vxworks960)
                basic_machine=i960-wrs
                os=-vxworks
@@ -920,17 +1006,13 @@ case $basic_machine in
                basic_machine=hppa1.1-winbond
                os=-proelf
                ;;
-       windows32)
-               basic_machine=i386-pc
-               os=-windows32-msvcrt
+       xps | xps100)
+               basic_machine=xps100-honeywell
                ;;
-       xmp)
-               basic_machine=xmp-cray
+       ymp)
+               basic_machine=ymp-cray
                os=-unicos
                ;;
-        xps | xps100)
-               basic_machine=xps100-honeywell
-               ;;
        z8k-*-coff)
                basic_machine=z8k-unknown
                os=-sim
@@ -951,13 +1033,6 @@ case $basic_machine in
        op60c)
                basic_machine=hppa1.1-oki
                ;;
-       mips)
-               if [ x$os = x-linux-gnu ]; then
-                       basic_machine=mips-unknown
-               else
-                       basic_machine=mips-mips
-               fi
-               ;;
        romp)
                basic_machine=romp-ibm
                ;;
@@ -977,13 +1052,16 @@ case $basic_machine in
        we32k)
                basic_machine=we32k-att
                ;;
-       sh3 | sh4 | sh3eb | sh4eb)
+       sh3 | sh4 | sh[34]eb | sh[1234]le | sh[23]ele)
                basic_machine=sh-unknown
                ;;
+       sh64)
+               basic_machine=sh64-unknown
+               ;;
        sparc | sparcv9 | sparcv9b)
                basic_machine=sparc-sun
                ;;
-        cydra)
+       cydra)
                basic_machine=cydra-cydrome
                ;;
        orion)
@@ -998,10 +1076,6 @@ case $basic_machine in
        pmac | pmac-mpw)
                basic_machine=powerpc-apple
                ;;
-       c4x*)
-               basic_machine=c4x-none
-               os=-coff
-               ;;
        *-unknown)
                # Make sure to match an already-canonicalized machine name.
                ;;
@@ -1057,17 +1131,19 @@ case $os in
              | -aos* \
              | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
              | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
-             | -hiux* | -386bsd* | -netbsd* | -openbsd* | -freebsd* | -riscix* \
+             | -hiux* | -386bsd* | -netbsd* | -openbsd* | -kfreebsd* | -freebsd* | -riscix* \
              | -lynxos* | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
              | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
              | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
              | -chorusos* | -chorusrdb* \
              | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
              | -mingw32* | -linux-gnu* | -uxpv* | -beos* | -mpeix* | -udk* \
-             | -interix* | -uwin* | -rhapsody* | -darwin* | -opened* \
+             | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
              | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
              | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
-             | -os2* | -vos*)
+             | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
+             | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
+             | -powermax* | -dnix* | -nx6 | -nx7 | -sei*)
        # Remember, each alternative MUST END IN *, to match a version number.
                ;;
        -qnx*)
@@ -1079,8 +1155,10 @@ case $os in
                        ;;
                esac
                ;;
+       -nto-qnx*)
+               ;;
        -nto*)
-               os=-nto-qnx
+               os=`echo $os | sed -e 's|nto|nto-qnx|'`
                ;;
        -sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \
              | -windows* | -osx | -abug | -netware* | -os9* | -beos* \
@@ -1089,6 +1167,9 @@ case $os in
        -mac*)
                os=`echo $os | sed -e 's|mac|macos|'`
                ;;
+       -linux-dietlibc)
+               os=-linux-dietlibc
+               ;;
        -linux*)
                os=`echo $os | sed -e 's|linux|linux-gnu|'`
                ;;
@@ -1119,14 +1200,20 @@ case $os in
        -acis*)
                os=-aos
                ;;
+       -atheos*)
+               os=-atheos
+               ;;
        -386bsd)
                os=-bsd
                ;;
        -ctix* | -uts*)
                os=-sysv
                ;;
+       -nova*)
+               os=-rtmk-nova
+               ;;
        -ns2 )
-               os=-nextstep2
+               os=-nextstep2
                ;;
        -nsk*)
                os=-nsk
@@ -1165,8 +1252,14 @@ case $os in
        -xenix)
                os=-xenix
                ;;
-        -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
-               os=-mint
+       -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
+               os=-mint
+               ;;
+       -aros*)
+               os=-aros
+               ;;
+       -kaos*)
+               os=-kaos
                ;;
        -none)
                ;;
@@ -1199,10 +1292,14 @@ case $basic_machine in
        arm*-semi)
                os=-aout
                ;;
+    c4x-* | tic4x-*)
+        os=-coff
+        ;;
+       # This must come before the *-dec entry.
        pdp10-*)
                os=-tops20
                ;;
-        pdp11-*)
+       pdp11-*)
                os=-none
                ;;
        *-dec | vax-*)
@@ -1229,6 +1326,9 @@ case $basic_machine in
        mips*-*)
                os=-elf
                ;;
+       or32-*)
+               os=-coff
+               ;;
        *-tti)  # must be before sparc entry or we get the wrong os.
                os=-sysv3
                ;;
@@ -1292,19 +1392,19 @@ case $basic_machine in
        *-next)
                os=-nextstep3
                ;;
-        *-gould)
+       *-gould)
                os=-sysv
                ;;
-        *-highlevel)
+       *-highlevel)
                os=-bsd
                ;;
        *-encore)
                os=-bsd
                ;;
-        *-sgi)
+       *-sgi)
                os=-irix
                ;;
-        *-siemens)
+       *-siemens)
                os=-sysv4
                ;;
        *-masscomp)
@@ -1376,7 +1476,7 @@ case $basic_machine in
                        -ptx*)
                                vendor=sequent
                                ;;
-                       -vxsim* | -vxworks*)
+                       -vxsim* | -vxworks* | -windiss*)
                                vendor=wrs
                                ;;
                        -aux*)
index e9de23842dcd44d2953129c866b1ad25f7e1f1d9..f5061e7e2696cfc2c6d1e5c03935c7eebbf4ca0b 100755 (executable)
@@ -1,19 +1,38 @@
 #!/bin/sh
-#
 # install - install a program, script, or datafile
-# This comes from X11R5 (mit/util/scripts/install.sh).
+
+scriptversion=2003-09-24.23
+
+# This originates from X11R5 (mit/util/scripts/install.sh), which was
+# later released in X11R6 (xc/config/util/install.sh) with the
+# following copyright and license.
+#
+# Copyright (C) 1994 X Consortium
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to
+# deal in the Software without restriction, including without limitation the
+# rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+# sell copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+# X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+# AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNEC-
+# TION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+#
+# Except as contained in this notice, the name of the X Consortium shall not
+# be used in advertising or otherwise to promote the sale, use or other deal-
+# ings in this Software without prior written authorization from the X Consor-
+# tium.
 #
-# Copyright 1991 by the Massachusetts Institute of Technology
 #
-# Permission to use, copy, modify, distribute, and sell this software and its
-# documentation for any purpose is hereby granted without fee, provided that
-# the above copyright notice appear in all copies and that both that
-# copyright notice and this permission notice appear in supporting
-# documentation, and that the name of M.I.T. not be used in advertising or
-# publicity pertaining to distribution of the software without specific,
-# written prior permission.  M.I.T. makes no representations about the
-# suitability of this software for any purpose.  It is provided "as is"
-# without express or implied warranty.
+# FSF changes to this file are in the public domain.
 #
 # Calling this script install-sh is preferred over install.sh, to prevent
 # `make' implicit rules from creating a file called install from it
 # from scratch.  It can only install one file at a time, a restriction
 # shared with many OS's install programs.
 
-
 # set DOITPROG to echo to test this script
 
 # Don't use :- since 4.3BSD and earlier shells don't like it.
 doit="${DOITPROG-}"
 
-
 # put in absolute paths if you don't have them in your path; or use env. vars.
 
 mvprog="${MVPROG-mv}"
@@ -41,211 +58,238 @@ stripprog="${STRIPPROG-strip}"
 rmprog="${RMPROG-rm}"
 mkdirprog="${MKDIRPROG-mkdir}"
 
-transformbasename=""
-transform_arg=""
+transformbasename=
+transform_arg=
 instcmd="$mvprog"
 chmodcmd="$chmodprog 0755"
-chowncmd=""
-chgrpcmd=""
-stripcmd=""
+chowncmd=
+chgrpcmd=
+stripcmd=
 rmcmd="$rmprog -f"
 mvcmd="$mvprog"
-src=""
-dst=""
-dir_arg=""
-
-while [ x"$1" != x ]; do
-    case $1 in
-       -c) instcmd="$cpprog"
-           shift
-           continue;;
-
-       -d) dir_arg=true
-           shift
-           continue;;
-
-       -m) chmodcmd="$chmodprog $2"
-           shift
-           shift
-           continue;;
-
-       -o) chowncmd="$chownprog $2"
-           shift
-           shift
-           continue;;
-
-       -g) chgrpcmd="$chgrpprog $2"
-           shift
-           shift
-           continue;;
-
-       -s) stripcmd="$stripprog"
-           shift
-           continue;;
-
-       -t=*) transformarg=`echo $1 | sed 's/-t=//'`
-           shift
-           continue;;
-
-       -b=*) transformbasename=`echo $1 | sed 's/-b=//'`
-           shift
-           continue;;
-
-       *)  if [ x"$src" = x ]
-           then
-               src=$1
-           else
-               # this colon is to work around a 386BSD /bin/sh bug
-               :
-               dst=$1
-           fi
-           shift
-           continue;;
-    esac
+src=
+dst=
+dir_arg=
+
+usage="Usage: $0 [OPTION]... SRCFILE DSTFILE
+   or: $0 -d DIR1 DIR2...
+
+In the first form, install SRCFILE to DSTFILE, removing SRCFILE by default.
+In the second, create the directory path DIR.
+
+Options:
+-b=TRANSFORMBASENAME
+-c         copy source (using $cpprog) instead of moving (using $mvprog).
+-d         create directories instead of installing files.
+-g GROUP   $chgrp installed files to GROUP.
+-m MODE    $chmod installed files to MODE.
+-o USER    $chown installed files to USER.
+-s         strip installed files (using $stripprog).
+-t=TRANSFORM
+--help     display this help and exit.
+--version  display version info and exit.
+
+Environment variables override the default commands:
+  CHGRPPROG CHMODPROG CHOWNPROG CPPROG MKDIRPROG MVPROG RMPROG STRIPPROG
+"
+
+while test -n "$1"; do
+  case $1 in
+    -b=*) transformbasename=`echo $1 | sed 's/-b=//'`
+        shift
+        continue;;
+
+    -c) instcmd=$cpprog
+        shift
+        continue;;
+
+    -d) dir_arg=true
+        shift
+        continue;;
+
+    -g) chgrpcmd="$chgrpprog $2"
+        shift
+        shift
+        continue;;
+
+    --help) echo "$usage"; exit 0;;
+
+    -m) chmodcmd="$chmodprog $2"
+        shift
+        shift
+        continue;;
+
+    -o) chowncmd="$chownprog $2"
+        shift
+        shift
+        continue;;
+
+    -s) stripcmd=$stripprog
+        shift
+        continue;;
+
+    -t=*) transformarg=`echo $1 | sed 's/-t=//'`
+        shift
+        continue;;
+
+    --version) echo "$0 $scriptversion"; exit 0;;
+
+    *)  if test -z "$src"; then
+          src=$1
+        else
+          # this colon is to work around a 386BSD /bin/sh bug
+          :
+          dst=$1
+        fi
+        shift
+        continue;;
+  esac
 done
 
-if [ x"$src" = x ]
-then
-       echo "install:  no input file specified"
-       exit 1
-else
-       true
+if test -z "$src"; then
+  echo "$0: no input file specified." >&2
+  exit 1
 fi
 
-if [ x"$dir_arg" != x ]; then
-       dst=$src
-       src=""
-       
-       if [ -d $dst ]; then
-               instcmd=:
-               chmodcmd=""
-       else
-               instcmd=mkdir
-       fi
+# Protect names starting with `-'.
+case $src in
+  -*) src=./$src ;;
+esac
+
+if test -n "$dir_arg"; then
+  dst=$src
+  src=
+
+  if test -d "$dst"; then
+    instcmd=:
+    chmodcmd=
+  else
+    instcmd=$mkdirprog
+  fi
 else
-
-# Waiting for this to be detected by the "$instcmd $src $dsttmp" command
-# might cause directories to be created, which would be especially bad 
-# if $src (and thus $dsttmp) contains '*'.
-
-       if [ -f $src -o -d $src ]
-       then
-               true
-       else
-               echo "install:  $src does not exist"
-               exit 1
-       fi
-       
-       if [ x"$dst" = x ]
-       then
-               echo "install:  no destination specified"
-               exit 1
-       else
-               true
-       fi
-
-# If destination is a directory, append the input filename; if your system
-# does not like double slashes in filenames, you may need to add some logic
-
-       if [ -d $dst ]
-       then
-               dst="$dst"/`basename $src`
-       else
-               true
-       fi
+  # Waiting for this to be detected by the "$instcmd $src $dsttmp" command
+  # might cause directories to be created, which would be especially bad
+  # if $src (and thus $dsttmp) contains '*'.
+  if test ! -f "$src" && test ! -d "$src"; then
+    echo "$0: $src does not exist." >&2
+    exit 1
+  fi
+
+  if test -z "$dst"; then
+    echo "$0: no destination specified." >&2
+    exit 1
+  fi
+
+  # Protect names starting with `-'.
+  case $dst in
+    -*) dst=./$dst ;;
+  esac
+
+  # If destination is a directory, append the input filename; won't work
+  # if double slashes aren't ignored.
+  if test -d "$dst"; then
+    dst=$dst/`basename "$src"`
+  fi
 fi
 
-## this sed command emulates the dirname command
-dstdir=`echo $dst | sed -e 's,[^/]*$,,;s,/$,,;s,^$,.,'`
+# This sed command emulates the dirname command.
+dstdir=`echo "$dst" | sed -e 's,[^/]*$,,;s,/$,,;s,^$,.,'`
 
 # Make sure that the destination directory exists.
-#  this part is taken from Noah Friedman's mkinstalldirs script
 
 # Skip lots of stat calls in the usual case.
-if [ ! -d "$dstdir" ]; then
-defaultIFS='   
-'
-IFS="${IFS-${defaultIFS}}"
-
-oIFS="${IFS}"
-# Some sh's can't handle IFS=/ for some reason.
-IFS='%'
-set - `echo ${dstdir} | sed -e 's@/@%@g' -e 's@^%@/@'`
-IFS="${oIFS}"
-
-pathcomp=''
-
-while [ $# -ne 0 ] ; do
-       pathcomp="${pathcomp}${1}"
-       shift
-
-       if [ ! -d "${pathcomp}" ] ;
-        then
-               $mkdirprog "${pathcomp}"
-       else
-               true
-       fi
-
-       pathcomp="${pathcomp}/"
-done
+if test ! -d "$dstdir"; then
+  defaultIFS='
+       '
+  IFS="${IFS-$defaultIFS}"
+
+  oIFS=$IFS
+  # Some sh's can't handle IFS=/ for some reason.
+  IFS='%'
+  set - `echo "$dstdir" | sed -e 's@/@%@g' -e 's@^%@/@'`
+  IFS=$oIFS
+
+  pathcomp=
+
+  while test $# -ne 0 ; do
+    pathcomp=$pathcomp$1
+    shift
+    test -d "$pathcomp" || $mkdirprog "$pathcomp"
+    pathcomp=$pathcomp/
+  done
 fi
 
-if [ x"$dir_arg" != x ]
-then
-       $doit $instcmd $dst &&
+if test -n "$dir_arg"; then
+  $doit $instcmd "$dst" \
+    && { test -z "$chowncmd" || $doit $chowncmd "$dst"; } \
+    && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dst"; } \
+    && { test -z "$stripcmd" || $doit $stripcmd "$dst"; } \
+    && { test -z "$chmodcmd" || $doit $chmodcmd "$dst"; }
 
-       if [ x"$chowncmd" != x ]; then $doit $chowncmd $dst; else true ; fi &&
-       if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dst; else true ; fi &&
-       if [ x"$stripcmd" != x ]; then $doit $stripcmd $dst; else true ; fi &&
-       if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dst; else true ; fi
 else
-
-# If we're going to rename the final executable, determine the name now.
-
-       if [ x"$transformarg" = x ] 
-       then
-               dstfile=`basename $dst`
-       else
-               dstfile=`basename $dst $transformbasename | 
-                       sed $transformarg`$transformbasename
-       fi
-
-# don't allow the sed command to completely eliminate the filename
-
-       if [ x"$dstfile" = x ] 
-       then
-               dstfile=`basename $dst`
-       else
-               true
-       fi
-
-# Make a temp file name in the proper directory.
-
-       dsttmp=$dstdir/#inst.$$#
-
-# Move or copy the file name to the temp name
-
-       $doit $instcmd $src $dsttmp &&
-
-       trap "rm -f ${dsttmp}" 0 &&
-
-# and set any options; do chmod last to preserve setuid bits
-
-# If any of these fail, we abort the whole thing.  If we want to
-# ignore errors from any of these, just make sure not to ignore
-# errors from the above "$doit $instcmd $src $dsttmp" command.
-
-       if [ x"$chowncmd" != x ]; then $doit $chowncmd $dsttmp; else true;fi &&
-       if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dsttmp; else true;fi &&
-       if [ x"$stripcmd" != x ]; then $doit $stripcmd $dsttmp; else true;fi &&
-       if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dsttmp; else true;fi &&
-
-# Now rename the file to the real destination.
-
-       $doit $rmcmd -f $dstdir/$dstfile &&
-       $doit $mvcmd $dsttmp $dstdir/$dstfile 
-
+  # If we're going to rename the final executable, determine the name now.
+  if test -z "$transformarg"; then
+    dstfile=`basename "$dst"`
+  else
+    dstfile=`basename "$dst" $transformbasename \
+             | sed $transformarg`$transformbasename
+  fi
+
+  # don't allow the sed command to completely eliminate the filename.
+  test -z "$dstfile" && dstfile=`basename "$dst"`
+
+  # Make a couple of temp file names in the proper directory.
+  dsttmp=$dstdir/_inst.$$_
+  rmtmp=$dstdir/_rm.$$_
+
+  # Trap to clean up those temp files at exit.
+  trap 'status=$?; rm -f "$dsttmp" "$rmtmp" && exit $status' 0
+  trap '(exit $?); exit' 1 2 13 15
+
+  # Move or copy the file name to the temp name
+  $doit $instcmd "$src" "$dsttmp" &&
+
+  # and set any options; do chmod last to preserve setuid bits.
+  #
+  # If any of these fail, we abort the whole thing.  If we want to
+  # ignore errors from any of these, just make sure not to ignore
+  # errors from the above "$doit $instcmd $src $dsttmp" command.
+  #
+  { test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } \
+    && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } \
+    && { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } \
+    && { test -z "$chmodcmd" || $doit $chmodcmd "$dsttmp"; } &&
+
+  # Now remove or move aside any old file at destination location.  We
+  # try this two ways since rm can't unlink itself on some systems and
+  # the destination file might be busy for other reasons.  In this case,
+  # the final cleanup might fail but the new file should still install
+  # successfully.
+  {
+    if test -f "$dstdir/$dstfile"; then
+      $doit $rmcmd -f "$dstdir/$dstfile" 2>/dev/null \
+      || $doit $mvcmd -f "$dstdir/$dstfile" "$rmtmp" 2>/dev/null \
+      || {
+         echo "$0: cannot unlink or rename $dstdir/$dstfile" >&2
+         (exit 1); exit
+      }
+    else
+      :
+    fi
+  } &&
+
+  # Now rename the file to the real destination.
+  $doit $mvcmd "$dsttmp" "$dstdir/$dstfile"
 fi &&
 
-
-exit 0
+# The final little trick to "correctly" pass the exit status to the exit trap.
+{
+  (exit 0); exit
+}
+
+# Local variables:
+# eval: (add-hook 'write-file-hooks 'time-stamp)
+# time-stamp-start: "scriptversion="
+# time-stamp-format: "%:y-%02m-%02d.%02H"
+# time-stamp-end: "$"
+# End:
index c8c126aea737673cabb53d786631313a0dbbeb3b..3c698081dad6a596e87ba8c56c8c3bb897a3b5cf 100644 (file)
@@ -1,5 +1,4 @@
 
-
 AC_DEFUN(DS_LINUX_DIR,
 [
        AC_ARG_WITH([linuxdir],
@@ -8,50 +7,18 @@ AC_DEFUN(DS_LINUX_DIR,
                [LINUX_DIR="${withval}"],
                [LINUX_DIR=default])
 
-       if test "${LINUX_DIR}" != "default" ; then
-               DS_TRY_LINUX_DIR([${LINUX_DIR}], , AC_MSG_ERROR([Linux dir not found]) )
-       fi
-
-       if test "${LINUX_DIR}" = "default" ; then
-               dir="/lib/modules/`uname -r`/build";
-               DS_TRY_LINUX_DIR([${dir}], [LINUX_DIR=${dir}], )
-       fi
-       if test "${LINUX_DIR}" = "default" ; then
-               dir="../linux";
-               DS_TRY_LINUX_DIR([${dir}], [LINUX_DIR=${dir}], )
-       fi
-       if test "${LINUX_DIR}" = "default" ; then
-               dir="/usr/src/linux";
-               DS_TRY_LINUX_DIR([${dir}], [LINUX_DIR=${dir}], )
-       fi
-
-#      if test "${LINUX_DIR}" = "default" ; then
-#              AC_MSG_ERROR([Linux source directory not found])
-#      fi
 
        AC_SUBST(LINUX_DIR)
 ])
 
-AC_DEFUN(DS_TRY_LINUX_DIR,
-       [AC_MSG_CHECKING(for Linux in $1)
-
-       if test -f "$1/Makefile" ; then
-               result=yes
-               $2
-       else
-               result="not found"
-               $3
-       fi
-
-       AC_MSG_RESULT($result)
-])
 
 AC_DEFUN(DS_LINUX,
 [
+
        DS_LINUX_DIR()
        
         AC_MSG_CHECKING([Linux version])
-       
+       
        if test "${LINUX_DIR}" != "default" ; then
 
           if [[ ! -f "${LINUX_DIR}/.config" ]];then
@@ -85,11 +52,21 @@ AC_DEFUN(DS_LINUX,
                AC_MSG_ERROR([Unknown Linux major.minor $LINUX_VERSION_MAJOR.$LINUX_VERSION_MINOR])
                ;;
          esac
+
+         CONFIG_ORTE_KERNEL=yes
+          AC_DEFINE([CONFIG_ORTE_KERNEL],[1],[Define if linux kernel is found])          
+
        else
           AC_MSG_RESULT(["none"])      
+         
+         CONFIG_ORTE_KERNEL=no
+                 
        fi
   
-  DS_RT()
+        AC_SUBST(CONFIG_ORTE_KERNEL)   
+       AM_CONDITIONAL([CONFIG_ORTE_KERNEL],[test ${CONFIG_ORTE_KERNEL} == "yes"])
+    
+        DS_RT()
 ])
 
 AC_DEFUN(DS_LINUX_2_6,
@@ -257,6 +234,8 @@ AC_DEFUN(DS_RTAI,
                        fi
                fi
                $1
+                RT_GCCLIB_DIR=`gcc -print-search-dirs | sed -n -e 's/^install: \(.*\)$/\1/p'`
+               RTAI_CFLAGS="${RTAI_CFLAGS} -I${RT_GCCLIB_DIR}/include -nostdinc"
                AC_MSG_RESULT([found])
                AC_DEFINE([CONFIG_ORTE_RTAI],[1],[Define if kernel is RTAI patched])
        else
@@ -271,20 +250,37 @@ AC_DEFUN(DS_RTLINUX,
        AC_ARG_WITH([rtlinuxdir],
                [AC_HELP_STRING([--with-rtlinuxdir=DIR],
                        [specify path to RTLinux source directory])],
-               [RTL_DIR="${withval}"],
-               [RTL_DIR=/usr/src/rtlinux])
+               [RTLINUX_DIR="${withval}"],
+               [RTLINUX_DIR=/usr/src/rtlinux])
+               
+       AC_ARG_WITH([rtlinuxudpdir],
+               [AC_HELP_STRING([--with-rtlinuxudpdir=DIR],
+                       [specify path to RTLinux UDP source directory])],
+               [RTLINUXUDP_DIR="${withval}"],
+               [RTLINUXUDP_DIR="${RTLINUX_DIR}"])
 
        DS_LINUX_CONFIG_OPTION_MODULE([CONFIG_RTLINUX])
 
        if test "${CONFIG_RTLINUX}" != "no" ; then
-               AC_MSG_CHECKING([RTLinux directory ${RTL_DIR} for rtl.mk])
-               if [[ -d ${RTL_DIR}/include ]] ; then
-                        RTLINUX_CFLAGS=`sed -n -e 's/^CFLAGS *=\(.*\)$/\1/p' ${RTL_DIR}/rtl.mk`
+               AC_MSG_CHECKING([RTLinux directory ${RTLINUX_DIR} for rtl.mk])
+               if [[ -d ${RTLINUX_DIR}/include ]] ; then
+                        RTLINUX_CFLAGS=`sed -n -e 's/^CFLAGS *=\(.*\)$/\1/p' ${RTLINUX_DIR}/rtl.mk`
                else
                        AC_MSG_ERROR([incorrect RTLinux directory?])
                fi
                AC_MSG_RESULT([found])
                AC_DEFINE([CONFIG_ORTE_RTL],[1],[Define if kernel is RTLinux patched])
+               AC_MSG_CHECKING([RTLinux for UDP])
+                if [[ ! -e "${RTLINUXUDP_DIR}/include/udp.h" -o \
+                     ! -e "${RTLINUXUDP_DIR}/include/nic.h" -o \ 
+                     ! -e "${RTLINUXUDP_DIR}/include/ip.h" -o \ 
+                     ! -e "${RTLINUXUDP_DIR}/include/ethernet.h" -o \ 
+                     ! -e "${RTLINUXUDP_DIR}/include/nictab.h" ]] ; then 
+                       AC_MSG_ERROR([incorrect RTLinux UDP directory!!!])
+               fi
+                RT_GCCLIB_DIR=`gcc -print-search-dirs | sed -n -e 's/^install: \(.*\)$/\1/p'`
+               RTLINUX_CFLAGS="${RTLINUX_CFLAGS} -I${RTLINUXUDP_DIR}/include -I${RT_GCCLIB_DIR}/include -nostdinc"
+               AC_MSG_RESULT([found])
                $1
        else
                $2
index 0a7fb5a2acec32d1ef949e5e7e7fb11460c5e021..e7ef83a1c2512ce091a7c622ece4ade5bf4acf98 100755 (executable)
@@ -1,6 +1,10 @@
 #! /bin/sh
 # Common stub for a few missing GNU programs while installing.
-# Copyright 1996, 1997, 1999, 2000 Free Software Foundation, Inc.
+
+scriptversion=2003-09-02.23
+
+# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003 
+#   Free Software Foundation, Inc.
 # Originally by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996.
 
 # This program is free software; you can redistribute it and/or modify
@@ -38,12 +42,23 @@ else
   configure_ac=configure.in
 fi
 
+msg="missing on your system"
+
 case "$1" in
 --run)
   # Try to run requested program, and just exit if it succeeds.
   run=
   shift
   "$@" && exit 0
+  # Exit code 63 means version mismatch.  This often happens
+  # when the user try to use an ancient version of a tool on
+  # a file that requires a minimum version.  In this case we
+  # we should proceed has if the program had been absent, or
+  # if --run hadn't been passed.
+  if test $? = 63; then
+    run=:
+    msg="probably too old"
+  fi
   ;;
 esac
 
@@ -74,11 +89,13 @@ Supported PROGRAM values:
   lex          create \`lex.yy.c', if possible, from existing .c
   makeinfo     touch the output file
   tar          try tar, gnutar, gtar, then tar without non-portable flags
-  yacc         create \`y.tab.[ch]', if possible, from existing .[ch]"
+  yacc         create \`y.tab.[ch]', if possible, from existing .[ch]
+
+Send bug reports to <bug-automake@gnu.org>."
     ;;
 
   -v|--v|--ve|--ver|--vers|--versi|--versio|--version)
-    echo "missing 0.3 - GNU automake"
+    echo "missing $scriptversion (GNU Automake)"
     ;;
 
   -*)
@@ -87,9 +104,14 @@ Supported PROGRAM values:
     exit 1
     ;;
 
-  aclocal)
+  aclocal*)
+    if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
+       # We have it, but it failed.
+       exit 1
+    fi
+
     echo 1>&2 "\
-WARNING: \`$1' is missing on your system.  You should only need it if
+WARNING: \`$1' is $msg.  You should only need it if
          you modified \`acinclude.m4' or \`${configure_ac}'.  You might want
          to install the \`Automake' and \`Perl' packages.  Grab them from
          any GNU archive site."
@@ -97,8 +119,13 @@ WARNING: \`$1' is missing on your system.  You should only need it if
     ;;
 
   autoconf)
+    if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
+       # We have it, but it failed.
+       exit 1
+    fi
+
     echo 1>&2 "\
-WARNING: \`$1' is missing on your system.  You should only need it if
+WARNING: \`$1' is $msg.  You should only need it if
          you modified \`${configure_ac}'.  You might want to install the
          \`Autoconf' and \`GNU m4' packages.  Grab them from any GNU
          archive site."
@@ -106,8 +133,13 @@ WARNING: \`$1' is missing on your system.  You should only need it if
     ;;
 
   autoheader)
+    if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
+       # We have it, but it failed.
+       exit 1
+    fi
+
     echo 1>&2 "\
-WARNING: \`$1' is missing on your system.  You should only need it if
+WARNING: \`$1' is $msg.  You should only need it if
          you modified \`acconfig.h' or \`${configure_ac}'.  You might want
          to install the \`Autoconf' and \`GNU m4' packages.  Grab them
          from any GNU archive site."
@@ -124,9 +156,14 @@ WARNING: \`$1' is missing on your system.  You should only need it if
     touch $touch_files
     ;;
 
-  automake)
+  automake*)
+    if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
+       # We have it, but it failed.
+       exit 1
+    fi
+
     echo 1>&2 "\
-WARNING: \`$1' is missing on your system.  You should only need it if
+WARNING: \`$1' is $msg.  You should only need it if
          you modified \`Makefile.am', \`acinclude.m4' or \`${configure_ac}'.
          You might want to install the \`Automake' and \`Perl' packages.
          Grab them from any GNU archive site."
@@ -135,9 +172,37 @@ WARNING: \`$1' is missing on your system.  You should only need it if
           while read f; do touch "$f"; done
     ;;
 
+  autom4te)
+    if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
+       # We have it, but it failed.
+       exit 1
+    fi
+
+    echo 1>&2 "\
+WARNING: \`$1' is needed, but is $msg.
+         You might have modified some files without having the
+         proper tools for further handling them.
+         You can get \`$1' as part of \`Autoconf' from any GNU
+         archive site."
+
+    file=`echo "$*" | sed -n 's/.*--output[ =]*\([^ ]*\).*/\1/p'`
+    test -z "$file" && file=`echo "$*" | sed -n 's/.*-o[ ]*\([^ ]*\).*/\1/p'`
+    if test -f "$file"; then
+       touch $file
+    else
+       test -z "$file" || exec >$file
+       echo "#! /bin/sh"
+       echo "# Created by GNU Automake missing as a replacement of"
+       echo "#  $ $@"
+       echo "exit 0"
+       chmod +x $file
+       exit 1
+    fi
+    ;;
+
   bison|yacc)
     echo 1>&2 "\
-WARNING: \`$1' is missing on your system.  You should only need it if
+WARNING: \`$1' $msg.  You should only need it if
          you modified a \`.y' file.  You may need the \`Bison' package
          in order for those modifications to take effect.  You can get
          \`Bison' from any GNU archive site."
@@ -167,7 +232,7 @@ WARNING: \`$1' is missing on your system.  You should only need it if
 
   lex|flex)
     echo 1>&2 "\
-WARNING: \`$1' is missing on your system.  You should only need it if
+WARNING: \`$1' is $msg.  You should only need it if
          you modified a \`.l' file.  You may need the \`Flex' package
          in order for those modifications to take effect.  You can get
          \`Flex' from any GNU archive site."
@@ -189,8 +254,13 @@ WARNING: \`$1' is missing on your system.  You should only need it if
     ;;
 
   help2man)
+    if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
+       # We have it, but it failed.
+       exit 1
+    fi
+
     echo 1>&2 "\
-WARNING: \`$1' is missing on your system.  You should only need it if
+WARNING: \`$1' is $msg.  You should only need it if
         you modified a dependency of a manual page.  You may need the
         \`Help2man' package in order for those modifications to take
         effect.  You can get \`Help2man' from any GNU archive site."
@@ -215,7 +285,7 @@ WARNING: \`$1' is missing on your system.  You should only need it if
     fi
 
     echo 1>&2 "\
-WARNING: \`$1' is missing on your system.  You should only need it if
+WARNING: \`$1' is $msg.  You should only need it if
          you modified a \`.texi' or \`.texinfo' file, or any other file
          indirectly affecting the aspect of the manual.  The spurious
          call might also be the consequence of using a buggy \`make' (AIX,
@@ -240,23 +310,23 @@ WARNING: \`$1' is missing on your system.  You should only need it if
     # Look for gnutar/gtar before invocation to avoid ugly error
     # messages.
     if (gnutar --version > /dev/null 2>&1); then
-       gnutar ${1+"$@"} && exit 0
+       gnutar "$@" && exit 0
     fi
     if (gtar --version > /dev/null 2>&1); then
-       gtar ${1+"$@"} && exit 0
+       gtar "$@" && exit 0
     fi
     firstarg="$1"
     if shift; then
        case "$firstarg" in
        *o*)
            firstarg=`echo "$firstarg" | sed s/o//`
-           tar "$firstarg" ${1+"$@"} && exit 0
+           tar "$firstarg" "$@" && exit 0
            ;;
        esac
        case "$firstarg" in
        *h*)
            firstarg=`echo "$firstarg" | sed s/h//`
-           tar "$firstarg" ${1+"$@"} && exit 0
+           tar "$firstarg" "$@" && exit 0
            ;;
        esac
     fi
@@ -270,10 +340,10 @@ WARNING: I can't seem to be able to run \`tar' with the given arguments.
 
   *)
     echo 1>&2 "\
-WARNING: \`$1' is needed, and you do not seem to have it handy on your
-         system.  You might have modified some files without having the
+WARNING: \`$1' is needed, and is $msg.
+         You might have modified some files without having the
          proper tools for further handling them.  Check the \`README' file,
-         it often tells you about the needed prerequirements for installing
+         it often tells you about the needed prerequisites for installing
          this package.  You may also peek at any GNU archive site, in case
          some other package would contain this missing \`$1' program."
     exit 1
@@ -281,3 +351,10 @@ WARNING: \`$1' is needed, and you do not seem to have it handy on your
 esac
 
 exit 0
+
+# Local variables:
+# eval: (add-hook 'write-file-hooks 'time-stamp)
+# time-stamp-start: "scriptversion="
+# time-stamp-format: "%:y-%02m-%02d.%02H"
+# time-stamp-end: "$"
+# End:
index a947d3b1ce6eac877145f9e1a8137475ce507673..a55cff670691f5878621cfd5d66edc5eb71fb3cc 100755 (executable)
 #! /bin/sh
 # mkinstalldirs --- make directory hierarchy
-# Author: Noah Friedman <friedman@prep.ai.mit.edu>
+# Original author: Noah Friedman <friedman@prep.ai.mit.edu>
 # Created: 1993-05-16
-# Public domain
+# Public domain.
 
-# $Id: mkinstalldirs,v 1.2 2004/01/17 18:16:42 ppisa Exp $
+scriptversion=2003-09-26.19
 
 errstatus=0
+dirmode=""
+
+usage="\
+Usage: mkinstalldirs [-h] [--help] [--version] [-m MODE] DIR ...
+
+Create each directory DIR (with mode MODE, if specified), including all
+leading file name components.
+"
+
+# process command line arguments
+while test $# -gt 0 ; do
+  case $1 in
+    -h | --help | --h*)         # -h for help
+      echo "$usage"
+      exit 0
+      ;;
+    -m)                         # -m PERM arg
+      shift
+      test $# -eq 0 && { echo "$usage" 1>&2; exit 1; }
+      dirmode=$1
+      shift
+      ;;
+    --version)
+      echo "$0 $scriptversion"
+      exit 0
+      ;;
+    --)                         # stop option processing
+      shift
+      break
+      ;;
+    -*)                         # unknown option
+      echo "$usage" 1>&2
+      exit 1
+      ;;
+    *)                          # first non-opt arg
+      break
+      ;;
+  esac
+done
 
 for file
 do
-   set fnord `echo ":$file" | sed -ne 's/^:\//#/;s/^://;s/\// /g;s/^#/\//;p'`
-   shift
+  if test -d "$file"; then
+    shift
+  else
+    break
+  fi
+done
+
+case $# in
+  0) exit 0 ;;
+esac
+
+case $dirmode in
+  '')
+    if mkdir -p -- . 2>/dev/null; then
+      echo "mkdir -p -- $*"
+      exec mkdir -p -- "$@"
+    else
+      # On NextStep and OpenStep, the `mkdir' command does not
+      # recognize any option.  It will interpret all options as
+      # directories to create, and then abort because `.' already
+      # exists.
+      test -d ./-p && rmdir ./-p
+      test -d ./-- && rmdir ./--
+    fi
+    ;;
+  *)
+    if mkdir -m "$dirmode" -p -- . 2>/dev/null; then
+      echo "mkdir -m $dirmode -p -- $*"
+      exec mkdir -m "$dirmode" -p -- "$@"
+    else
+      # Clean up after NextStep and OpenStep mkdir.
+      for d in ./-m ./-p ./-- "./$dirmode";
+      do
+        test -d $d && rmdir $d
+      done
+    fi
+    ;;
+esac
+
+for file
+do
+  set fnord `echo ":$file" | sed -ne 's/^:\//#/;s/^://;s/\// /g;s/^#/\//;p'`
+  shift
+
+  pathcomp=
+  for d
+  do
+    pathcomp="$pathcomp$d"
+    case $pathcomp in
+      -*) pathcomp=./$pathcomp ;;
+    esac
 
-   pathcomp=
-   for d
-   do
-     pathcomp="$pathcomp$d"
-     case "$pathcomp" in
-       -* ) pathcomp=./$pathcomp ;;
-     esac
+    if test ! -d "$pathcomp"; then
+      echo "mkdir $pathcomp"
 
-     if test ! -d "$pathcomp"; then
-        echo "mkdir $pathcomp"
+      mkdir "$pathcomp" || lasterr=$?
 
-        mkdir "$pathcomp" || lasterr=$?
+      if test ! -d "$pathcomp"; then
+       errstatus=$lasterr
+      else
+       if test ! -z "$dirmode"; then
+         echo "chmod $dirmode $pathcomp"
+         lasterr=""
+         chmod "$dirmode" "$pathcomp" || lasterr=$?
 
-        if test ! -d "$pathcomp"; then
-         errstatus=$lasterr
-        fi
-     fi
+         if test ! -z "$lasterr"; then
+           errstatus=$lasterr
+         fi
+       fi
+      fi
+    fi
 
-     pathcomp="$pathcomp/"
-   done
+    pathcomp="$pathcomp/"
+  done
 done
 
 exit $errstatus
 
-# mkinstalldirs ends here
+# Local Variables:
+# mode: shell-script
+# sh-indentation: 2
+# eval: (add-hook 'write-file-hooks 'time-stamp)
+# time-stamp-start: "scriptversion="
+# time-stamp-format: "%:y-%02m-%02d.%02H"
+# time-stamp-end: "$"
+# End:
diff --git a/authors b/authors
index cfbf6b9dcf39d8587def2d3c5c1682e34b9cff59..b9dc675db24b6f1e8ebecb679bc38b2fe9a89b83 100644 (file)
--- a/authors
+++ b/authors
@@ -1,6 +1,24 @@
+                   *****************************************
+                                    AUTHORS
+                   *****************************************
+___________________
+The ORTE project
+~~~~~~~~~~~~~~~~~~~
+                  
+Thanks all of you for help with creation of the project ORTE.
+
+
 Petr Smolik <petr.smolik@wo.cz>
-  originator
+    * originator
+    
 Pavel Pisa <pisa@cmp.felk.cvut.cz> 
-  gavl, htree implementations, help with architecture
+    * gavl implentations
+    * htree implementations
+    * help with architecture
+    
 Michal Sojka <sojka1@fel.cvut.cz> 
-  porting to the RTLinux
+    * RTLinux proting
+
+Jan Kiszka <Jan.Kiszka@web.de>
+    * RTAI porting
+
index d4a9969ef8948e2528f72fc5913b71bed89ed3f0..93144c1ba8b4e900ec7f0aa0bda4778df9ee3d96 100755 (executable)
--- a/configure
+++ b/configure
@@ -1,11 +1,10 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.57 for orte 0.2.0.
+# Generated by GNU Autoconf 2.59 for orte 0.2.0.
 #
 # Report bugs to <petr.smolik@wo.cz>.
 #
-# Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002
-# Free Software Foundation, Inc.
+# Copyright (C) 2003 Free Software Foundation, Inc.
 # This configure script is free software; the Free Software Foundation
 # gives unlimited permission to copy, distribute and modify it.
 ## --------------------- ##
@@ -22,9 +21,10 @@ if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
 elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then
   set -o posix
 fi
+DUALCASE=1; export DUALCASE # for MKS sh
 
 # Support unset when possible.
-if (FOO=FOO; unset FOO) >/dev/null 2>&1; then
+if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
   as_unset=unset
 else
   as_unset=false
@@ -43,7 +43,7 @@ for as_var in \
   LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
   LC_TELEPHONE LC_TIME
 do
-  if (set +x; test -n "`(eval $as_var=C; export $as_var) 2>&1`"); then
+  if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
     eval $as_var=C; export $as_var
   else
     $as_unset $as_var
@@ -220,16 +220,17 @@ rm -f conf$$ conf$$.exe conf$$.file
 if mkdir -p . 2>/dev/null; then
   as_mkdir_p=:
 else
+  test -d ./-p && rmdir ./-p
   as_mkdir_p=false
 fi
 
 as_executable_p="test -f"
 
 # Sed expression to map a string onto a valid CPP name.
-as_tr_cpp="sed y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g"
+as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
 
 # Sed expression to map a string onto a valid variable name.
-as_tr_sh="sed y%*+%pp%;s%[^_$as_cr_alnum]%_%g"
+as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
 
 
 # IFS
@@ -272,44 +273,7 @@ PACKAGE_VERSION='0.2.0'
 PACKAGE_STRING='orte 0.2.0'
 PACKAGE_BUGREPORT='petr.smolik@wo.cz'
 
-# Factoring default headers for most tests.
-ac_includes_default="\
-#include <stdio.h>
-#if HAVE_SYS_TYPES_H
-# include <sys/types.h>
-#endif
-#if HAVE_SYS_STAT_H
-# include <sys/stat.h>
-#endif
-#if STDC_HEADERS
-# include <stdlib.h>
-# include <stddef.h>
-#else
-# if HAVE_STDLIB_H
-#  include <stdlib.h>
-# endif
-#endif
-#if HAVE_STRING_H
-# if !STDC_HEADERS && HAVE_MEMORY_H
-#  include <memory.h>
-# endif
-# include <string.h>
-#endif
-#if HAVE_STRINGS_H
-# include <strings.h>
-#endif
-#if HAVE_INTTYPES_H
-# include <inttypes.h>
-#else
-# if HAVE_STDINT_H
-#  include <stdint.h>
-# endif
-#endif
-#if HAVE_UNISTD_H
-# include <unistd.h>
-#endif"
-
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM AWK SET_MAKE MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT LINUX_DIR LINUX_ARCH LINUX_AFLAGS LINUX_LDFLAGS LINUX_ARFLAGS LINUX_CROSS_COMPILE LINUX_KERNELRELEASE LINUX_CFLAGS LINUX_CC LINUX_LD LINUX_AS LINUX_MODULE_EXT CONFIG_RTHAL_TRUE CONFIG_RTHAL_FALSE RTAI_CFLAGS CONFIG_RTLINUX_TRUE CONFIG_RTLINUX_FALSE RTLINUX_CFLAGS CONFIG_ORTE_RT USE_RTAI_TRUE USE_RTAI_FALSE USE_RTLINUX_TRUE USE_RTLINUX_FALSE CONFIG_ORTE_RT_TRUE CONFIG_ORTE_RT_FALSE ORTE_MAJOR_VERSION ORTE_MINOR_VERSION ORTE_MICRO_VERSION ORTE_VERSION moduledir modulePROGRAMS_INSTALL CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE RANLIB ac_ct_RANLIB CPP EGREP INCLUDES CONFIG_ORTE_WIN_TRUE CONFIG_ORTE_WIN_FALSE CONFIG_ORTE_UNIX_TRUE CONFIG_ORTE_UNIX_FALSE LIBOBJS LTLIBOBJS'
+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM AWK SET_MAKE MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT LINUX_DIR LINUX_ARCH LINUX_AFLAGS LINUX_LDFLAGS LINUX_ARFLAGS LINUX_CROSS_COMPILE LINUX_KERNELRELEASE LINUX_CFLAGS LINUX_CC LINUX_LD LINUX_AS LINUX_MODULE_EXT CONFIG_ORTE_KERNEL CONFIG_ORTE_KERNEL_TRUE CONFIG_ORTE_KERNEL_FALSE CONFIG_RTHAL_TRUE CONFIG_RTHAL_FALSE RTAI_CFLAGS CONFIG_RTLINUX_TRUE CONFIG_RTLINUX_FALSE RTLINUX_CFLAGS CONFIG_ORTE_RT USE_RTAI_TRUE USE_RTAI_FALSE USE_RTLINUX_TRUE USE_RTLINUX_FALSE CONFIG_ORTE_RT_TRUE CONFIG_ORTE_RT_FALSE ORTE_MAJOR_VERSION ORTE_MINOR_VERSION ORTE_MICRO_VERSION ORTE_VERSION CONFIG_ORTE_WIN_TRUE CONFIG_ORTE_WIN_FALSE CONFIG_ORTE_UNIX_TRUE CONFIG_ORTE_UNIX_FALSE moduledir modulePROGRAMS_INSTALL CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE RANLIB ac_ct_RANLIB CPP EGREP INCLUDES LIBOBJS LTLIBOBJS'
 ac_subst_files=''
 
 # Initialize some variables set by options.
@@ -668,7 +632,7 @@ done
 
 # Be sure to have absolute paths.
 for ac_var in bindir sbindir libexecdir datadir sysconfdir sharedstatedir \
-              localstatedir libdir includedir oldincludedir infodir mandir
+             localstatedir libdir includedir oldincludedir infodir mandir
 do
   eval ac_val=$`echo $ac_var`
   case $ac_val in
@@ -708,10 +672,10 @@ if test -z "$srcdir"; then
   # Try the directory containing this script, then its parent.
   ac_confdir=`(dirname "$0") 2>/dev/null ||
 $as_expr X"$0" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-         X"$0" : 'X\(//\)[^/]' \| \
-         X"$0" : 'X\(//\)$' \| \
-         X"$0" : 'X\(/\)' \| \
-         .     : '\(.\)' 2>/dev/null ||
+        X"$0" : 'X\(//\)[^/]' \| \
+        X"$0" : 'X\(//\)$' \| \
+        X"$0" : 'X\(/\)' \| \
+        .     : '\(.\)' 2>/dev/null ||
 echo X"$0" |
     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
          /^X\(\/\/\)[^/].*/{ s//\1/; q; }
@@ -803,9 +767,9 @@ _ACEOF
   cat <<_ACEOF
 Installation directories:
   --prefix=PREFIX         install architecture-independent files in PREFIX
-                          [$ac_default_prefix]
+                         [$ac_default_prefix]
   --exec-prefix=EPREFIX   install architecture-dependent files in EPREFIX
-                          [PREFIX]
+                         [PREFIX]
 
 By default, \`make install' will install all the files in
 \`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc.  You can specify
@@ -863,6 +827,8 @@ Optional Packages:
   --with-linuxdir=DIR     specify path to Linux source directory
   --with-rtaidir=DIR      specify path to RTAI source directory
   --with-rtlinuxdir=DIR   specify path to RTLinux source directory
+  --with-rtlinuxudpdir=DIR
+                          specify path to RTLinux UDP source directory
 
 Some influential environment variables:
   CC          C compiler command
@@ -910,12 +876,45 @@ case $srcdir in
     ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
     ac_top_srcdir=$ac_top_builddir$srcdir ;;
 esac
-# Don't blindly perform a `cd "$ac_dir"/$ac_foo && pwd` since $ac_foo can be
-# absolute.
-ac_abs_builddir=`cd "$ac_dir" && cd $ac_builddir && pwd`
-ac_abs_top_builddir=`cd "$ac_dir" && cd ${ac_top_builddir}. && pwd`
-ac_abs_srcdir=`cd "$ac_dir" && cd $ac_srcdir && pwd`
-ac_abs_top_srcdir=`cd "$ac_dir" && cd $ac_top_srcdir && pwd`
+
+# Do not use `cd foo && pwd` to compute absolute paths, because
+# the directories may not exist.
+case `pwd` in
+.) ac_abs_builddir="$ac_dir";;
+*)
+  case "$ac_dir" in
+  .) ac_abs_builddir=`pwd`;;
+  [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";;
+  *) ac_abs_builddir=`pwd`/"$ac_dir";;
+  esac;;
+esac
+case $ac_abs_builddir in
+.) ac_abs_top_builddir=${ac_top_builddir}.;;
+*)
+  case ${ac_top_builddir}. in
+  .) ac_abs_top_builddir=$ac_abs_builddir;;
+  [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;;
+  *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;;
+  esac;;
+esac
+case $ac_abs_builddir in
+.) ac_abs_srcdir=$ac_srcdir;;
+*)
+  case $ac_srcdir in
+  .) ac_abs_srcdir=$ac_abs_builddir;;
+  [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;;
+  *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;;
+  esac;;
+esac
+case $ac_abs_builddir in
+.) ac_abs_top_srcdir=$ac_top_srcdir;;
+*)
+  case $ac_top_srcdir in
+  .) ac_abs_top_srcdir=$ac_abs_builddir;;
+  [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;;
+  *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;;
+  esac;;
+esac
 
     cd $ac_dir
     # Check for guested configure; otherwise get Cygnus style configure.
@@ -926,7 +925,7 @@ ac_abs_top_srcdir=`cd "$ac_dir" && cd $ac_top_srcdir && pwd`
       echo
       $SHELL $ac_srcdir/configure  --help=recursive
     elif test -f $ac_srcdir/configure.ac ||
-           test -f $ac_srcdir/configure.in; then
+          test -f $ac_srcdir/configure.in; then
       echo
       $ac_configure --help
     else
@@ -940,10 +939,9 @@ test -n "$ac_init_help" && exit 0
 if $ac_init_version; then
   cat <<\_ACEOF
 orte configure 0.2.0
-generated by GNU Autoconf 2.57
+generated by GNU Autoconf 2.59
 
-Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002
-Free Software Foundation, Inc.
+Copyright (C) 2003 Free Software Foundation, Inc.
 This configure script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it.
 _ACEOF
@@ -955,7 +953,7 @@ This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
 It was created by orte $as_me 0.2.0, which was
-generated by GNU Autoconf 2.57.  Invocation command line was
+generated by GNU Autoconf 2.59.  Invocation command line was
 
   $ $0 $@
 
@@ -1032,19 +1030,19 @@ do
     2)
       ac_configure_args1="$ac_configure_args1 '$ac_arg'"
       if test $ac_must_keep_next = true; then
-        ac_must_keep_next=false # Got value, back to normal.
+       ac_must_keep_next=false # Got value, back to normal.
       else
-        case $ac_arg in
-          *=* | --config-cache | -C | -disable-* | --disable-* \
-          | -enable-* | --enable-* | -gas | --g* | -nfp | --nf* \
-          | -q | -quiet | --q* | -silent | --sil* | -v | -verb* \
-          | -with-* | --with-* | -without-* | --without-* | --x)
-            case "$ac_configure_args0 " in
-              "$ac_configure_args1"*" '$ac_arg' "* ) continue ;;
-            esac
-            ;;
-          -* ) ac_must_keep_next=true ;;
-        esac
+       case $ac_arg in
+         *=* | --config-cache | -C | -disable-* | --disable-* \
+         | -enable-* | --enable-* | -gas | --g* | -nfp | --nf* \
+         | -q | -quiet | --q* | -silent | --sil* | -v | -verb* \
+         | -with-* | --with-* | -without-* | --without-* | --x)
+           case "$ac_configure_args0 " in
+             "$ac_configure_args1"*" '$ac_arg' "* ) continue ;;
+           esac
+           ;;
+         -* ) ac_must_keep_next=true ;;
+       esac
       fi
       ac_configure_args="$ac_configure_args$ac_sep'$ac_arg'"
       # Get rid of the leading space.
@@ -1078,12 +1076,12 @@ _ASBOX
     case `(ac_space='"'"' '"'"'; set | grep ac_space) 2>&1` in
     *ac_space=\ *)
       sed -n \
-        "s/'"'"'/'"'"'\\\\'"'"''"'"'/g;
-         s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='"'"'\\2'"'"'/p"
+       "s/'"'"'/'"'"'\\\\'"'"''"'"'/g;
+         s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='"'"'\\2'"'"'/p"
       ;;
     *)
       sed -n \
-        "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
+       "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
       ;;
     esac;
 }
@@ -1112,7 +1110,7 @@ _ASBOX
       for ac_var in $ac_subst_files
       do
        eval ac_val=$`echo $ac_var`
-        echo "$ac_var='"'"'$ac_val'"'"'"
+       echo "$ac_var='"'"'$ac_val'"'"'"
       done | sort
       echo
     fi
@@ -1131,7 +1129,7 @@ _ASBOX
       echo "$as_me: caught signal $ac_signal"
     echo "$as_me: exit $exit_status"
   } >&5
-  rm -f core core.* *.core &&
+  rm -f core *.core &&
   rm -rf conftest* confdefs* conf$$* $ac_clean_files &&
     exit $exit_status
      ' 0
@@ -1211,7 +1209,7 @@ fi
 # value.
 ac_cache_corrupted=false
 for ac_var in `(set) 2>&1 |
-               sed -n 's/^ac_env_\([a-zA-Z_0-9]*\)_set=.*/\1/p'`; do
+              sed -n 's/^ac_env_\([a-zA-Z_0-9]*\)_set=.*/\1/p'`; do
   eval ac_old_set=\$ac_cv_env_${ac_var}_set
   eval ac_new_set=\$ac_env_${ac_var}_set
   eval ac_old_val="\$ac_cv_env_${ac_var}_value"
@@ -1228,13 +1226,13 @@ echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
     ,);;
     *)
       if test "x$ac_old_val" != "x$ac_new_val"; then
-        { echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5
+       { echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5
 echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
-        { echo "$as_me:$LINENO:   former value:  $ac_old_val" >&5
+       { echo "$as_me:$LINENO:   former value:  $ac_old_val" >&5
 echo "$as_me:   former value:  $ac_old_val" >&2;}
-        { echo "$as_me:$LINENO:   current value: $ac_new_val" >&5
+       { echo "$as_me:$LINENO:   current value: $ac_new_val" >&5
 echo "$as_me:   current value: $ac_new_val" >&2;}
-        ac_cache_corrupted=:
+       ac_cache_corrupted=:
       fi;;
   esac
   # Pass precious variables to config.status.
@@ -1417,6 +1415,7 @@ am__api_version="1.6"
 # AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag
 # AFS /usr/afsws/bin/install, which mishandles nonexistent args
 # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
+# OS/2's system install, which has a completely different semantic
 # ./install, which can be erroneously created by make from ./install.sh.
 echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5
 echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6
@@ -1433,6 +1432,7 @@ do
 case $as_dir/ in
   ./ | .// | /cC/* | \
   /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \
+  ?:\\/os2\\/install\\/* | ?:\\/OS2\\/INSTALL\\/* | \
   /usr/ucb/* ) ;;
   *)
     # OSF1 and SCO ODT 3.0 have their own names for install.
@@ -1440,20 +1440,20 @@ case $as_dir/ in
     # by default.
     for ac_prog in ginstall scoinst install; do
       for ac_exec_ext in '' $ac_executable_extensions; do
-        if $as_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then
-          if test $ac_prog = install &&
-            grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
-            # AIX install.  It has an incompatible calling convention.
-            :
-          elif test $ac_prog = install &&
-            grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
-            # program-specific install script used by HP pwplus--don't use.
-            :
-          else
-            ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c"
-            break 3
-          fi
-        fi
+       if $as_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then
+         if test $ac_prog = install &&
+           grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
+           # AIX install.  It has an incompatible calling convention.
+           :
+         elif test $ac_prog = install &&
+           grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
+           # program-specific install script used by HP pwplus--don't use.
+           :
+         else
+           ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c"
+           break 3
+         fi
+       fi
       done
     done
     ;;
@@ -1597,7 +1597,7 @@ done
 
 echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5
 echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6
-set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y,./+-,__p_,'`
+set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y,:./+-,___p_,'`
 if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -1789,6 +1789,7 @@ fi
 
 
 
+
 # Check whether --with-linuxdir or --without-linuxdir was given.
 if test "${with_linuxdir+set}" = set; then
   withval="$with_linuxdir"
@@ -1797,80 +1798,6 @@ else
   LINUX_DIR=default
 fi;
 
-       if test "${LINUX_DIR}" != "default" ; then
-               echo "$as_me:$LINENO: checking for Linux in ${LINUX_DIR}" >&5
-echo $ECHO_N "checking for Linux in ${LINUX_DIR}... $ECHO_C" >&6
-
-       if test -f "${LINUX_DIR}/Makefile" ; then
-               result=yes
-
-       else
-               result="not found"
-               { { echo "$as_me:$LINENO: error: Linux dir not found" >&5
-echo "$as_me: error: Linux dir not found" >&2;}
-   { (exit 1); exit 1; }; }
-       fi
-
-       echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6
-
-       fi
-
-       if test "${LINUX_DIR}" = "default" ; then
-               dir="/lib/modules/`uname -r`/build";
-               echo "$as_me:$LINENO: checking for Linux in ${dir}" >&5
-echo $ECHO_N "checking for Linux in ${dir}... $ECHO_C" >&6
-
-       if test -f "${dir}/Makefile" ; then
-               result=yes
-               LINUX_DIR=${dir}
-       else
-               result="not found"
-
-       fi
-
-       echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6
-
-       fi
-       if test "${LINUX_DIR}" = "default" ; then
-               dir="../linux";
-               echo "$as_me:$LINENO: checking for Linux in ${dir}" >&5
-echo $ECHO_N "checking for Linux in ${dir}... $ECHO_C" >&6
-
-       if test -f "${dir}/Makefile" ; then
-               result=yes
-               LINUX_DIR=${dir}
-       else
-               result="not found"
-
-       fi
-
-       echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6
-
-       fi
-       if test "${LINUX_DIR}" = "default" ; then
-               dir="/usr/src/linux";
-               echo "$as_me:$LINENO: checking for Linux in ${dir}" >&5
-echo $ECHO_N "checking for Linux in ${dir}... $ECHO_C" >&6
-
-       if test -f "${dir}/Makefile" ; then
-               result=yes
-               LINUX_DIR=${dir}
-       else
-               result="not found"
-
-       fi
-
-       echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6
-
-       fi
-
-#      if test "${LINUX_DIR}" = "default" ; then
-#              AC_MSG_ERROR([Linux source directory not found])
-#      fi
 
 
 
@@ -2026,14 +1953,37 @@ echo "$as_me: error: Unknown Linux major.minor $LINUX_VERSION_MAJOR.$LINUX_VERSI
    { (exit 1); exit 1; }; }
                ;;
          esac
+
+         CONFIG_ORTE_KERNEL=yes
+
+cat >>confdefs.h <<\_ACEOF
+#define CONFIG_ORTE_KERNEL 1
+_ACEOF
+
+
        else
           echo "$as_me:$LINENO: result: \"none\"" >&5
 echo "${ECHO_T}\"none\"" >&6
+
+         CONFIG_ORTE_KERNEL=no
+
        fi
 
 
 
 
+if test ${CONFIG_ORTE_KERNEL} == "yes"; then
+  CONFIG_ORTE_KERNEL_TRUE=
+  CONFIG_ORTE_KERNEL_FALSE='#'
+else
+  CONFIG_ORTE_KERNEL_TRUE='#'
+  CONFIG_ORTE_KERNEL_FALSE=
+fi
+
+
+
+
+
 # Check whether --with-rtaidir or --without-rtaidir was given.
 if test "${with_rtaidir+set}" = set; then
   withval="$with_rtaidir"
@@ -2090,6 +2040,8 @@ echo "$as_me: error: incorrect RTAI directory?" >&2;}
                        fi
                fi
                USE_RTAI=yes
+                RT_GCCLIB_DIR=`gcc -print-search-dirs | sed -n -e 's/^install: \(.*\)$/\1/p'`
+               RTAI_CFLAGS="${RTAI_CFLAGS} -I${RT_GCCLIB_DIR}/include -nostdinc"
                echo "$as_me:$LINENO: result: found" >&5
 echo "${ECHO_T}found" >&6
 
@@ -2108,9 +2060,18 @@ _ACEOF
 # Check whether --with-rtlinuxdir or --without-rtlinuxdir was given.
 if test "${with_rtlinuxdir+set}" = set; then
   withval="$with_rtlinuxdir"
-  RTL_DIR="${withval}"
+  RTLINUX_DIR="${withval}"
 else
-  RTL_DIR=/usr/src/rtlinux
+  RTLINUX_DIR=/usr/src/rtlinux
+fi;
+
+
+# Check whether --with-rtlinuxudpdir or --without-rtlinuxudpdir was given.
+if test "${with_rtlinuxudpdir+set}" = set; then
+  withval="$with_rtlinuxudpdir"
+  RTLINUXUDP_DIR="${withval}"
+else
+  RTLINUXUDP_DIR="${RTLINUX_DIR}"
 fi;
 
 
@@ -2147,10 +2108,10 @@ fi
 
 
        if test "${CONFIG_RTLINUX}" != "no" ; then
-               echo "$as_me:$LINENO: checking RTLinux directory ${RTL_DIR} for rtl.mk" >&5
-echo $ECHO_N "checking RTLinux directory ${RTL_DIR} for rtl.mk... $ECHO_C" >&6
-               if [ -d ${RTL_DIR}/include ] ; then
-                        RTLINUX_CFLAGS=`sed -n -e 's/^CFLAGS *=\(.*\)$/\1/p' ${RTL_DIR}/rtl.mk`
+               echo "$as_me:$LINENO: checking RTLinux directory ${RTLINUX_DIR} for rtl.mk" >&5
+echo $ECHO_N "checking RTLinux directory ${RTLINUX_DIR} for rtl.mk... $ECHO_C" >&6
+               if [ -d ${RTLINUX_DIR}/include ] ; then
+                        RTLINUX_CFLAGS=`sed -n -e 's/^CFLAGS *=\(.*\)$/\1/p' ${RTLINUX_DIR}/rtl.mk`
                else
                        { { echo "$as_me:$LINENO: error: incorrect RTLinux directory?" >&5
 echo "$as_me: error: incorrect RTLinux directory?" >&2;}
@@ -2163,6 +2124,21 @@ cat >>confdefs.h <<\_ACEOF
 #define CONFIG_ORTE_RTL 1
 _ACEOF
 
+               echo "$as_me:$LINENO: checking RTLinux for UDP" >&5
+echo $ECHO_N "checking RTLinux for UDP... $ECHO_C" >&6
+                if [ ! -e "${RTLINUXUDP_DIR}/include/udp.h" -o \
+                     ! -e "${RTLINUXUDP_DIR}/include/nic.h" -o \
+                     ! -e "${RTLINUXUDP_DIR}/include/ip.h" -o \
+                     ! -e "${RTLINUXUDP_DIR}/include/ethernet.h" -o \
+                     ! -e "${RTLINUXUDP_DIR}/include/nictab.h" ] ; then
+                       { { echo "$as_me:$LINENO: error: incorrect RTLinux UDP directory!!!" >&5
+echo "$as_me: error: incorrect RTLinux UDP directory!!!" >&2;}
+   { (exit 1); exit 1; }; }
+               fi
+                RT_GCCLIB_DIR=`gcc -print-search-dirs | sed -n -e 's/^install: \(.*\)$/\1/p'`
+               RTLINUX_CFLAGS="${RTLINUX_CFLAGS} -I${RTLINUXUDP_DIR}/include -I${RT_GCCLIB_DIR}/include -nostdinc"
+               echo "$as_me:$LINENO: result: found" >&5
+echo "${ECHO_T}found" >&6
                USE_RTLINUX=yes
        else
                USE_RTLINUX=no
@@ -2223,6 +2199,53 @@ ORTE_VERSION=$ORTE_MAJOR_VERSION.$ORTE_MINOR_VERSION.$ORTE_MICRO_VERSION
 
 
 
+###############################
+# target
+WIN='no'
+UNIX='no'
+case "$target" in
+  *-cygwin* | *-mingw*)
+    CFLAGS="$CFLAGS"
+    WIN='yes'
+
+cat >>confdefs.h <<\_ACEOF
+#define CONFIG_ORTE_WIN 1
+_ACEOF
+
+    ;;
+  *)
+    # Assume Unix.
+    if test -z ${CONFIG_ORTE_RT} -a ${CONFIG_ORTE_KERNEL} ; then
+      UNIX='yes'
+
+cat >>confdefs.h <<\_ACEOF
+#define CONFIG_ORTE_UNIX 1
+_ACEOF
+
+    fi
+    ;;
+esac
+
+
+if test x$WIN = xyes; then
+  CONFIG_ORTE_WIN_TRUE=
+  CONFIG_ORTE_WIN_FALSE='#'
+else
+  CONFIG_ORTE_WIN_TRUE='#'
+  CONFIG_ORTE_WIN_FALSE=
+fi
+
+
+
+if test x$UNIX = xyes; then
+  CONFIG_ORTE_UNIX_TRUE=
+  CONFIG_ORTE_UNIX_FALSE='#'
+else
+  CONFIG_ORTE_UNIX_TRUE='#'
+  CONFIG_ORTE_UNIX_FALSE=
+fi
+
+
 ###############################
 # modules
 moduledir="\$(libdir)/modules/\$(LINUX_KERNELRELEASE)/orte"
@@ -2569,7 +2592,6 @@ ac_compiler=`set X $ac_compile; echo $2`
   (exit $ac_status); }
 
 cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -2589,8 +2611,8 @@ ac_clean_files="$ac_clean_files a.out a.exe b.out"
 # Try to create an executable without -o first, disregard a.out.
 # It will help us diagnose broken compilers, and finding out an intuition
 # of exeext.
-echo "$as_me:$LINENO: checking for C compiler default output" >&5
-echo $ECHO_N "checking for C compiler default output... $ECHO_C" >&6
+echo "$as_me:$LINENO: checking for C compiler default output file name" >&5
+echo $ECHO_N "checking for C compiler default output file name... $ECHO_C" >&6
 ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
 if { (eval echo "$as_me:$LINENO: \"$ac_link_default\"") >&5
   (eval $ac_link_default) 2>&5
@@ -2610,23 +2632,23 @@ do
   test -f "$ac_file" || continue
   case $ac_file in
     *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj )
-        ;;
+       ;;
     conftest.$ac_ext )
-        # This is the source file.
-        ;;
+       # This is the source file.
+       ;;
     [ab].out )
-        # We found the default executable, but exeext='' is most
-        # certainly right.
-        break;;
+       # We found the default executable, but exeext='' is most
+       # certainly right.
+       break;;
     *.* )
-        ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
-        # FIXME: I believe we export ac_cv_exeext for Libtool,
-        # but it would be cool to find out if it's true.  Does anybody
-        # maintain Libtool? --akim.
-        export ac_cv_exeext
-        break;;
+       ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
+       # FIXME: I believe we export ac_cv_exeext for Libtool,
+       # but it would be cool to find out if it's true.  Does anybody
+       # maintain Libtool? --akim.
+       export ac_cv_exeext
+       break;;
     * )
-        break;;
+       break;;
   esac
 done
 else
@@ -2700,8 +2722,8 @@ for ac_file in conftest.exe conftest conftest.*; do
   case $ac_file in
     *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj ) ;;
     *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
-          export ac_cv_exeext
-          break;;
+         export ac_cv_exeext
+         break;;
     * ) break;;
   esac
 done
@@ -2726,7 +2748,6 @@ if test "${ac_cv_objext+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -2777,7 +2798,6 @@ if test "${ac_cv_c_compiler_gnu+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -2797,11 +2817,21 @@ main ()
 _ACEOF
 rm -f conftest.$ac_objext
 if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>&5
+  (eval $ac_compile) 2>conftest.er1
   ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+        { ac_try='test -s conftest.$ac_objext'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -2814,7 +2844,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
 
 ac_compiler_gnu=no
 fi
-rm -f conftest.$ac_objext conftest.$ac_ext
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 ac_cv_c_compiler_gnu=$ac_compiler_gnu
 
 fi
@@ -2830,7 +2860,6 @@ if test "${ac_cv_prog_cc_g+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -2847,11 +2876,21 @@ main ()
 _ACEOF
 rm -f conftest.$ac_objext
 if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>&5
+  (eval $ac_compile) 2>conftest.er1
   ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+        { ac_try='test -s conftest.$ac_objext'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -2864,7 +2903,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
 
 ac_cv_prog_cc_g=no
 fi
-rm -f conftest.$ac_objext conftest.$ac_ext
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
 echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
 echo "${ECHO_T}$ac_cv_prog_cc_g" >&6
@@ -2891,7 +2930,6 @@ else
   ac_cv_prog_cc_stdc=no
 ac_save_CC=$CC
 cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -2919,6 +2957,16 @@ static char *f (char * (*g) (char **, int), char **p, ...)
   va_end (v);
   return s;
 }
+
+/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default.  It has
+   function prototypes and stuff, but not '\xHH' hex character constants.
+   These don't provoke an error unfortunately, instead are silently treated
+   as 'x'.  The following induces an error, until -std1 is added to get
+   proper ANSI mode.  Curiously '\x00'!='x' always comes out true, for an
+   array size at least.  It's necessary to write '\x00'==0 to get something
+   that's true only with -std1.  */
+int osf4_cc_array ['\x00' == 0 ? 1 : -1];
+
 int test (int i, double x);
 struct s1 {int (*f) (int a);};
 struct s2 {int (*f) (double a);};
@@ -2945,11 +2993,21 @@ do
   CC="$ac_save_CC $ac_arg"
   rm -f conftest.$ac_objext
 if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>&5
+  (eval $ac_compile) 2>conftest.er1
   ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+        { ac_try='test -s conftest.$ac_objext'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -2962,7 +3020,7 @@ else
 sed 's/^/| /' conftest.$ac_ext >&5
 
 fi
-rm -f conftest.$ac_objext
+rm -f conftest.err conftest.$ac_objext
 done
 rm -f conftest.$ac_ext conftest.$ac_objext
 CC=$ac_save_CC
@@ -2990,19 +3048,28 @@ cat >conftest.$ac_ext <<_ACEOF
 _ACEOF
 rm -f conftest.$ac_objext
 if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>&5
+  (eval $ac_compile) 2>conftest.er1
   ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+        { ac_try='test -s conftest.$ac_objext'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   for ac_declaration in \
-   ''\
-   '#include <stdlib.h>' \
+   '' \
    'extern "C" void std::exit (int) throw (); using std::exit;' \
    'extern "C" void std::exit (int); using std::exit;' \
    'extern "C" void exit (int) throw ();' \
@@ -3010,14 +3077,13 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
    'void exit (int);'
 do
   cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
-#include <stdlib.h>
 $ac_declaration
+#include <stdlib.h>
 int
 main ()
 {
@@ -3028,11 +3094,21 @@ exit (42);
 _ACEOF
 rm -f conftest.$ac_objext
 if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>&5
+  (eval $ac_compile) 2>conftest.er1
   ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+        { ac_try='test -s conftest.$ac_objext'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -3045,9 +3121,8 @@ sed 's/^/| /' conftest.$ac_ext >&5
 
 continue
 fi
-rm -f conftest.$ac_objext conftest.$ac_ext
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
   cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -3064,11 +3139,21 @@ exit (42);
 _ACEOF
 rm -f conftest.$ac_objext
 if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>&5
+  (eval $ac_compile) 2>conftest.er1
   ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+        { ac_try='test -s conftest.$ac_objext'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -3080,7 +3165,7 @@ else
 sed 's/^/| /' conftest.$ac_ext >&5
 
 fi
-rm -f conftest.$ac_objext conftest.$ac_ext
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 done
 rm -f conftest*
 if test -n "$ac_declaration"; then
@@ -3094,7 +3179,7 @@ else
 sed 's/^/| /' conftest.$ac_ext >&5
 
 fi
-rm -f conftest.$ac_objext conftest.$ac_ext
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -3325,7 +3410,7 @@ fi
 
 
 ###############################
-# Checks for libraries (no for RT)
+# Checks for libraries (not for RT)
 if test -z ${CONFIG_ORTE_RT} ; then
 
 
@@ -3337,7 +3422,6 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lws2_32  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -3355,11 +3439,21 @@ main ();
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
 if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
+  (eval $ac_link) 2>conftest.er1
   ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+        { ac_try='test -s conftest$ac_exeext'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -3372,7 +3466,8 @@ sed 's/^/| /' conftest.$ac_ext >&5
 
 ac_cv_lib_ws2_32_main=no
 fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.err conftest.$ac_objext \
+      conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
 echo "$as_me:$LINENO: result: $ac_cv_lib_ws2_32_main" >&5
@@ -3395,7 +3490,6 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lpthread  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -3413,11 +3507,21 @@ main ();
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
 if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
+  (eval $ac_link) 2>conftest.er1
   ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+        { ac_try='test -s conftest$ac_exeext'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -3430,7 +3534,8 @@ sed 's/^/| /' conftest.$ac_ext >&5
 
 ac_cv_lib_pthread_main=no
 fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.err conftest.$ac_objext \
+      conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
 echo "$as_me:$LINENO: result: $ac_cv_lib_pthread_main" >&5
@@ -3446,10 +3551,31 @@ fi
 
 fi
 
+###############################
+# enable GNU source
+
+
+
+###############################
+# CFLAGS
+CFLAGS="$CFLAGS -Wall"
+if test ${USE_RTLINUX} == 'yes' ; then
+  CFLAGS="$CFLAGS $RTLINUX_CFLAGS"
+else
+  if test ${USE_RTAI} == 'yes' ; then
+    CFLAGS="$CFLAGS $RTAI_CFLAGS $LINUX_CFLAGS"
+  else
+    if test -n ${CONFIG_ORTE_KERNEL} ; then
+      CFLAGS="$CFLAGS $LINUX_CFLAGS"
+    fi
+  fi
+fi
+
 ###############################
 # Checks for header files.
-if test -z ${CONFIG_ORTE_RT} ; then
-ac_ext=c
+# user space
+if test ${UNIX} == 'yes' -o ${WIN} == 'yes' ; then
+    ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
@@ -3477,7 +3603,6 @@ do
   # On the NeXT, cc -E runs the code through the compiler's parser,
   # not just through cpp. "Syntax error" is here to catch this case.
   cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -3488,7 +3613,7 @@ cat >>conftest.$ac_ext <<_ACEOF
 #else
 # include <assert.h>
 #endif
-                     Syntax error
+                    Syntax error
 _ACEOF
 if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
@@ -3500,6 +3625,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
+    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
   else
     ac_cpp_err=
   fi
@@ -3520,7 +3646,6 @@ rm -f conftest.err conftest.$ac_ext
   # OK, works on sane cases.  Now check whether non-existent headers
   # can be detected and how.
   cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -3538,6 +3663,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
+    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
   else
     ac_cpp_err=
   fi
@@ -3584,7 +3710,6 @@ do
   # On the NeXT, cc -E runs the code through the compiler's parser,
   # not just through cpp. "Syntax error" is here to catch this case.
   cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -3595,7 +3720,7 @@ cat >>conftest.$ac_ext <<_ACEOF
 #else
 # include <assert.h>
 #endif
-                     Syntax error
+                    Syntax error
 _ACEOF
 if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
@@ -3607,6 +3732,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
+    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
   else
     ac_cpp_err=
   fi
@@ -3627,7 +3753,6 @@ rm -f conftest.err conftest.$ac_ext
   # OK, works on sane cases.  Now check whether non-existent headers
   # can be detected and how.
   cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -3645,6 +3770,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
+    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
   else
     ac_cpp_err=
   fi
@@ -3705,7 +3831,6 @@ if test "${ac_cv_header_stdc+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -3726,11 +3851,21 @@ main ()
 _ACEOF
 rm -f conftest.$ac_objext
 if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>&5
+  (eval $ac_compile) 2>conftest.er1
   ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+        { ac_try='test -s conftest.$ac_objext'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -3743,12 +3878,11 @@ sed 's/^/| /' conftest.$ac_ext >&5
 
 ac_cv_header_stdc=no
 fi
-rm -f conftest.$ac_objext conftest.$ac_ext
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 
 if test $ac_cv_header_stdc = yes; then
   # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
   cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -3770,7 +3904,6 @@ fi
 if test $ac_cv_header_stdc = yes; then
   # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
   cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -3795,7 +3928,6 @@ if test $ac_cv_header_stdc = yes; then
   :
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -3807,9 +3939,9 @@ cat >>conftest.$ac_ext <<_ACEOF
 # define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
 #else
 # define ISLOWER(c) \
-                   (('a' <= (c) && (c) <= 'i') \
-                     || ('j' <= (c) && (c) <= 'r') \
-                     || ('s' <= (c) && (c) <= 'z'))
+                  (('a' <= (c) && (c) <= 'i') \
+                    || ('j' <= (c) && (c) <= 'r') \
+                    || ('s' <= (c) && (c) <= 'z'))
 # define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c))
 #endif
 
@@ -3820,7 +3952,7 @@ main ()
   int i;
   for (i = 0; i < 256; i++)
     if (XOR (islower (i), ISLOWER (i))
-        || toupper (i) != TOUPPER (i))
+       || toupper (i) != TOUPPER (i))
       exit(2);
   exit (0);
 }
@@ -3845,7 +3977,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
 ( exit $ac_status )
 ac_cv_header_stdc=no
 fi
-rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 fi
 fi
@@ -3859,7 +3991,6 @@ _ACEOF
 
 fi
 
-# On IRIX 5.3, sys/types and inttypes.h are conflicting.
 
 
 
@@ -3869,8 +4000,22 @@ fi
 
 
 
-for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
-                  inttypes.h stdint.h unistd.h
+
+
+
+
+
+
+
+
+
+
+
+for ac_header in \
+    arpa/inet.h fcntl.h stdio.h netdb.h netinet/in.h stdlib.h \
+    string.h sys/ioctl.h sys/socket.h sys/time.h unistd.h pthread.h \
+    stdarg.h sys/types.h net/if.h byteswap.h getopt.h \
+    ctype.h semaphore.h signal.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
 echo "$as_me:$LINENO: checking for $ac_header" >&5
@@ -3879,23 +4024,32 @@ if eval "test \"\${$as_ac_Header+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
-$ac_includes_default
+
 
 #include <$ac_header>
 _ACEOF
 rm -f conftest.$ac_objext
 if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>&5
+  (eval $ac_compile) 2>conftest.er1
   ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+        { ac_try='test -s conftest.$ac_objext'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -3908,7 +4062,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
 
 eval "$as_ac_Header=no"
 fi
-rm -f conftest.$ac_objext conftest.$ac_ext
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
 echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
 echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
@@ -3921,15 +4075,76 @@ fi
 
 done
 
+fi
+# win32
+if test ${WIN} == 'yes' ; then
 
 
 
+for ac_header in \
+    winsock2.h ws2tcpip.h windows.h
+do
+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+echo "$as_me:$LINENO: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+if eval "test \"\${$as_ac_Header+set}\" = set"; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
 
 
+#include <$ac_header>
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+        { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  eval "$as_ac_Header=yes"
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
 
+eval "$as_ac_Header=no"
+fi
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
+if test `eval echo '${'$as_ac_Header'}'` = yes; then
+  cat >>confdefs.h <<_ACEOF
+#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+_ACEOF
 
+fi
 
+done
 
+fi
+# kernel
+if test ${CONFIG_ORTE_KERNEL} == 'yes' ; then
 
 
 
@@ -3938,148 +4153,266 @@ done
 
 
 
+for ac_header in \
+    asm/byteorder.h linux/ctype.h linux/string.h \
+    linux/module.h linux/if.h linux/socket.h \
+    linux/time.h linux/types.h
+do
+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+echo "$as_me:$LINENO: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+if eval "test \"\${$as_ac_Header+set}\" = set"; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
 
 
+#include <$ac_header>
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+        { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  eval "$as_ac_Header=yes"
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
 
+eval "$as_ac_Header=no"
+fi
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
+if test `eval echo '${'$as_ac_Header'}'` = yes; then
+  cat >>confdefs.h <<_ACEOF
+#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+_ACEOF
 
+fi
+
+done
 
 
-
-for ac_header in arpa/inet.h fcntl.h stdio.h netdb.h netinet/in.h stdlib.h \
-string.h sys/ioctl.h sys/socket.h sys/time.h unistd.h pthread.h \
-stdarg.h getopt.h sys/types.h net/if.h byteswap.h signal.h errno.h \
-ctype.h sys/stat.h winsock2.h ws2tcpip.h
+for ac_header in linux/in.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
-  echo "$as_me:$LINENO: checking for $ac_header" >&5
+echo "$as_me:$LINENO: checking for $ac_header" >&5
 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
 if eval "test \"\${$as_ac_Header+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
-fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
 else
-  # Is the header compilable?
-echo "$as_me:$LINENO: checking $ac_header usability" >&5
-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
-cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
+  cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
-$ac_includes_default
+
+    #ifdef HAVE_LINUX_SOCKET_H
+      #include <linux/socket.h>
+    #endif
+
+
 #include <$ac_header>
 _ACEOF
 rm -f conftest.$ac_objext
 if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>&5
+  (eval $ac_compile) 2>conftest.er1
   ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+        { ac_try='test -s conftest.$ac_objext'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  ac_header_compiler=yes
+  eval "$as_ac_Header=yes"
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-ac_header_compiler=no
+eval "$as_ac_Header=no"
 fi
-rm -f conftest.$ac_objext conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
+if test `eval echo '${'$as_ac_Header'}'` = yes; then
+  cat >>confdefs.h <<_ACEOF
+#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+_ACEOF
 
-# Is the header present?
-echo "$as_me:$LINENO: checking $ac_header presence" >&5
-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
-cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
+fi
+
+done
+
+fi
+# RTLinux
+if test ${USE_RTLINUX} == 'yes' ; then
+
+
+
+
+
+
+
+
+for ac_header in \
+    string.h pthread.h semaphore.h \
+    rtl.h rtl_malloc.h udp.h nic.h time.h
+do
+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+echo "$as_me:$LINENO: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+if eval "test \"\${$as_ac_Header+set}\" = set"; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
+
+
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_c_preproc_warn_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
-  ac_header_preproc=yes
+  (exit $ac_status); } &&
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+        { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  eval "$as_ac_Header=yes"
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-  ac_header_preproc=no
+eval "$as_ac_Header=no"
 fi
-rm -f conftest.err conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6
-
-# So?  What about this header?
-case $ac_header_compiler:$ac_header_preproc in
-  yes:no )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-    (
-      cat <<\_ASBOX
-## ------------------------------------ ##
-## Report this to bug-autoconf@gnu.org. ##
-## ------------------------------------ ##
-_ASBOX
-    ) |
-      sed "s/^/$as_me: WARNING:     /" >&2
-    ;;
-  no:yes )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-    (
-      cat <<\_ASBOX
-## ------------------------------------ ##
-## Report this to bug-autoconf@gnu.org. ##
-## ------------------------------------ ##
-_ASBOX
-    ) |
-      sed "s/^/$as_me: WARNING:     /" >&2
-    ;;
-esac
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
+if test `eval echo '${'$as_ac_Header'}'` = yes; then
+  cat >>confdefs.h <<_ACEOF
+#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+_ACEOF
+
+fi
+
+done
+
+
+for ac_header in nictab.h
+do
+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
 echo "$as_me:$LINENO: checking for $ac_header" >&5
 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
 if eval "test \"\${$as_ac_Header+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-  eval "$as_ac_Header=$ac_header_preproc"
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+    #ifdef HAVE_UDP_H
+      #include <udp.h>
+    #endif
+    #ifdef HAVE_NIC_H
+      #include <nic.h>
+    #endif
+
+
+#include <$ac_header>
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+        { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  eval "$as_ac_Header=yes"
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+eval "$as_ac_Header=no"
+fi
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
 echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
 echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-
-fi
 if test `eval echo '${'$as_ac_Header'}'` = yes; then
   cat >>confdefs.h <<_ACEOF
 #define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
@@ -4090,56 +4423,76 @@ fi
 done
 
 fi
-###############################
-# includes
-case "$target" in
-  *-cygwin* | *-mingw*)
-    INCLUDES='-I$(top_srcdir)/orte/include -I$(top_srcdir)/orte/include/win32'
-    WIN='yes'
+# RTAI
+if test ${USE_RTAI} == 'yes' ; then
 
-cat >>confdefs.h <<\_ACEOF
-#define CONFIG_ORTE_WIN 1
+for ac_header in \
+    rtnet.h
+do
+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+echo "$as_me:$LINENO: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+if eval "test \"\${$as_ac_Header+set}\" = set"; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
 _ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
 
-    ;;
-  *)
-    # Assume Unix.
-    if test ${USE_RTLINUX} == "yes" ; then
-      INCLUDES='-I$(top_srcdir)/orte/include -I$(top_srcdir)/orte/include/rtl -I$(top_srcdir)/orte/contrib/RTL_UDP/include'
-    elif test ${USE_RTAI} == "yes" ; then
-      INCLUDES='-I$(top_srcdir)/orte/include -I$(top_srcdir)/orte/include/rtai'
-    else
-      INCLUDES='-I$(top_srcdir)/orte/include'
-      UNIX='yes'
 
-cat >>confdefs.h <<\_ACEOF
-#define CONFIG_ORTE_UNIX 1
+#include <$ac_header>
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+        { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  eval "$as_ac_Header=yes"
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+eval "$as_ac_Header=no"
+fi
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
+if test `eval echo '${'$as_ac_Header'}'` = yes; then
+  cat >>confdefs.h <<_ACEOF
+#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
 
-    fi
-    ;;
-esac
-
-
-
-if test x$WIN = xyes; then
-  CONFIG_ORTE_WIN_TRUE=
-  CONFIG_ORTE_WIN_FALSE='#'
-else
-  CONFIG_ORTE_WIN_TRUE='#'
-  CONFIG_ORTE_WIN_FALSE=
 fi
 
+done
 
-
-if test x$UNIX = xyes; then
-  CONFIG_ORTE_UNIX_TRUE=
-  CONFIG_ORTE_UNIX_FALSE='#'
-else
-  CONFIG_ORTE_UNIX_TRUE='#'
-  CONFIG_ORTE_UNIX_FALSE=
 fi
 
+###############################
+# includes
+INCLUDES='-I$(top_srcdir)/orte/include'
+
 
 ###############################
 # Checks for typedefs, structures, and compiler characteristics.
@@ -4150,7 +4503,6 @@ if test "${ac_cv_c_bigendian+set}" = set; then
 else
   # See if sys/param.h defines the BYTE_ORDER macro.
 cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -4172,11 +4524,21 @@ main ()
 _ACEOF
 rm -f conftest.$ac_objext
 if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>&5
+  (eval $ac_compile) 2>conftest.er1
   ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+        { ac_try='test -s conftest.$ac_objext'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -4184,7 +4546,6 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   (exit $ac_status); }; }; then
   # It does; now see whether it defined to BIG_ENDIAN or not.
 cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -4206,11 +4567,21 @@ main ()
 _ACEOF
 rm -f conftest.$ac_objext
 if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>&5
+  (eval $ac_compile) 2>conftest.er1
   ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+        { ac_try='test -s conftest.$ac_objext'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -4223,7 +4594,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
 
 ac_cv_c_bigendian=no
 fi
-rm -f conftest.$ac_objext conftest.$ac_ext
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
@@ -4233,7 +4604,6 @@ if test "$cross_compiling" = yes; then
   # try to guess the endianness by grepping values into an object file
   ac_cv_c_bigendian=unknown
   cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -4255,11 +4625,21 @@ main ()
 _ACEOF
 rm -f conftest.$ac_objext
 if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>&5
+  (eval $ac_compile) 2>conftest.er1
   ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+        { ac_try='test -s conftest.$ac_objext'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -4281,10 +4661,9 @@ else
 sed 's/^/| /' conftest.$ac_ext >&5
 
 fi
-rm -f conftest.$ac_objext conftest.$ac_ext
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -4323,10 +4702,10 @@ sed 's/^/| /' conftest.$ac_ext >&5
 ( exit $ac_status )
 ac_cv_c_bigendian=yes
 fi
-rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 fi
-rm -f conftest.$ac_objext conftest.$ac_ext
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
 echo "$as_me:$LINENO: result: $ac_cv_c_bigendian" >&5
 echo "${ECHO_T}$ac_cv_c_bigendian" >&6
@@ -4353,7 +4732,6 @@ if test "${ac_cv_c_const+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -4416,11 +4794,21 @@ main ()
 _ACEOF
 rm -f conftest.$ac_objext
 if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>&5
+  (eval $ac_compile) 2>conftest.er1
   ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+        { ac_try='test -s conftest.$ac_objext'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -4433,7 +4821,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
 
 ac_cv_c_const=no
 fi
-rm -f conftest.$ac_objext conftest.$ac_ext
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
 echo "$as_me:$LINENO: result: $ac_cv_c_const" >&5
 echo "${ECHO_T}$ac_cv_c_const" >&6
@@ -4453,7 +4841,6 @@ else
   ac_cv_c_inline=no
 for ac_kw in inline __inline__ __inline; do
   cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -4468,11 +4855,21 @@ $ac_kw foo_t foo () {return 0; }
 _ACEOF
 rm -f conftest.$ac_objext
 if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>&5
+  (eval $ac_compile) 2>conftest.er1
   ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+        { ac_try='test -s conftest.$ac_objext'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -4484,139 +4881,29 @@ else
 sed 's/^/| /' conftest.$ac_ext >&5
 
 fi
-rm -f conftest.$ac_objext conftest.$ac_ext
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 done
 
 fi
 echo "$as_me:$LINENO: result: $ac_cv_c_inline" >&5
 echo "${ECHO_T}$ac_cv_c_inline" >&6
+
+
 case $ac_cv_c_inline in
   inline | yes) ;;
-  no)
-cat >>confdefs.h <<\_ACEOF
-#define inline
-_ACEOF
- ;;
-  *)  cat >>confdefs.h <<_ACEOF
-#define inline $ac_cv_c_inline
+  *)
+    case $ac_cv_c_inline in
+      no) ac_val=;;
+      *) ac_val=$ac_cv_c_inline;;
+    esac
+    cat >>confdefs.h <<_ACEOF
+#ifndef __cplusplus
+#define inline $ac_val
+#endif
 _ACEOF
- ;;
   ;;
 esac
 
-echo "$as_me:$LINENO: checking for pid_t" >&5
-echo $ECHO_N "checking for pid_t... $ECHO_C" >&6
-if test "${ac_cv_type_pid_t+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-int
-main ()
-{
-if ((pid_t *) 0)
-  return 0;
-if (sizeof (pid_t))
-  return 0;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_type_pid_t=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_type_pid_t=no
-fi
-rm -f conftest.$ac_objext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: $ac_cv_type_pid_t" >&5
-echo "${ECHO_T}$ac_cv_type_pid_t" >&6
-if test $ac_cv_type_pid_t = yes; then
-  :
-else
-
-cat >>confdefs.h <<_ACEOF
-#define pid_t int
-_ACEOF
-
-fi
-
-echo "$as_me:$LINENO: checking for size_t" >&5
-echo $ECHO_N "checking for size_t... $ECHO_C" >&6
-if test "${ac_cv_type_size_t+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-int
-main ()
-{
-if ((size_t *) 0)
-  return 0;
-if (sizeof (size_t))
-  return 0;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_type_size_t=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_type_size_t=no
-fi
-rm -f conftest.$ac_objext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: $ac_cv_type_size_t" >&5
-echo "${ECHO_T}$ac_cv_type_size_t" >&6
-if test $ac_cv_type_size_t = yes; then
-  :
-else
-
-cat >>confdefs.h <<_ACEOF
-#define size_t unsigned
-_ACEOF
-
-fi
-
 
 ###############################
 # Checks for library functions.
@@ -4628,7 +4915,6 @@ if test "${ac_cv_prog_gcc_traditional+set}" = set; then
 else
     ac_pattern="Autoconf.*'x'"
   cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -4648,7 +4934,6 @@ rm -f conftest*
 
   if test $ac_cv_prog_gcc_traditional = no; then
     cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -4672,8 +4957,10 @@ echo "${ECHO_T}$ac_cv_prog_gcc_traditional" >&6
   fi
 fi
 
+if test -z ${CONFIG_ORTE_RT} ; then
+
 
-for ac_func in strdup
+for ac_func in strdup gethostbyname
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
 echo "$as_me:$LINENO: checking for $ac_func" >&5
@@ -4682,21 +4969,28 @@ if eval "test \"\${$as_ac_var+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
+/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
+   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
+#define $ac_func innocuous_$ac_func
+
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.
     Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
     <limits.h> exists even on freestanding compilers.  */
+
 #ifdef __STDC__
 # include <limits.h>
 #else
 # include <assert.h>
 #endif
+
+#undef $ac_func
+
 /* Override any gcc2 internal prototype to avoid an error.  */
 #ifdef __cplusplus
 extern "C"
@@ -4727,11 +5021,21 @@ return f != $ac_func;
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
 if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
+  (eval $ac_link) 2>conftest.er1
   ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+        { ac_try='test -s conftest$ac_exeext'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -4744,7 +5048,8 @@ sed 's/^/| /' conftest.$ac_ext >&5
 
 eval "$as_ac_var=no"
 fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.err conftest.$ac_objext \
+      conftest$ac_exeext conftest.$ac_ext
 fi
 echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
 echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
@@ -4756,13 +5061,9 @@ _ACEOF
 fi
 done
 
+fi
 
-###############################
-# Add obsolute directory for header files
-CFLAGS="$CFLAGS -Wall"
-
-                                                                                                    ac_config_files="$ac_config_files Makefile orte/Makefile orte/liborte/Makefile orte/liborte/rtl/Makefile orte/examples/Makefile orte/examples/hello/Makefile orte/examples/reliable/Makefile orte/examples/ORTEPing/Makefile orte/examples/ORTESpy/Makefile orte/manager/Makefile"
-
+                                                                                                    ac_config_files="$ac_config_files Makefile orte/Makefile orte/liborte/Makefile orte/liborte/rtl/Makefile orte/examples/Makefile orte/examples/hello/Makefile orte/examples/reliable/Makefile orte/examples/ping/Makefile orte/examples/spy/Makefile orte/manager/Makefile"
 
 
 
@@ -4795,13 +5096,13 @@ _ACEOF
       # `set' does not quote correctly, so add quotes (double-quote
       # substitution turns \\\\ into \\, and sed turns \\ into \).
       sed -n \
-        "s/'/'\\\\''/g;
-         s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
+       "s/'/'\\\\''/g;
+         s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
       ;;
     *)
       # `set' quotes correctly as required by POSIX, so do not add quotes.
       sed -n \
-        "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
+       "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
       ;;
     esac;
 } |
@@ -4831,13 +5132,13 @@ test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
 # trailing colons and then remove the whole line if VPATH becomes empty
 # (actually we leave an empty line to preserve line numbers).
 if test "x$srcdir" = x.; then
-  ac_vpsub='/^[        ]*VPATH[        ]*=/{
+  ac_vpsub='/^[         ]*VPATH[        ]*=/{
 s/:*\$(srcdir):*/:/;
 s/:*\${srcdir}:*/:/;
 s/:*@srcdir@:*/:/;
-s/^\([^=]*=[   ]*\):*/\1/;
+s/^\([^=]*=[    ]*\):*/\1/;
 s/:*$//;
-s/^[^=]*=[     ]*$//;
+s/^[^=]*=[      ]*$//;
 }'
 fi
 
@@ -4848,7 +5149,7 @@ ac_ltlibobjs=
 for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
   # 1. Remove the extension, and $U if already installed.
   ac_i=`echo "$ac_i" |
-         sed 's/\$U\././;s/\.o$//;s/\.obj$//'`
+        sed 's/\$U\././;s/\.o$//;s/\.obj$//'`
   # 2. Add them.
   ac_libobjs="$ac_libobjs $ac_i\$U.$ac_objext"
   ac_ltlibobjs="$ac_ltlibobjs $ac_i"'$U.lo'
@@ -4865,6 +5166,13 @@ echo "$as_me: error: conditional \"MAINTAINER_MODE\" was never defined.
 Usually this means the macro was only invoked conditionally." >&2;}
    { (exit 1); exit 1; }; }
 fi
+if test -z "${CONFIG_ORTE_KERNEL_TRUE}" && test -z "${CONFIG_ORTE_KERNEL_FALSE}"; then
+  { { echo "$as_me:$LINENO: error: conditional \"CONFIG_ORTE_KERNEL\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+echo "$as_me: error: conditional \"CONFIG_ORTE_KERNEL\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+   { (exit 1); exit 1; }; }
+fi
 if test -z "${CONFIG_RTHAL_TRUE}" && test -z "${CONFIG_RTHAL_FALSE}"; then
   { { echo "$as_me:$LINENO: error: conditional \"CONFIG_RTHAL\" was never defined.
 Usually this means the macro was only invoked conditionally." >&5
@@ -4900,13 +5208,6 @@ echo "$as_me: error: conditional \"CONFIG_ORTE_RT\" was never defined.
 Usually this means the macro was only invoked conditionally." >&2;}
    { (exit 1); exit 1; }; }
 fi
-if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"AMDEP\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"AMDEP\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
-fi
 if test -z "${CONFIG_ORTE_WIN_TRUE}" && test -z "${CONFIG_ORTE_WIN_FALSE}"; then
   { { echo "$as_me:$LINENO: error: conditional \"CONFIG_ORTE_WIN\" was never defined.
 Usually this means the macro was only invoked conditionally." >&5
@@ -4921,6 +5222,13 @@ echo "$as_me: error: conditional \"CONFIG_ORTE_UNIX\" was never defined.
 Usually this means the macro was only invoked conditionally." >&2;}
    { (exit 1); exit 1; }; }
 fi
+if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then
+  { { echo "$as_me:$LINENO: error: conditional \"AMDEP\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+echo "$as_me: error: conditional \"AMDEP\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+   { (exit 1); exit 1; }; }
+fi
 
 : ${CONFIG_STATUS=./config.status}
 ac_clean_files_save=$ac_clean_files
@@ -4955,9 +5263,10 @@ if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
 elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then
   set -o posix
 fi
+DUALCASE=1; export DUALCASE # for MKS sh
 
 # Support unset when possible.
-if (FOO=FOO; unset FOO) >/dev/null 2>&1; then
+if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
   as_unset=unset
 else
   as_unset=false
@@ -4976,7 +5285,7 @@ for as_var in \
   LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
   LC_TELEPHONE LC_TIME
 do
-  if (set +x; test -n "`(eval $as_var=C; export $as_var) 2>&1`"); then
+  if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
     eval $as_var=C; export $as_var
   else
     $as_unset $as_var
@@ -5155,16 +5464,17 @@ rm -f conf$$ conf$$.exe conf$$.file
 if mkdir -p . 2>/dev/null; then
   as_mkdir_p=:
 else
+  test -d ./-p && rmdir ./-p
   as_mkdir_p=false
 fi
 
 as_executable_p="test -f"
 
 # Sed expression to map a string onto a valid CPP name.
-as_tr_cpp="sed y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g"
+as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
 
 # Sed expression to map a string onto a valid variable name.
-as_tr_sh="sed y%*+%pp%;s%[^_$as_cr_alnum]%_%g"
+as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
 
 
 # IFS
@@ -5191,7 +5501,7 @@ _ASBOX
 cat >&5 <<_CSEOF
 
 This file was extended by orte $as_me 0.2.0, which was
-generated by GNU Autoconf 2.57.  Invocation command line was
+generated by GNU Autoconf 2.59.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
   CONFIG_HEADERS  = $CONFIG_HEADERS
@@ -5235,9 +5545,9 @@ Usage: $0 [OPTIONS] [FILE]...
   -d, --debug      don't remove temporary files
       --recheck    update $as_me by reconfiguring in the same conditions
   --file=FILE[:TEMPLATE]
-                   instantiate the configuration file FILE
+                  instantiate the configuration file FILE
   --header=FILE[:TEMPLATE]
-                   instantiate the configuration header FILE
+                  instantiate the configuration header FILE
 
 Configuration files:
 $config_files
@@ -5254,11 +5564,10 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF
 ac_cs_version="\\
 orte config.status 0.2.0
-configured by $0, generated by GNU Autoconf 2.57,
+configured by $0, generated by GNU Autoconf 2.59,
   with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
 
-Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001
-Free Software Foundation, Inc.
+Copyright (C) 2003 Free Software Foundation, Inc.
 This config.status script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it."
 srcdir=$srcdir
@@ -5371,8 +5680,8 @@ do
   "orte/examples/Makefile" ) CONFIG_FILES="$CONFIG_FILES orte/examples/Makefile" ;;
   "orte/examples/hello/Makefile" ) CONFIG_FILES="$CONFIG_FILES orte/examples/hello/Makefile" ;;
   "orte/examples/reliable/Makefile" ) CONFIG_FILES="$CONFIG_FILES orte/examples/reliable/Makefile" ;;
-  "orte/examples/ORTEPing/Makefile" ) CONFIG_FILES="$CONFIG_FILES orte/examples/ORTEPing/Makefile" ;;
-  "orte/examples/ORTESpy/Makefile" ) CONFIG_FILES="$CONFIG_FILES orte/examples/ORTESpy/Makefile" ;;
+  "orte/examples/ping/Makefile" ) CONFIG_FILES="$CONFIG_FILES orte/examples/ping/Makefile" ;;
+  "orte/examples/spy/Makefile" ) CONFIG_FILES="$CONFIG_FILES orte/examples/spy/Makefile" ;;
   "orte/manager/Makefile" ) CONFIG_FILES="$CONFIG_FILES orte/manager/Makefile" ;;
   "modtool" ) CONFIG_FILES="$CONFIG_FILES modtool" ;;
   "depfiles" ) CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
@@ -5506,6 +5815,9 @@ s,@LINUX_CC@,$LINUX_CC,;t t
 s,@LINUX_LD@,$LINUX_LD,;t t
 s,@LINUX_AS@,$LINUX_AS,;t t
 s,@LINUX_MODULE_EXT@,$LINUX_MODULE_EXT,;t t
+s,@CONFIG_ORTE_KERNEL@,$CONFIG_ORTE_KERNEL,;t t
+s,@CONFIG_ORTE_KERNEL_TRUE@,$CONFIG_ORTE_KERNEL_TRUE,;t t
+s,@CONFIG_ORTE_KERNEL_FALSE@,$CONFIG_ORTE_KERNEL_FALSE,;t t
 s,@CONFIG_RTHAL_TRUE@,$CONFIG_RTHAL_TRUE,;t t
 s,@CONFIG_RTHAL_FALSE@,$CONFIG_RTHAL_FALSE,;t t
 s,@RTAI_CFLAGS@,$RTAI_CFLAGS,;t t
@@ -5523,6 +5835,10 @@ s,@ORTE_MAJOR_VERSION@,$ORTE_MAJOR_VERSION,;t t
 s,@ORTE_MINOR_VERSION@,$ORTE_MINOR_VERSION,;t t
 s,@ORTE_MICRO_VERSION@,$ORTE_MICRO_VERSION,;t t
 s,@ORTE_VERSION@,$ORTE_VERSION,;t t
+s,@CONFIG_ORTE_WIN_TRUE@,$CONFIG_ORTE_WIN_TRUE,;t t
+s,@CONFIG_ORTE_WIN_FALSE@,$CONFIG_ORTE_WIN_FALSE,;t t
+s,@CONFIG_ORTE_UNIX_TRUE@,$CONFIG_ORTE_UNIX_TRUE,;t t
+s,@CONFIG_ORTE_UNIX_FALSE@,$CONFIG_ORTE_UNIX_FALSE,;t t
 s,@moduledir@,$moduledir,;t t
 s,@modulePROGRAMS_INSTALL@,$modulePROGRAMS_INSTALL,;t t
 s,@CC@,$CC,;t t
@@ -5544,10 +5860,6 @@ s,@ac_ct_RANLIB@,$ac_ct_RANLIB,;t t
 s,@CPP@,$CPP,;t t
 s,@EGREP@,$EGREP,;t t
 s,@INCLUDES@,$INCLUDES,;t t
-s,@CONFIG_ORTE_WIN_TRUE@,$CONFIG_ORTE_WIN_TRUE,;t t
-s,@CONFIG_ORTE_WIN_FALSE@,$CONFIG_ORTE_WIN_FALSE,;t t
-s,@CONFIG_ORTE_UNIX_TRUE@,$CONFIG_ORTE_UNIX_TRUE,;t t
-s,@CONFIG_ORTE_UNIX_FALSE@,$CONFIG_ORTE_UNIX_FALSE,;t t
 s,@LIBOBJS@,$LIBOBJS,;t t
 s,@LTLIBOBJS@,$LTLIBOBJS,;t t
 CEOF
@@ -5579,9 +5891,9 @@ _ACEOF
       (echo ':t
   /@[a-zA-Z_][a-zA-Z_0-9]*@/!b' && cat $tmp/subs.frag) >$tmp/subs-$ac_sed_frag.sed
       if test -z "$ac_sed_cmds"; then
-       ac_sed_cmds="sed -f $tmp/subs-$ac_sed_frag.sed"
+       ac_sed_cmds="sed -f $tmp/subs-$ac_sed_frag.sed"
       else
-       ac_sed_cmds="$ac_sed_cmds | sed -f $tmp/subs-$ac_sed_frag.sed"
+       ac_sed_cmds="$ac_sed_cmds | sed -f $tmp/subs-$ac_sed_frag.sed"
       fi
       ac_sed_frag=`expr $ac_sed_frag + 1`
       ac_beg=$ac_end
@@ -5599,21 +5911,21 @@ for ac_file in : $CONFIG_FILES; do test "x$ac_file" = x: && continue
   # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".
   case $ac_file in
   - | *:- | *:-:* ) # input from stdin
-        cat >$tmp/stdin
-        ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
-        ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
+       cat >$tmp/stdin
+       ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
+       ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
   *:* ) ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
-        ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
+       ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
   * )   ac_file_in=$ac_file.in ;;
   esac
 
   # Compute @srcdir@, @top_srcdir@, and @INSTALL@ for subdirectories.
   ac_dir=`(dirname "$ac_file") 2>/dev/null ||
 $as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-         X"$ac_file" : 'X\(//\)[^/]' \| \
-         X"$ac_file" : 'X\(//\)$' \| \
-         X"$ac_file" : 'X\(/\)' \| \
-         .     : '\(.\)' 2>/dev/null ||
+        X"$ac_file" : 'X\(//\)[^/]' \| \
+        X"$ac_file" : 'X\(//\)$' \| \
+        X"$ac_file" : 'X\(/\)' \| \
+        .     : '\(.\)' 2>/dev/null ||
 echo X"$ac_file" |
     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
          /^X\(\/\/\)[^/].*/{ s//\1/; q; }
@@ -5629,10 +5941,10 @@ echo X"$ac_file" |
       as_dirs="$as_dir $as_dirs"
       as_dir=`(dirname "$as_dir") 2>/dev/null ||
 $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-         X"$as_dir" : 'X\(//\)[^/]' \| \
-         X"$as_dir" : 'X\(//\)$' \| \
-         X"$as_dir" : 'X\(/\)' \| \
-         .     : '\(.\)' 2>/dev/null ||
+        X"$as_dir" : 'X\(//\)[^/]' \| \
+        X"$as_dir" : 'X\(//\)$' \| \
+        X"$as_dir" : 'X\(/\)' \| \
+        .     : '\(.\)' 2>/dev/null ||
 echo X"$as_dir" |
     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
          /^X\(\/\/\)[^/].*/{ s//\1/; q; }
@@ -5670,12 +5982,45 @@ case $srcdir in
     ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
     ac_top_srcdir=$ac_top_builddir$srcdir ;;
 esac
-# Don't blindly perform a `cd "$ac_dir"/$ac_foo && pwd` since $ac_foo can be
-# absolute.
-ac_abs_builddir=`cd "$ac_dir" && cd $ac_builddir && pwd`
-ac_abs_top_builddir=`cd "$ac_dir" && cd ${ac_top_builddir}. && pwd`
-ac_abs_srcdir=`cd "$ac_dir" && cd $ac_srcdir && pwd`
-ac_abs_top_srcdir=`cd "$ac_dir" && cd $ac_top_srcdir && pwd`
+
+# Do not use `cd foo && pwd` to compute absolute paths, because
+# the directories may not exist.
+case `pwd` in
+.) ac_abs_builddir="$ac_dir";;
+*)
+  case "$ac_dir" in
+  .) ac_abs_builddir=`pwd`;;
+  [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";;
+  *) ac_abs_builddir=`pwd`/"$ac_dir";;
+  esac;;
+esac
+case $ac_abs_builddir in
+.) ac_abs_top_builddir=${ac_top_builddir}.;;
+*)
+  case ${ac_top_builddir}. in
+  .) ac_abs_top_builddir=$ac_abs_builddir;;
+  [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;;
+  *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;;
+  esac;;
+esac
+case $ac_abs_builddir in
+.) ac_abs_srcdir=$ac_srcdir;;
+*)
+  case $ac_srcdir in
+  .) ac_abs_srcdir=$ac_abs_builddir;;
+  [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;;
+  *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;;
+  esac;;
+esac
+case $ac_abs_builddir in
+.) ac_abs_top_srcdir=$ac_top_srcdir;;
+*)
+  case $ac_top_srcdir in
+  .) ac_abs_top_srcdir=$ac_abs_builddir;;
+  [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;;
+  *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;;
+  esac;;
+esac
 
 
   case $INSTALL in
@@ -5697,7 +6042,7 @@ echo "$as_me: creating $ac_file" >&6;}
     configure_input="$ac_file.  "
   fi
   configure_input=$configure_input"Generated from `echo $ac_file_in |
-                                     sed 's,.*/,,'` by configure."
+                                    sed 's,.*/,,'` by configure."
 
   # First look for the input files in the build tree, otherwise in the
   # src tree.
@@ -5706,24 +6051,24 @@ echo "$as_me: creating $ac_file" >&6;}
       case $f in
       -) echo $tmp/stdin ;;
       [\\/$]*)
-         # Absolute (can't be DOS-style, as IFS=:)
-         test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
+        # Absolute (can't be DOS-style, as IFS=:)
+        test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
-         echo $f;;
+        echo "$f";;
       *) # Relative
-         if test -f "$f"; then
-           # Build tree
-           echo $f
-         elif test -f "$srcdir/$f"; then
-           # Source tree
-           echo $srcdir/$f
-         else
-           # /dev/null tree
-           { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
+        if test -f "$f"; then
+          # Build tree
+          echo "$f"
+        elif test -f "$srcdir/$f"; then
+          # Source tree
+          echo "$srcdir/$f"
+        else
+          # /dev/null tree
+          { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
-         fi;;
+        fi;;
       esac
     done` || { (exit 1); exit 1; }
 _ACEOF
@@ -5765,12 +6110,12 @@ cat >>$CONFIG_STATUS <<\_ACEOF
 # NAME is the cpp macro being defined and VALUE is the value it is being given.
 #
 # ac_d sets the value in "#define NAME VALUE" lines.
-ac_dA='s,^\([  ]*\)#\([        ]*define[       ][      ]*\)'
-ac_dB='[       ].*$,\1#\2'
+ac_dA='s,^\([   ]*\)#\([        ]*define[       ][      ]*\)'
+ac_dB='[        ].*$,\1#\2'
 ac_dC=' '
 ac_dD=',;t'
 # ac_u turns "#undef NAME" without trailing blanks into "#define NAME VALUE".
-ac_uA='s,^\([  ]*\)#\([        ]*\)undef\([    ][      ]*\)'
+ac_uA='s,^\([   ]*\)#\([        ]*\)undef\([    ][      ]*\)'
 ac_uB='$,\1#\2define\3'
 ac_uC=' '
 ac_uD=',;t'
@@ -5779,11 +6124,11 @@ for ac_file in : $CONFIG_HEADERS; do test "x$ac_file" = x: && continue
   # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".
   case $ac_file in
   - | *:- | *:-:* ) # input from stdin
-        cat >$tmp/stdin
-        ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
-        ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
+       cat >$tmp/stdin
+       ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
+       ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
   *:* ) ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
-        ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
+       ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
   * )   ac_file_in=$ac_file.in ;;
   esac
 
@@ -5797,28 +6142,29 @@ echo "$as_me: creating $ac_file" >&6;}
       case $f in
       -) echo $tmp/stdin ;;
       [\\/$]*)
-         # Absolute (can't be DOS-style, as IFS=:)
-         test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
+        # Absolute (can't be DOS-style, as IFS=:)
+        test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
-         echo $f;;
+        # Do quote $f, to prevent DOS paths from being IFS'd.
+        echo "$f";;
       *) # Relative
-         if test -f "$f"; then
-           # Build tree
-           echo $f
-         elif test -f "$srcdir/$f"; then
-           # Source tree
-           echo $srcdir/$f
-         else
-           # /dev/null tree
-           { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
+        if test -f "$f"; then
+          # Build tree
+          echo "$f"
+        elif test -f "$srcdir/$f"; then
+          # Source tree
+          echo "$srcdir/$f"
+        else
+          # /dev/null tree
+          { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
-         fi;;
+        fi;;
       esac
     done` || { (exit 1); exit 1; }
   # Remove the trailing spaces.
-  sed 's/[     ]*$//' $ac_file_inputs >$tmp/in
+  sed 's/[      ]*$//' $ac_file_inputs >$tmp/in
 
 _ACEOF
 
@@ -5841,9 +6187,9 @@ s/[\\&,]/\\&/g
 s,[\\$`],\\&,g
 t clear
 : clear
-s,^[   ]*#[    ]*define[       ][      ]*\([^  (][^    (]*\)\(([^)]*)\)[       ]*\(.*\)$,${ac_dA}\1${ac_dB}\1\2${ac_dC}\3${ac_dD},gp
+s,^[    ]*#[    ]*define[       ][      ]*\([^  (][^    (]*\)\(([^)]*)\)[       ]*\(.*\)$,${ac_dA}\1${ac_dB}\1\2${ac_dC}\3${ac_dD},gp
 t end
-s,^[   ]*#[    ]*define[       ][      ]*\([^  ][^     ]*\)[   ]*\(.*\)$,${ac_dA}\1${ac_dB}\1${ac_dC}\2${ac_dD},gp
+s,^[    ]*#[    ]*define[       ][      ]*\([^  ][^     ]*\)[   ]*\(.*\)$,${ac_dA}\1${ac_dB}\1${ac_dC}\2${ac_dD},gp
 : end
 _ACEOF
 # If some macros were called several times there might be several times
@@ -5857,13 +6203,13 @@ rm -f confdef2sed.sed
 # example, in the case of _POSIX_SOURCE, which is predefined and required
 # on some systems where configure will not decide to define it.
 cat >>conftest.undefs <<\_ACEOF
-s,^[   ]*#[    ]*undef[        ][      ]*[a-zA-Z_][a-zA-Z_0-9]*,/* & */,
+s,^[    ]*#[    ]*undef[        ][      ]*[a-zA-Z_][a-zA-Z_0-9]*,/* & */,
 _ACEOF
 
 # Break up conftest.defines because some shells have a limit on the size
 # of here documents, and old seds have small limits too (100 cmds).
 echo '  # Handle all the #define templates only if necessary.' >>$CONFIG_STATUS
-echo '  if grep "^[    ]*#[    ]*define" $tmp/in >/dev/null; then' >>$CONFIG_STATUS
+echo '  if grep "^[     ]*#[    ]*define" $tmp/in >/dev/null; then' >>$CONFIG_STATUS
 echo '  # If there are no defines, we may have an empty if/fi' >>$CONFIG_STATUS
 echo '  :' >>$CONFIG_STATUS
 rm -f conftest.tail
@@ -5872,7 +6218,7 @@ do
   # Write a limited-size here document to $tmp/defines.sed.
   echo '  cat >$tmp/defines.sed <<CEOF' >>$CONFIG_STATUS
   # Speed up: don't consider the non `#define' lines.
-  echo '/^[    ]*#[    ]*define/!b' >>$CONFIG_STATUS
+  echo '/^[     ]*#[    ]*define/!b' >>$CONFIG_STATUS
   # Work around the forget-to-reset-the-flag bug.
   echo 't clr' >>$CONFIG_STATUS
   echo ': clr' >>$CONFIG_STATUS
@@ -5899,7 +6245,7 @@ do
   # Write a limited-size here document to $tmp/undefs.sed.
   echo '  cat >$tmp/undefs.sed <<CEOF' >>$CONFIG_STATUS
   # Speed up: don't consider the non `#undef'
-  echo '/^[    ]*#[    ]*undef/!b' >>$CONFIG_STATUS
+  echo '/^[     ]*#[    ]*undef/!b' >>$CONFIG_STATUS
   # Work around the forget-to-reset-the-flag bug.
   echo 't clr' >>$CONFIG_STATUS
   echo ': clr' >>$CONFIG_STATUS
@@ -5933,10 +6279,10 @@ echo "$as_me: $ac_file is unchanged" >&6;}
     else
       ac_dir=`(dirname "$ac_file") 2>/dev/null ||
 $as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-         X"$ac_file" : 'X\(//\)[^/]' \| \
-         X"$ac_file" : 'X\(//\)$' \| \
-         X"$ac_file" : 'X\(/\)' \| \
-         .     : '\(.\)' 2>/dev/null ||
+        X"$ac_file" : 'X\(//\)[^/]' \| \
+        X"$ac_file" : 'X\(//\)$' \| \
+        X"$ac_file" : 'X\(/\)' \| \
+        .     : '\(.\)' 2>/dev/null ||
 echo X"$ac_file" |
     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
          /^X\(\/\/\)[^/].*/{ s//\1/; q; }
@@ -5952,10 +6298,10 @@ echo X"$ac_file" |
       as_dirs="$as_dir $as_dirs"
       as_dir=`(dirname "$as_dir") 2>/dev/null ||
 $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-         X"$as_dir" : 'X\(//\)[^/]' \| \
-         X"$as_dir" : 'X\(//\)$' \| \
-         X"$as_dir" : 'X\(/\)' \| \
-         .     : '\(.\)' 2>/dev/null ||
+        X"$as_dir" : 'X\(//\)[^/]' \| \
+        X"$as_dir" : 'X\(//\)$' \| \
+        X"$as_dir" : 'X\(/\)' \| \
+        .     : '\(.\)' 2>/dev/null ||
 echo X"$as_dir" |
     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
          /^X\(\/\/\)[^/].*/{ s//\1/; q; }
@@ -5993,16 +6339,41 @@ for ac_file in : $CONFIG_COMMANDS; do test "x$ac_file" = x: && continue
   ac_source=`echo "$ac_file" | sed 's,[^:]*:,,'`
   ac_dir=`(dirname "$ac_dest") 2>/dev/null ||
 $as_expr X"$ac_dest" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-         X"$ac_dest" : 'X\(//\)[^/]' \| \
-         X"$ac_dest" : 'X\(//\)$' \| \
-         X"$ac_dest" : 'X\(/\)' \| \
-         .     : '\(.\)' 2>/dev/null ||
+        X"$ac_dest" : 'X\(//\)[^/]' \| \
+        X"$ac_dest" : 'X\(//\)$' \| \
+        X"$ac_dest" : 'X\(/\)' \| \
+        .     : '\(.\)' 2>/dev/null ||
 echo X"$ac_dest" |
     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
          /^X\(\/\/\)[^/].*/{ s//\1/; q; }
          /^X\(\/\/\)$/{ s//\1/; q; }
          /^X\(\/\).*/{ s//\1/; q; }
          s/.*/./; q'`
+  { if $as_mkdir_p; then
+    mkdir -p "$ac_dir"
+  else
+    as_dir="$ac_dir"
+    as_dirs=
+    while test ! -d "$as_dir"; do
+      as_dirs="$as_dir $as_dirs"
+      as_dir=`(dirname "$as_dir") 2>/dev/null ||
+$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+        X"$as_dir" : 'X\(//\)[^/]' \| \
+        X"$as_dir" : 'X\(//\)$' \| \
+        X"$as_dir" : 'X\(/\)' \| \
+        .     : '\(.\)' 2>/dev/null ||
+echo X"$as_dir" |
+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
+         /^X\(\/\/\)[^/].*/{ s//\1/; q; }
+         /^X\(\/\/\)$/{ s//\1/; q; }
+         /^X\(\/\).*/{ s//\1/; q; }
+         s/.*/./; q'`
+    done
+    test ! -n "$as_dirs" || mkdir $as_dirs
+  fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5
+echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;}
+   { (exit 1); exit 1; }; }; }
+
   ac_builddir=.
 
 if test "$ac_dir" != .; then
@@ -6028,12 +6399,45 @@ case $srcdir in
     ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
     ac_top_srcdir=$ac_top_builddir$srcdir ;;
 esac
-# Don't blindly perform a `cd "$ac_dir"/$ac_foo && pwd` since $ac_foo can be
-# absolute.
-ac_abs_builddir=`cd "$ac_dir" && cd $ac_builddir && pwd`
-ac_abs_top_builddir=`cd "$ac_dir" && cd ${ac_top_builddir}. && pwd`
-ac_abs_srcdir=`cd "$ac_dir" && cd $ac_srcdir && pwd`
-ac_abs_top_srcdir=`cd "$ac_dir" && cd $ac_top_srcdir && pwd`
+
+# Do not use `cd foo && pwd` to compute absolute paths, because
+# the directories may not exist.
+case `pwd` in
+.) ac_abs_builddir="$ac_dir";;
+*)
+  case "$ac_dir" in
+  .) ac_abs_builddir=`pwd`;;
+  [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";;
+  *) ac_abs_builddir=`pwd`/"$ac_dir";;
+  esac;;
+esac
+case $ac_abs_builddir in
+.) ac_abs_top_builddir=${ac_top_builddir}.;;
+*)
+  case ${ac_top_builddir}. in
+  .) ac_abs_top_builddir=$ac_abs_builddir;;
+  [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;;
+  *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;;
+  esac;;
+esac
+case $ac_abs_builddir in
+.) ac_abs_srcdir=$ac_srcdir;;
+*)
+  case $ac_srcdir in
+  .) ac_abs_srcdir=$ac_abs_builddir;;
+  [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;;
+  *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;;
+  esac;;
+esac
+case $ac_abs_builddir in
+.) ac_abs_top_srcdir=$ac_top_srcdir;;
+*)
+  case $ac_top_srcdir in
+  .) ac_abs_top_srcdir=$ac_abs_builddir;;
+  [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;;
+  *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;;
+  esac;;
+esac
 
 
   { echo "$as_me:$LINENO: executing $ac_dest commands" >&5
@@ -6051,10 +6455,10 @@ echo "$as_me: executing $ac_dest commands" >&6;}
   if grep '^#.*generated by automake' $mf > /dev/null 2>&1; then
     dirpart=`(dirname "$mf") 2>/dev/null ||
 $as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-         X"$mf" : 'X\(//\)[^/]' \| \
-         X"$mf" : 'X\(//\)$' \| \
-         X"$mf" : 'X\(/\)' \| \
-         .     : '\(.\)' 2>/dev/null ||
+        X"$mf" : 'X\(//\)[^/]' \| \
+        X"$mf" : 'X\(//\)$' \| \
+        X"$mf" : 'X\(/\)' \| \
+        .     : '\(.\)' 2>/dev/null ||
 echo X"$mf" |
     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
          /^X\(\/\/\)[^/].*/{ s//\1/; q; }
@@ -6090,10 +6494,10 @@ echo X"$mf" |
     test -f "$dirpart/$file" && continue
     fdir=`(dirname "$file") 2>/dev/null ||
 $as_expr X"$file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-         X"$file" : 'X\(//\)[^/]' \| \
-         X"$file" : 'X\(//\)$' \| \
-         X"$file" : 'X\(/\)' \| \
-         .     : '\(.\)' 2>/dev/null ||
+        X"$file" : 'X\(//\)[^/]' \| \
+        X"$file" : 'X\(//\)$' \| \
+        X"$file" : 'X\(/\)' \| \
+        .     : '\(.\)' 2>/dev/null ||
 echo X"$file" |
     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
          /^X\(\/\/\)[^/].*/{ s//\1/; q; }
@@ -6109,10 +6513,10 @@ echo X"$file" |
       as_dirs="$as_dir $as_dirs"
       as_dir=`(dirname "$as_dir") 2>/dev/null ||
 $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-         X"$as_dir" : 'X\(//\)[^/]' \| \
-         X"$as_dir" : 'X\(//\)$' \| \
-         X"$as_dir" : 'X\(/\)' \| \
-         .     : '\(.\)' 2>/dev/null ||
+        X"$as_dir" : 'X\(//\)[^/]' \| \
+        X"$as_dir" : 'X\(//\)$' \| \
+        X"$as_dir" : 'X\(/\)' \| \
+        .     : '\(.\)' 2>/dev/null ||
 echo X"$as_dir" |
     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
          /^X\(\/\/\)[^/].*/{ s//\1/; q; }
index d50c2bd64ec35a546925ae52f2591bd63eee378a..d8cc9f764793ddb93c3cbc415c85e0a69f8fd9db 100644 (file)
@@ -1,9 +1,10 @@
 # Process this file with autoconf to produce a configure script.
 #
-# $Id: configure.in,v 1.2 2004/01/17 18:16:35 ppisa Exp $
+# $Id: configure.in,v 1.3 2004/02/11 00:38:24 ppisa Exp $
 
 # autoconf requirement
-AC_PREREQ([2.57])
+
+AC_PREREQ([2.56])
 
 AC_INIT([orte],[0.2.0],[petr.smolik@wo.cz])
 AC_CONFIG_AUX_DIR(admin)
@@ -30,6 +31,27 @@ AC_SUBST(ORTE_MICRO_VERSION)
 AC_SUBST(ORTE_VERSION)
 
 
+###############################
+# target
+WIN='no'
+UNIX='no'
+case "$target" in
+  *-cygwin* | *-mingw*)
+    CFLAGS="$CFLAGS"
+    WIN='yes'
+    AC_DEFINE([CONFIG_ORTE_WIN],[1],[Define if is target windows])
+    ;;
+  *)
+    # Assume Unix.
+    if test -z ${CONFIG_ORTE_RT} -a ${CONFIG_ORTE_KERNEL} ; then
+      UNIX='yes'
+      AC_DEFINE([CONFIG_ORTE_UNIX],[1],[Define if is target a unix system])
+    fi
+    ;;
+esac
+AM_CONDITIONAL(CONFIG_ORTE_WIN, test x$WIN = xyes)
+AM_CONDITIONAL(CONFIG_ORTE_UNIX, test x$UNIX = xyes)
+
 ###############################
 # modules
 moduledir="\$(libdir)/modules/\$(LINUX_KERNELRELEASE)/orte"
@@ -44,63 +66,100 @@ AC_PROG_CC
 AC_PROG_RANLIB
 
 ###############################
-# Checks for libraries (no for RT)
+# Checks for libraries (not for RT)
 if test -z ${CONFIG_ORTE_RT} ; then
 AC_CHECK_LIB([ws2_32], [main])
 AC_CHECK_LIB([pthread], [main])
 fi
 
+###############################
+# enable GNU source
+AH_VERBATIM([_GNU_SOURCE],[
+#ifndef _GNU_SOURCE
+  #define _GNU_SOURCE
+#endif
+]) 
+
+###############################
+# CFLAGS
+CFLAGS="$CFLAGS -Wall"
+if test ${USE_RTLINUX} == 'yes' ; then
+  CFLAGS="$CFLAGS $RTLINUX_CFLAGS"
+else
+  if test ${USE_RTAI} == 'yes' ; then
+    CFLAGS="$CFLAGS $RTAI_CFLAGS $LINUX_CFLAGS"
+  else
+    if test -n ${CONFIG_ORTE_KERNEL} ; then
+      CFLAGS="$CFLAGS $LINUX_CFLAGS"
+    fi
+  fi
+fi
+
 ###############################
 # Checks for header files.
-if test -z ${CONFIG_ORTE_RT} ; then
-AC_HEADER_STDC
-AC_CHECK_HEADERS(
-[arpa/inet.h fcntl.h stdio.h netdb.h netinet/in.h stdlib.h \
-string.h sys/ioctl.h sys/socket.h sys/time.h unistd.h pthread.h \
-stdarg.h getopt.h sys/types.h net/if.h byteswap.h signal.h errno.h \
-ctype.h sys/stat.h winsock2.h ws2tcpip.h])
+# user space
+if test ${UNIX} == 'yes' -o ${WIN} == 'yes' ; then
+    AC_HEADER_STDC
+    AC_CHECK_HEADERS([\
+    arpa/inet.h fcntl.h stdio.h netdb.h netinet/in.h stdlib.h \
+    string.h sys/ioctl.h sys/socket.h sys/time.h unistd.h pthread.h \
+    stdarg.h sys/types.h net/if.h byteswap.h getopt.h \
+    ctype.h semaphore.h signal.h],,,[[]])
 fi
+# win32
+if test ${WIN} == 'yes' ; then
+    AC_CHECK_HEADERS([\
+    winsock2.h ws2tcpip.h windows.h],,,[[]])
+fi
+# kernel
+if test ${CONFIG_ORTE_KERNEL} == 'yes' ; then
+    AC_CHECK_HEADERS([\
+    asm/byteorder.h linux/ctype.h linux/string.h \
+    linux/module.h linux/if.h linux/socket.h \
+    linux/time.h linux/types.h],,,[[]])
+    AC_CHECK_HEADERS([linux/in.h],,,[
+    #ifdef HAVE_LINUX_SOCKET_H
+      #include <linux/socket.h>
+    #endif
+    ])
+fi
+# RTLinux
+if test ${USE_RTLINUX} == 'yes' ; then
+    AC_CHECK_HEADERS([\
+    string.h pthread.h semaphore.h \
+    rtl.h rtl_malloc.h udp.h nic.h time.h],,,[[]])
+    AC_CHECK_HEADERS([nictab.h],,,[
+    #ifdef HAVE_UDP_H
+      #include <udp.h>
+    #endif
+    #ifdef HAVE_NIC_H
+      #include <nic.h>
+    #endif
+    ])
+fi
+# RTAI
+if test ${USE_RTAI} == 'yes' ; then
+    AC_CHECK_HEADERS([\
+    rtnet.h],,,[[]])
+fi
+
 ###############################
 # includes
-case "$target" in
-  *-cygwin* | *-mingw*)
-    INCLUDES='-I$(top_srcdir)/orte/include -I$(top_srcdir)/orte/include/win32'
-    WIN='yes'
-    AC_DEFINE([CONFIG_ORTE_WIN],[1],[Define if is target windows])
-    ;;
-  *)
-    # Assume Unix.
-    if test ${USE_RTLINUX} == "yes" ; then
-      INCLUDES='-I$(top_srcdir)/orte/include -I$(top_srcdir)/orte/include/rtl -I$(top_srcdir)/orte/contrib/RTL_UDP/include'
-    elif test ${USE_RTAI} == "yes" ; then
-      INCLUDES='-I$(top_srcdir)/orte/include -I$(top_srcdir)/orte/include/rtai'
-    else
-      INCLUDES='-I$(top_srcdir)/orte/include'
-      UNIX='yes'
-      AC_DEFINE([CONFIG_ORTE_UNIX],[1],[Define if is target a unix system])
-    fi
-    ;;
-esac
+INCLUDES='-I$(top_srcdir)/orte/include'
 AC_SUBST(INCLUDES)
-AM_CONDITIONAL(CONFIG_ORTE_WIN, test x$WIN = xyes)
-AM_CONDITIONAL(CONFIG_ORTE_UNIX, test x$UNIX = xyes)
 
 ###############################
 # Checks for typedefs, structures, and compiler characteristics.
 AC_C_BIGENDIAN
 AC_C_CONST
 AC_C_INLINE
-AC_TYPE_PID_T
-AC_TYPE_SIZE_T
 
 ###############################
 # Checks for library functions.
 AC_PROG_GCC_TRADITIONAL
-AC_CHECK_FUNCS([strdup])
-
-###############################
-# Add obsolute directory for header files
-CFLAGS="$CFLAGS -Wall"
+if test -z ${CONFIG_ORTE_RT} ; then
+AC_CHECK_FUNCS([strdup gethostbyname])
+fi
 
 AC_CONFIG_FILES([Makefile
                  orte/Makefile
@@ -109,12 +168,11 @@ AC_CONFIG_FILES([Makefile
                 orte/examples/Makefile
                 orte/examples/hello/Makefile
                 orte/examples/reliable/Makefile
-                orte/examples/ORTEPing/Makefile
-                orte/examples/ORTESpy/Makefile
+                orte/examples/ping/Makefile
+                orte/examples/spy/Makefile
                  orte/manager/Makefile])
 
 
-
 AC_OUTPUT([
 modtool
 ])
index 61c2380764942c2ad19654a805ac9f032136d72a..a0146f62302a1846f99c95ea46a3f1b68afc321f 100644 (file)
@@ -20,8 +20,8 @@
       <useconfiguration>debug</useconfiguration>
     </general>
     <run>
-      <mainprogram>orte/examples/ORTESpy/ORTESpy</mainprogram>
-      <directoryradio>build</directoryradio>
+      <mainprogram>/orte/debug/orte/manager/ortemanager</mainprogram>
+      <directoryradio>custom</directoryradio>
       <customdirectory>/</customdirectory>
       <programargs/>
       <terminal>false</terminal>
index 9750252ec274991a50287aea039288de332bdff8..cf0b12ac2a895928fb843bae3a5dfdefb666aece 100644 (file)
@@ -76,6 +76,7 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 AMTAR = @AMTAR@
 AWK = @AWK@
 CC = @CC@
+CONFIG_ORTE_KERNEL = @CONFIG_ORTE_KERNEL@
 CONFIG_ORTE_RT = @CONFIG_ORTE_RT@
 DEPDIR = @DEPDIR@
 INCLUDES = @INCLUDES@
index e86593d7fa2f0adc5115b0296a959ee993294796..ce87544b33b2f2c1d7a8a36c5e8a6a55920f22d8 100644 (file)
@@ -1,4 +1,4 @@
-<!DOCTYPE UI><UI version="3.0" stdsetdef="1">
+<!DOCTYPE UI><UI version="3.1" stdsetdef="1">
 <class>MainForm</class>
 <widget class="QDialog">
     <property name="name">
@@ -22,7 +22,7 @@
         <property name="geometry">
             <rect>
                 <x>40</x>
-                <y>10</y>
+                <y>13</y>
                 <width>320</width>
                 <height>110</height>
             </rect>
@@ -32,7 +32,7 @@
 <customwidgets>
     <customwidget>
         <class>View_Frame</class>
-        <header location="global">./ViewFrm.h</header>
+        <header location="global">ViewFrm.h</header>
         <sizehint>
             <width>-1</width>
             <height>-1</height>
@@ -52,8 +52,6 @@
         <data format="XPM.GZ" length="45">789cd3d7528808f055d0d2e72a2e492cc94c5648ce482c52d04a29cdcdad8c8eb5ade6523250004143a55a6b2e0026630c4f</data>
     </image>
 </images>
-<connections>
-</connections>
 <includes>
     <include location="local" impldecl="in implementation">MainFrm.ui.h</include>
 </includes>
@@ -65,8 +63,8 @@
 <slots>
     <slot>init()</slot>
     <slot>resizeEvent( QResizeEvent * )</slot>
-    <slot>SetShapeRect( QRect rect )</slot>
-    <slot>SetProperties( char shape, char color )</slot>
+    <slot>SetActiveObject( int object )</slot>
+    <slot>ShapeColorRect( char object, int shape, int color, QRect rect )</slot>
     <slot returnType="int">MaxX()</slot>
     <slot returnType="int">MaxY()</slot>
     <slot>closeEvent( QCloseEvent * e )</slot>
@@ -75,4 +73,7 @@
 </slots>
 <pixmapinproject/>
 <layoutdefaults spacing="6" margin="11"/>
+<includehints>
+    <includehint>view_frame.h</includehint>
+</includehints>
 </UI>
index 971360dfd6645c2176b19a88855bc2412213ac9c..fcfc1f3964d6011c80deddc3d8565a146b4a16a8 100644 (file)
@@ -1,4 +1,4 @@
-/****************************************************************************
+/***************************************************************************
 ** ui.h extension file, included from the uic-generated form implementation.
 **
 ** If you wish to add, delete or rename slots use Qt Designer which will
@@ -20,18 +20,17 @@ void MainForm::resizeEvent( QResizeEvent *)
        View->setGeometry(0,15,size().width(),size().height()-15);
 }
 
-void MainForm::SetShapeRect(QRect rect)
+void MainForm::SetActiveObject(int object)
 {
-       m_shapeRect=rect;
-       View->SetShapeRect(m_shapeRect);
+       View->SetActiveObject(object);
 }
 
-void MainForm::SetProperties(char shape, char color)
+void MainForm::ShapeColorRect(char object,int shape, int color,QRect rect)
 {
-       View->SetShape(shape);
-       View->SetShapeColor(color);
+       View->ShapeColorRect(object,shape,color,rect);
 }
 
+
 int MainForm::MaxX()
 {
        return View->width();
@@ -62,3 +61,8 @@ int MainForm::getClose()
 {
  return m_close;
 }
+
+
+
+
+
index 73c9ef9948a53942bbe7f0adde63261e0114354f..adf1b4937cdc0a9bba57040cd804305d349a9714 100644 (file)
@@ -1,9 +1,9 @@
 #############################################################################
-# Makefile for building: Orte_demo
-# Generated by qmake (1.04a) (Qt 3.1.1) on: Mon Sep 22 01:48:09 2003
-# Project:  Orte_demo.pro
+# Makefile for building: ortedemo
+# Generated by qmake (1.07a) (Qt 3.3.0b1) on: Fri Jan 30 22:37:47 2004
+# Project:  ortedemo.pro
 # Template: app
-# Command: $(QMAKE) -o Makefile Orte_demo.pro
+# Command: $(QMAKE) -o Makefile ortedemo.pro
 #############################################################################
 
 ####### Compiler, tools and options
@@ -12,14 +12,14 @@ CC       = gcc
 CXX      = g++
 LEX      = flex
 YACC     = yacc
-CFLAGS   = -pipe -Wall -W -O2 -march=i386 -mcpu=i686 -g -DGLX_GLXEXT_LEGACY -fno-use-cxa-atexit -fno-exceptions  -DQT_NO_DEBUG
-CXXFLAGS = -pipe -Wall -W -O2 -march=i386 -mcpu=i686 -g -DGLX_GLXEXT_LEGACY -fno-use-cxa-atexit -fno-exceptions  -DQT_NO_DEBUG
+CFLAGS   = -pipe -Wall -W -O2  -DQT_NO_DEBUG -DQT_SHARED
+CXXFLAGS = -pipe -Wall -W -O2  -DQT_NO_DEBUG -DQT_SHARED
 LEXFLAGS = 
 YACCFLAGS= -d
-INCPATH  = -I$(QTDIR)/mkspecs/default -I. -I../orte-0.1.1-pi/orte/include -I../orte-0.1.1-pi -I$(QTDIR)/include -I.ui/ -I.moc/
+INCPATH  = -I/usr/local/qt/mkspecs/default -I. -I../../include -I$(QTDIR)/include -I.ui/ -I. -I.moc/
 LINK     = g++
-LFLAGS   = 
-LIBS     = $(SUBLIBS) -L$(QTDIR)/lib -L/usr/X11R6/lib liblib.a -lqt-mt -lXext -lX11 -lm
+LFLAGS   =  -Wl,-rpath,$(QTDIR)/lib
+LIBS     = $(SUBLIBS) -L$(QTDIR)/lib -L/usr/X11R6/lib ../../../debug/orte/liborte/liborte.a -lpthread -lqt -lXext -lX11 -lm
 AR       = ar cqs
 RANLIB   = 
 MOC      = $(QTDIR)/bin/moc
@@ -28,8 +28,8 @@ QMAKE    = qmake
 TAR      = tar -cf
 GZIP     = gzip -9f
 COPY     = cp -f
-COPY_FILE= $(COPY) -p
-COPY_DIR = $(COPY) -pR
+COPY_FILE= $(COPY)
+COPY_DIR = $(COPY) -r
 DEL_FILE = rm -f
 SYMLINK  = ln -sf
 DEL_DIR  = rmdir
@@ -45,16 +45,18 @@ OBJECTS_DIR = .obj/
 
 HEADERS = Publisher.h \
                ViewFrm.h \
-               define.h \
+               ortedemo_types.h \
                Subscriber.h
 SOURCES = main.cpp \
                Publisher.cpp \
                ViewFrm.cpp \
-               Subscriber.cpp
+               Subscriber.cpp \
+               ortedemo_types.c
 OBJECTS = .obj/main.o \
                .obj/Publisher.o \
                .obj/ViewFrm.o \
                .obj/Subscriber.o \
+               .obj/ortedemo_types.o \
                .obj/MulticlipForm.o \
                .obj/MainFrm.o
 FORMS = MulticlipForm.ui \
@@ -73,15 +75,15 @@ OBJMOC = .obj/moc_Publisher.o \
                .obj/moc_Subscriber.o \
                .obj/moc_MulticlipForm.o \
                .obj/moc_MainFrm.o
-DIST      = Orte_demo.pro
-QMAKE_TARGET = Orte_demo
+DIST      = ortedemo.pro
+QMAKE_TARGET = ortedemo
 DESTDIR  = 
-TARGET   = Orte_demo
+TARGET   = ortedemo
 
 first: all
 ####### Implicit rules
 
-.SUFFIXES: .c .cpp .cc .cxx .C
+.SUFFIXES: .c .o .cpp .cc .cxx .C
 
 .cpp.o:
        $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
@@ -102,21 +104,22 @@ first: all
 
 all: Makefile $(TARGET)
 
-$(TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC) 
-       $(LINK) $(LFLAGS) -o $(TARGET) $(OBJECTS) $(OBJMOC) $(LIBS)
+$(TARGET):  $(UICDECLS) $(OBJECTS) $(OBJMOC)  
+       $(LINK) $(LFLAGS) -o $(TARGET) $(OBJECTS) $(OBJMOC) $(LIBS) $(OBJCOMP)
 
 mocables: $(SRCMOC)
+uicables: $(UICDECLS) $(UICIMPLS)
 
 $(MOC): 
-       ( cd $(QTDIR)/src/moc ; $(MAKE) )
+       ( cd $(QTDIR)/src/moc && $(MAKE) )
 
-Makefile: Orte_demo.pro  $(QTDIR)/mkspecs/default/qmake.conf 
-       $(QMAKE) -o Makefile Orte_demo.pro
+Makefile: ortedemo.pro  /usr/local/qt/mkspecs/default/qmake.conf /usr/local/qt/lib/libqt.prl
+       $(QMAKE) -o Makefile ortedemo.pro
 qmake: 
-       @$(QMAKE) -o Makefile Orte_demo.pro
+       @$(QMAKE) -o Makefile ortedemo.pro
 
 dist: 
-       @mkdir -p .obj/Orte_demo && $(COPY_FILE) --parents $(SOURCES) $(HEADERS) $(FORMS) $(DIST) .obj/Orte_demo/ && $(COPY_FILE) --parents MulticlipForm.ui.h MainFrm.ui.h .obj/Orte_demo/ && ( cd `dirname .obj/Orte_demo` && $(TAR) Orte_demo.tar Orte_demo && $(GZIP) Orte_demo.tar ) && $(MOVE) `dirname .obj/Orte_demo`/Orte_demo.tar.gz . && $(DEL_FILE) -r .obj/Orte_demo
+       @mkdir -p .obj/ortedemo && $(COPY_FILE) --parents $(SOURCES) $(HEADERS) $(FORMS) $(DIST) .obj/ortedemo/ && $(COPY_FILE) --parents MulticlipForm.ui.h MainFrm.ui.h .obj/ortedemo/ && ( cd `dirname .obj/ortedemo` && $(TAR) ortedemo.tar ortedemo && $(GZIP) ortedemo.tar ) && $(MOVE) `dirname .obj/ortedemo`/ortedemo.tar.gz . && $(DEL_FILE) -r .obj/ortedemo
 
 mocclean:
        -$(DEL_FILE) $(OBJMOC)
@@ -128,7 +131,7 @@ uiclean:
 yaccclean:
 lexclean:
 clean: mocclean uiclean
-       -$(DEL_FILE) $(OBJECTS) 
+       -$(DEL_FILE) $(OBJECTS)
        -$(DEL_FILE) *~ core *.core
 
 
@@ -147,28 +150,31 @@ FORCE:
 
 .obj/Publisher.o: Publisher.cpp Publisher.h \
                ViewFrm.h \
-               define.h \
+               ortedemo_types.h \
                .ui/MainFrm.h
        $(CXX) -c $(CXXFLAGS) $(INCPATH) -o .obj/Publisher.o Publisher.cpp
 
 .obj/ViewFrm.o: ViewFrm.cpp ViewFrm.h \
-               define.h
+               ortedemo_types.h
        $(CXX) -c $(CXXFLAGS) $(INCPATH) -o .obj/ViewFrm.o ViewFrm.cpp
 
 .obj/Subscriber.o: Subscriber.cpp Subscriber.h \
-               define.h \
+               ortedemo_types.h \
                .ui/MainFrm.h
        $(CXX) -c $(CXXFLAGS) $(INCPATH) -o .obj/Subscriber.o Subscriber.cpp
 
+.obj/ortedemo_types.o: ortedemo_types.c ortedemo_types.h
+       $(CC) -c $(CFLAGS) $(INCPATH) -o .obj/ortedemo_types.o ortedemo_types.c
+
 .ui/MulticlipForm.h: MulticlipForm.ui Subscriber.h \
                Publisher.h \
-               define.h \
+               ortedemo_types.h \
                .ui/MainFrm.h
        $(UIC) MulticlipForm.ui -o .ui/MulticlipForm.h
 
 .ui/MulticlipForm.cpp: .ui/MulticlipForm.h MulticlipForm.ui Subscriber.h \
                Publisher.h \
-               define.h \
+               ortedemo_types.h \
                .ui/MainFrm.h
        $(UIC) MulticlipForm.ui -i MulticlipForm.h -o .ui/MulticlipForm.cpp
 
@@ -186,14 +192,14 @@ FORCE:
                .ui/MainFrm.h
        $(CXX) -c $(CXXFLAGS) $(INCPATH) -o .obj/MainFrm.o .ui/MainFrm.cpp
 
-.obj/moc_Publisher.o: .moc/moc_Publisher.cpp Publisher.h define.h \
+.obj/moc_Publisher.o: .moc/moc_Publisher.cpp Publisher.h ortedemo_types.h \
                .ui/MainFrm.h
        $(CXX) -c $(CXXFLAGS) $(INCPATH) -o .obj/moc_Publisher.o .moc/moc_Publisher.cpp
 
-.obj/moc_ViewFrm.o: .moc/moc_ViewFrm.cpp ViewFrm.h define.h
+.obj/moc_ViewFrm.o: .moc/moc_ViewFrm.cpp ViewFrm.h ortedemo_types.h
        $(CXX) -c $(CXXFLAGS) $(INCPATH) -o .obj/moc_ViewFrm.o .moc/moc_ViewFrm.cpp
 
-.obj/moc_Subscriber.o: .moc/moc_Subscriber.cpp Subscriber.h define.h \
+.obj/moc_Subscriber.o: .moc/moc_Subscriber.cpp Subscriber.h ortedemo_types.h \
                .ui/MainFrm.h
        $(CXX) -c $(CXXFLAGS) $(INCPATH) -o .obj/moc_Subscriber.o .moc/moc_Subscriber.cpp
 
@@ -220,7 +226,7 @@ FORCE:
 
 ####### Install
 
-install: all 
+install:  
 
-uninstall: 
+uninstall:  
 
index f36894d8f71483fd3437b3085609c47772e9817c..ac0053189db538e5290a10cbb940077f7e2fb7fe 100644 (file)
@@ -1,4 +1,4 @@
-<!DOCTYPE UI><UI version="3.0" stdsetdef="1">
+<!DOCTYPE UI><UI version="3.1" stdsetdef="1">
 <class>MulticlipForm</class>
 <widget class="QDialog">
     <property name="name">
@@ -11,8 +11,8 @@
         <rect>
             <x>0</x>
             <y>0</y>
-            <width>408</width>
-            <height>228</height>
+            <width>614</width>
+            <height>314</height>
         </rect>
     </property>
     <property name="minimumSize">
     </property>
     <property name="maximumSize">
         <size>
-            <width>408</width>
-            <height>228</height>
+            <width>614</width>
+            <height>315</height>
         </size>
     </property>
     <property name="font">
         <font>
-            <family>Helvetica [Urw]</family>
-            <pointsize>12</pointsize>
         </font>
     </property>
     <property name="caption">
         <string>ORTE Demo</string>
     </property>
-    <widget class="QLabel">
+    <widget class="Line">
         <property name="name">
-            <cstring>TextLabel6</cstring>
+            <cstring>Line2_2</cstring>
         </property>
         <property name="geometry">
             <rect>
-                <x>16</x>
-                <y>30</y>
-                <width>79</width>
-                <height>35</height>
+                <x>360</x>
+                <y>10</y>
+                <width>20</width>
+                <height>300</height>
             </rect>
         </property>
-        <property name="text">
-            <string>   List of 
-Publishers :</string>
+        <property name="frameShape">
+            <enum>VLine</enum>
+        </property>
+        <property name="frameShadow">
+            <enum>Sunken</enum>
+        </property>
+        <property name="orientation">
+            <enum>Vertical</enum>
         </property>
     </widget>
-    <widget class="QPushButton">
+    <widget class="QListBox">
         <property name="name">
-            <cstring>deletePushButton</cstring>
+            <cstring>SubscribersListBox</cstring>
         </property>
         <property name="geometry">
             <rect>
-                <x>90</x>
-                <y>190</y>
-                <width>105</width>
-                <height>25</height>
+                <x>390</x>
+                <y>60</y>
+                <width>100</width>
+                <height>250</height>
             </rect>
         </property>
-        <property name="font">
-            <font>
-                <pointsize>10</pointsize>
-            </font>
-        </property>
-        <property name="text">
-            <string>&amp;Delete Publisher</string>
-        </property>
-        <property name="accel">
-            <number>4194372</number>
-        </property>
-        <property name="autoDefault">
-            <bool>false</bool>
-        </property>
     </widget>
-    <widget class="QPushButton">
+    <widget class="QButtonGroup">
         <property name="name">
-            <cstring>addPushButton</cstring>
+            <cstring>Colors</cstring>
         </property>
         <property name="geometry">
             <rect>
-                <x>90</x>
-                <y>160</y>
-                <width>105</width>
-                <height>25</height>
+                <x>500</x>
+                <y>50</y>
+                <width>100</width>
+                <height>170</height>
             </rect>
         </property>
-        <property name="font">
-            <font>
-                <pointsize>10</pointsize>
-            </font>
+        <property name="title">
+            <string>Colors</string>
         </property>
-        <property name="text">
-            <string>&amp;Add Publisher</string>
-        </property>
-        <property name="accel">
-            <number>4194369</number>
-        </property>
-        <property name="autoDefault">
-            <bool>false</bool>
-        </property>
-    </widget>
-    <widget class="QComboBox">
-        <item>
-            <property name="text">
-                <string>Blue</string>
+        <widget class="QCheckBox">
+            <property name="name">
+                <cstring>clGreen</cstring>
+            </property>
+            <property name="geometry">
+                <rect>
+                    <x>10</x>
+                    <y>50</y>
+                    <width>80</width>
+                    <height>24</height>
+                </rect>
             </property>
-        </item>
-        <item>
             <property name="text">
                 <string>Green</string>
             </property>
-        </item>
-        <item>
+        </widget>
+        <widget class="QCheckBox">
+            <property name="name">
+                <cstring>clRed</cstring>
+            </property>
+            <property name="geometry">
+                <rect>
+                    <x>10</x>
+                    <y>80</y>
+                    <width>80</width>
+                    <height>24</height>
+                </rect>
+            </property>
             <property name="text">
                 <string>Red</string>
             </property>
-        </item>
-        <item>
+        </widget>
+        <widget class="QCheckBox">
+            <property name="name">
+                <cstring>clBlack</cstring>
+            </property>
+            <property name="geometry">
+                <rect>
+                    <x>10</x>
+                    <y>110</y>
+                    <width>80</width>
+                    <height>24</height>
+                </rect>
+            </property>
             <property name="text">
                 <string>Black</string>
             </property>
-        </item>
-        <property name="name">
-            <cstring>ColorP</cstring>
-        </property>
-        <property name="geometry">
-            <rect>
-                <x>92</x>
-                <y>125</y>
-                <width>105</width>
-                <height>25</height>
-            </rect>
-        </property>
-    </widget>
-    <widget class="Line">
-        <property name="name">
-            <cstring>Line2</cstring>
-        </property>
-        <property name="geometry">
-            <rect>
-                <x>204</x>
-                <y>0</y>
-                <width>3</width>
-                <height>231</height>
-            </rect>
-        </property>
-        <property name="frameShape">
-            <enum>VLine</enum>
-        </property>
-        <property name="frameShadow">
-            <enum>Sunken</enum>
-        </property>
-        <property name="orientation">
-            <enum>Vertical</enum>
-        </property>
+        </widget>
+        <widget class="QCheckBox">
+            <property name="name">
+                <cstring>clYellow</cstring>
+            </property>
+            <property name="geometry">
+                <rect>
+                    <x>10</x>
+                    <y>140</y>
+                    <width>80</width>
+                    <height>24</height>
+                </rect>
+            </property>
+            <property name="text">
+                <string>Yellow</string>
+            </property>
+        </widget>
+        <widget class="QCheckBox">
+            <property name="name">
+                <cstring>clBlue</cstring>
+            </property>
+            <property name="geometry">
+                <rect>
+                    <x>10</x>
+                    <y>20</y>
+                    <width>80</width>
+                    <height>24</height>
+                </rect>
+            </property>
+            <property name="text">
+                <string>Blue</string>
+            </property>
+            <property name="checked">
+                <bool>false</bool>
+            </property>
+        </widget>
     </widget>
     <widget class="QListBox">
         <property name="name">
@@ -169,97 +175,20 @@ Publishers :</string>
         <property name="geometry">
             <rect>
                 <x>10</x>
-                <y>70</y>
-                <width>75</width>
-                <height>150</height>
-            </rect>
-        </property>
-    </widget>
-    <widget class="QListBox">
-        <property name="name">
-            <cstring>SubscribersListBox</cstring>
-        </property>
-        <property name="geometry">
-            <rect>
-                <x>211</x>
-                <y>70</y>
-                <width>75</width>
-                <height>150</height>
+                <y>55</y>
+                <width>100</width>
+                <height>250</height>
             </rect>
         </property>
     </widget>
-    <widget class="QPushButton">
-        <property name="name">
-            <cstring>addS</cstring>
-        </property>
-        <property name="geometry">
-            <rect>
-                <x>293</x>
-                <y>160</y>
-                <width>105</width>
-                <height>25</height>
-            </rect>
-        </property>
-        <property name="font">
-            <font>
-                <pointsize>10</pointsize>
-            </font>
-        </property>
-        <property name="text">
-            <string>&amp;Add Suscriber</string>
-        </property>
-        <property name="autoDefault">
-            <bool>false</bool>
-        </property>
-    </widget>
-    <widget class="QPushButton">
-        <property name="name">
-            <cstring>deleteS</cstring>
-        </property>
-        <property name="geometry">
-            <rect>
-                <x>293</x>
-                <y>195</y>
-                <width>105</width>
-                <height>25</height>
-            </rect>
-        </property>
-        <property name="font">
-            <font>
-                <pointsize>10</pointsize>
-            </font>
-        </property>
-        <property name="text">
-            <string>&amp;Delete Suscriber</string>
-        </property>
-        <property name="autoDefault">
-            <bool>false</bool>
-        </property>
-    </widget>
-    <widget class="QLabel">
-        <property name="name">
-            <cstring>TextLabel2_2</cstring>
-        </property>
-        <property name="geometry">
-            <rect>
-                <x>127</x>
-                <y>108</y>
-                <width>70</width>
-                <height>17</height>
-            </rect>
-        </property>
-        <property name="text">
-            <string>Color</string>
-        </property>
-    </widget>
     <widget class="QLabel">
         <property name="name">
             <cstring>TextLabel1_3</cstring>
         </property>
         <property name="geometry">
             <rect>
-                <x>127</x>
-                <y>60</y>
+                <x>120</x>
+                <y>120</y>
                 <width>60</width>
                 <height>20</height>
             </rect>
@@ -270,19 +199,18 @@ Publishers :</string>
     </widget>
     <widget class="QLabel">
         <property name="name">
-            <cstring>TextLabel2_3</cstring>
+            <cstring>TextLabel2_2</cstring>
         </property>
         <property name="geometry">
             <rect>
-                <x>215</x>
-                <y>30</y>
-                <width>95</width>
-                <height>35</height>
+                <x>120</x>
+                <y>60</y>
+                <width>70</width>
+                <height>17</height>
             </rect>
         </property>
         <property name="text">
-            <string>    List of 
-Subscribers :</string>
+            <string>Color</string>
         </property>
     </widget>
     <widget class="QComboBox">
@@ -306,9 +234,9 @@ Subscribers :</string>
         </property>
         <property name="geometry">
             <rect>
-                <x>92</x>
-                <y>80</y>
-                <width>105</width>
+                <x>120</x>
+                <y>140</y>
+                <width>100</width>
                 <height>25</height>
             </rect>
         </property>
@@ -334,76 +262,123 @@ Subscribers :</string>
                 <string>Black</string>
             </property>
         </item>
+        <item>
+            <property name="text">
+                <string>Yellow</string>
+            </property>
+        </item>
         <property name="name">
-            <cstring>ColorS</cstring>
+            <cstring>ColorP</cstring>
         </property>
         <property name="geometry">
             <rect>
-                <x>293</x>
-                <y>125</y>
-                <width>105</width>
+                <x>120</x>
+                <y>80</y>
+                <width>100</width>
                 <height>25</height>
             </rect>
         </property>
     </widget>
-    <widget class="QComboBox">
-        <item>
-            <property name="text">
-                <string>Ellipse</string>
-            </property>
-        </item>
-        <item>
-            <property name="text">
-                <string>Rectangle</string>
-            </property>
-        </item>
-        <item>
-            <property name="text">
-                <string>Triangle</string>
-            </property>
-        </item>
+    <widget class="QPushButton">
         <property name="name">
-            <cstring>ShapeS</cstring>
+            <cstring>addS</cstring>
         </property>
         <property name="geometry">
             <rect>
-                <x>293</x>
-                <y>80</y>
-                <width>105</width>
+                <x>500</x>
+                <y>250</y>
+                <width>100</width>
                 <height>25</height>
             </rect>
         </property>
+        <property name="font">
+            <font>
+            </font>
+        </property>
+        <property name="text">
+            <string>&amp;Add</string>
+        </property>
+        <property name="autoDefault">
+            <bool>false</bool>
+        </property>
     </widget>
-    <widget class="QLabel">
+    <widget class="QPushButton">
+        <property name="name">
+            <cstring>deleteS</cstring>
+        </property>
+        <property name="geometry">
+            <rect>
+                <x>500</x>
+                <y>280</y>
+                <width>100</width>
+                <height>25</height>
+            </rect>
+        </property>
+        <property name="text">
+            <string>&amp;Delete</string>
+        </property>
+        <property name="autoDefault">
+            <bool>false</bool>
+        </property>
+    </widget>
+    <widget class="QPushButton">
         <property name="name">
-            <cstring>TextLabel1_3_2</cstring>
+            <cstring>pushButton5</cstring>
         </property>
         <property name="geometry">
             <rect>
-                <x>327</x>
-                <y>60</y>
-                <width>72</width>
-                <height>20</height>
+                <x>260</x>
+                <y>280</y>
+                <width>90</width>
+                <height>25</height>
             </rect>
         </property>
         <property name="text">
-            <string>Shape </string>
+            <string>About</string>
         </property>
     </widget>
-    <widget class="QLabel">
+    <widget class="QPushButton">
         <property name="name">
-            <cstring>TextLabel2_2_2</cstring>
+            <cstring>deletePushButton</cstring>
         </property>
         <property name="geometry">
             <rect>
-                <x>328</x>
-                <y>108</y>
-                <width>65</width>
-                <height>17</height>
+                <x>120</x>
+                <y>280</y>
+                <width>100</width>
+                <height>25</height>
             </rect>
         </property>
         <property name="text">
-            <string>Color</string>
+            <string>&amp;Delete</string>
+        </property>
+        <property name="accel">
+            <string>Alt+D</string>
+        </property>
+        <property name="autoDefault">
+            <bool>false</bool>
+        </property>
+    </widget>
+    <widget class="QPushButton">
+        <property name="name">
+            <cstring>addPushButton</cstring>
+        </property>
+        <property name="geometry">
+            <rect>
+                <x>120</x>
+                <y>240</y>
+                <width>100</width>
+                <height>25</height>
+            </rect>
+        </property>
+        <property name="text">
+            <string>&amp;Add</string>
+        </property>
+        <property name="accel">
+            <string>Alt+A</string>
+        </property>
+        <property name="autoDefault">
+            <bool>false</bool>
         </property>
     </widget>
     <widget class="QLabel">
@@ -412,20 +387,50 @@ Subscribers :</string>
         </property>
         <property name="geometry">
             <rect>
-                <x>45</x>
-                <y>0</y>
-                <width>145</width>
+                <x>10</x>
+                <y>10</y>
+                <width>210</width>
                 <height>30</height>
             </rect>
         </property>
+        <property name="sizePolicy">
+            <sizepolicy>
+                <hsizetype>5</hsizetype>
+                <vsizetype>5</vsizetype>
+                <horstretch>0</horstretch>
+                <verstretch>0</verstretch>
+            </sizepolicy>
+        </property>
         <property name="font">
             <font>
-                <pointsize>20</pointsize>
+                <pointsize>18</pointsize>
                 <bold>1</bold>
             </font>
         </property>
         <property name="text">
-            <string>Publishers</string>
+            <string>&lt;p align="center"&gt;Publishers&lt;/p&gt;</string>
+        </property>
+    </widget>
+    <widget class="Line">
+        <property name="name">
+            <cstring>Line2</cstring>
+        </property>
+        <property name="geometry">
+            <rect>
+                <x>230</x>
+                <y>10</y>
+                <width>20</width>
+                <height>300</height>
+            </rect>
+        </property>
+        <property name="frameShape">
+            <enum>VLine</enum>
+        </property>
+        <property name="frameShadow">
+            <enum>Sunken</enum>
+        </property>
+        <property name="orientation">
+            <enum>Vertical</enum>
         </property>
     </widget>
     <widget class="QLabel">
@@ -434,9 +439,9 @@ Subscribers :</string>
         </property>
         <property name="geometry">
             <rect>
-                <x>245</x>
-                <y>0</y>
-                <width>145</width>
+                <x>390</x>
+                <y>10</y>
+                <width>210</width>
                 <height>30</height>
             </rect>
         </property>
@@ -447,7 +452,7 @@ Subscribers :</string>
             </font>
         </property>
         <property name="text">
-            <string>Suscribers</string>
+            <string>&lt;p align="center"&gt;Suscribers&lt;/p&gt;</string>
         </property>
     </widget>
 </widget>
index 7b4817948ef097734104079b9338c673a43afe1b..be0ba4232cf4c0b5a73a9ad9b273de722824e9e0 100644 (file)
@@ -5,7 +5,7 @@
 ** update this file, preserving your code. Create an init() slot in place of
 ** a constructor, and a destroy() slot in place of a destructor.
 *****************************************************************************/
-#include <orte.h>
+#include <orte_api.h>
 #include <qwidget.h>
 Subscriber *tabSub[50];
 int NSubscriber;
@@ -78,97 +78,17 @@ void MulticlipForm::closeEvent( QCloseEvent *e )
 e->accept();
 }
 
-void rcvCallBack(ORTERcvInfo *rcvInfo,u_char status)
-{
-       QRect rect;
-       int a,b,c,d;
-       char *topic,*type;
-       int top=0,typ=0;
-       switch (status) {
-               case 0:  //Issue
-                       sscanf((char*)rcvInfo->data,"%i %i %i %i",&a,&b,&c,&d);
-                       rect.setCoords(a,b,c,d);
-                       topic=(char *)rcvInfo->subsTopic;
-                       type=(char *)rcvInfo->subsTypeName;
-                       if(strcmp(topic,"Ellipse")==0)top=0;
-                       if(strcmp(topic,"Rectangle")==0)top=1;
-                       if(strcmp(topic,"Triangle")==0)top=2;
-                       if(strcmp(type,"Blue")==0)typ=0;
-                       if(strcmp(type,"Green")==0)typ=1;
-                       if(strcmp(type,"Red")==0)typ=2;
-                       if(strcmp(type,"Black")==0)typ=3;
-
-                       for(int i=0;i<NSubscriber;i++){
-                       if(tabSub[i]->topS==top && tabSub[i]->typS==typ){
-                               (tabSub[i]->m_mainFrm)->setCaption(tabSub[i]->strTitle);
-                               (tabSub[i]->m_mainFrm)->SetShapeRect(rect);
-                       }
-               }
-               break;
-               case 1:  //Data
-                       for(int i=0;i<NSubscriber;i++){
-                               int dead=0;
-                               if(NPublisher!=0){
-                                       for(int j=0;j<NPublisher;j++){
-                                               if(tabSub[i]->topS!=tabPub[j]->top || tabSub[i]->typS!=tabPub[j]->typ){
-                                               dead++;
-                                               }
-                                       }
-                               }
-                        if(NPublisher==0 || dead==NPublisher){
-                               QString name=tabSub[i]->strTitle+" deadline ";
-                               (tabSub[i]->m_mainFrm)->setCaption(name);
-                       }
-               }
-               break;
-       }
-}
-
 void MulticlipForm::GotoS(  )
 {
     QString name =QString::number(ns);
-       ns++;
-    int shap=ShapeS->currentItem();
-    int color=ColorS->currentItem();
-       QString topic;
-       QString type;
-
-switch(shap)
-       {
-       case RECTANGLE:
-               topic="Rectangle";
-               break;
-       case ELLIPSE:
-               topic="Ellipse";
-               break;
-       case TRIANGLE:
-               topic="Triangle";
-               break;
-       }
-
-       switch(color)
-       {
-       case BLUE:
-               type="Blue";
-               break;
-       case GREEN:
-               type="Green";
-               break;
-       case RED:
-               type="Red";
-               break;
-       case BLACK:
-               type="Black";
-               break;
-       }
-NtpTime        minimumSeparation,deadline;
-int h_sub;
-   tabSub[NSubscriber]=new Subscriber();
-   tabSub[NSubscriber]->Create(name,shap,color);
-ORTEAppCreate(&(tabSub[NSubscriber]->app));
-  NtpTimeAssembFromMs(minimumSeparation,0,0);
-  NtpTimeAssembFromMs(deadline, 5, 0);
- h_sub=ORTEAppSubsAdd(tabSub[NSubscriber]->app,topic,type, &minimumSeparation,&deadline,rcvCallBack);
+    ns++;
+    tabSub[NSubscriber]=new Subscriber();
+    tabSub[NSubscriber]->Create(name,
+                                clBlue->isChecked(),
+                                clGreen->isChecked(),
+                                clRed->isChecked(),
+                                clBlack->isChecked(),
+                                clYellow->isChecked());
 }
 
 void MulticlipForm::addSubscriber()
diff --git a/orte/contrib/shape/Orte_demo.db b/orte/contrib/shape/Orte_demo.db
deleted file mode 100644 (file)
index b520b30..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-<!DOCTYPE DB><DB version="1.0">
-</DB>
diff --git a/orte/contrib/shape/Orte_demo.pro b/orte/contrib/shape/Orte_demo.pro
deleted file mode 100644 (file)
index 2fc2b76..0000000
+++ /dev/null
@@ -1,14 +0,0 @@
-SOURCES        += main.cpp Publisher.cpp ViewFrm.cpp Subscriber.cpp 
-HEADERS        += Publisher.h ViewFrm.h define.h Subscriber.h 
-unix {
-  UI_DIR = .ui
-  MOC_DIR = .moc
-  OBJECTS_DIR = .obj
-}
-FORMS  = MulticlipForm.ui MainFrm.ui 
-TEMPLATE       =app
-CONFIG += qt warn_on release
-INCLUDEPATH    += ../../include 
-LIBS   += ../../liborte.a
-DBFILE = Orte_demo.db
-LANGUAGE       = C++
index 56a53efb153ee3d5af9cea87df9d2fc0b57b1d85..6445cf2b401468d9ebe01fb26793befb4fe7af85 100644 (file)
@@ -1,6 +1,7 @@
 #include "Publisher.h"
-#include <orte.h>
+#include <orte_api.h>
 #include <qtimer.h>
+#include <unistd.h>
 #include "ViewFrm.h"
 
 Publisher::Publisher( QWidget *parent, const char *name )
@@ -17,72 +18,61 @@ Publisher::Publisher( QWidget *parent, const char *name )
        m_shapeRect.setRect(0,0,25,45);
 }
 
-void Publisher::Create(QString name, char shape, char color, long strength)
+void Publisher::Create(QString name, int shape, int color, long strength)
 {
-  NtpTime      timePersistence;
+  NtpTime      persistence;
        //init main frame
        m_mainFrm = new MainForm;
        Text = new QLabel( m_mainFrm, "Text" );
-    Text->setGeometry( QRect(10 , 0, 60, 15 ) );
-    Text->setText( trUtf8( "Strength : " ) );
+        Text->setGeometry( QRect(10 , 0, 60, 15 ) );
+        Text->setText( trUtf8( "Strength : " ) );
        str = new QSlider(m_mainFrm, "str" );
-    str->setGeometry( QRect( 70, 0, 130, 15 ) );
+        str->setGeometry( QRect( 70, 0, 130, 15 ) );
        str->setMaxValue( 10 );
-    str->setOrientation( QSlider::Horizontal );
+        str->setOrientation( QSlider::Horizontal );
        connect( str, SIGNAL( valueChanged(int) ), this, SLOT(changeStrenght() ) );
        m_mainFrm->show();
-       m_mainFrm->SetProperties(shape,color);
+       m_mainFrm->SetActiveObject(0);
        m_shapeRect.moveBy(rand()%m_mainFrm->MaxX(),rand()%m_mainFrm->MaxY());
 
 
        //init caption
+        QString topic;
+       boxType.shape=shape;
+       boxType.color=color;
 
- QString topic;
-       QString type;
-       top=shape;
-       typ=color;
        strTitle="Publisher : "+name+" (Topic=";
-
-       switch(shape)
-       {
-       case RECTANGLE:
-               strTitle+="RECTANGLE, Type=";
-               topic="Rectangle";
-               break;
-       case ELLIPSE:
-               strTitle+="ELLIPSE, Type=";
-               topic="Ellipse";
-               break;
-       case TRIANGLE:
-               strTitle+="TRIANGLE, Type=";
-               topic="Triangle";
-               break;
-       }
-
        switch(color)
        {
        case BLUE:
-               strTitle+="BLUE";
-               type="Blue";
+               topic="Blue";
                break;
        case GREEN:
-               strTitle+="GREEN";
-               type="Green";
+               topic="Green";
                break;
        case RED:
-               strTitle+="RED";
-               type="Red";
+               topic="Red";
                break;
        case BLACK:
-               strTitle+="BLACK";
-               type="Black";
+               topic="Black";
                break;
        }
-
-       ORTEAppCreate(&app1);
-  NtpTimeAssembFromMs(timePersistence, 5, 0);
-  h_pub=ORTEAppPublAdd(app1,topic,type,
-                       &timePersistence,strength);
+       strTitle+=topic;
+
+        ORTEInit(); 
+       domain=ORTEDomainAppCreate(ORTE_DEFAULT_DOMAIN,NULL,NULL,ORTE_FALSE);
+       ORTETypeRegisterBoxType(domain);
+        NtpTimeAssembFromMs(persistence, 5, 0);
+        publisher=ORTEPublicationCreate(
+                    domain,
+                     topic,
+                    "BoxType",
+                    &boxType,
+                    &persistence,
+                    strength,
+                    NULL,
+                    NULL,
+                    NULL);
 
        strTitle+=", Strength="+QString::number(strength)+" )";
        m_mainFrm->setCaption(strTitle);
@@ -93,14 +83,21 @@ void Publisher::Create(QString name, char shape, char color, long strength)
        timer->start( 50, FALSE );
 }
 
+void Publisher::Destroy()
+{      
+       m_mainFrm->WantClose();
+       m_mainFrm->close();
+       ORTEDomainAppDestroy(domain);
+}
+
 void Publisher::Timer()
 {
-       char            msg[128];
-       memset(msg,0,sizeof(msg));
-       MoveShape();
-       sprintf(msg,"%i %i %i %i",m_shapeRect.left(),m_shapeRect.top(),m_shapeRect.right(),m_shapeRect.bottom());
-       //Don't forget add to length last zero char !!!
-    ORTEAppPublSend(app1,h_pub,msg,strlen(msg)+1);
+        MoveShape();
+        boxType.rectangle.top_left_x=m_shapeRect.left();
+        boxType.rectangle.top_left_y=m_shapeRect.top();
+        boxType.rectangle.bottom_right_x=m_shapeRect.right();
+        boxType.rectangle.bottom_right_y=m_shapeRect.bottom();
+        ORTEPublicationSend(publisher);
 }
 
 void Publisher::MoveShape()
@@ -122,21 +119,16 @@ void Publisher::MoveShape()
                m_shapeRect.moveBy(m_incx,m_incy);
        }
 
-       m_mainFrm->SetShapeRect(m_shapeRect);
+       m_mainFrm->ShapeColorRect(0,boxType.shape,boxType.color,m_shapeRect);
 }
 
-void Publisher::Destroy()
-{      
-       m_mainFrm->WantClose();
-       m_mainFrm->close();
-       ORTEAppDestroy(app1);
-}
 void Publisher::changeStrenght()
 {
-       ORTEPublProp  publ_prop;
-       ORTEAppPublPropGet(this->app1,this->h_pub,&publ_prop);
-       publ_prop.strength=str->value();
-       ORTEAppPublPropSet(this->app1,this->h_pub,&publ_prop);
+       ORTEPublProp  pp;
+
+        ORTEPublicationPropertiesGet(publisher,&pp);
+       pp.strength=str->value();
+        ORTEPublicationPropertiesSet(publisher,&pp);
        QString name=QString::number(str->value());
        if((str->value())<10) name+=" ";
        (this->strTitle).replace((this->strTitle).length()-3,2,name);
index dde7c3c7e50deb42b57b0429ee34d8833e72ea83..48ebfa0c8628f6442b2a78476d6b967d4e8d7c44 100644 (file)
@@ -1,10 +1,9 @@
 #if !defined PUBLISHER_H
 #define PUBLISHER_H
 
-#include <define.h>
+#include <ortedemo_types.h>
 #include "MainFrm.h"
 #include <qwidget.h>
-#include <orte.h>
 #include <qslider.h>
 #include <qlabel.h>
 class Publisher : public QWidget
@@ -14,7 +13,7 @@ public:
        Publisher(QWidget *parent=0, const char *name=0);
 
 public:
-       void Create(QString name, char shape, char color, long strength);
+       void Create(QString name, int shape, int color, long strength);
        void Destroy();
 
 public slots:
@@ -25,10 +24,9 @@ public:
        MainForm* m_mainFrm;
        QSlider* str;
        QLabel *Text;
-        ManagedApp    *app1;
-        int           h_pub;
-        int top,typ;
        QString strTitle;
+       ORTEDomain *domain;
+       ORTEPublication *publisher;
 
 protected:
        QRect m_shapeRect;
@@ -36,6 +34,7 @@ protected:
        char m_stepy;
        char m_incx;
        char m_incy;
+       BoxType boxType;
 
        void MoveShape();
 
index 94437f47e919f6182989bfe0bb16072bdc290e2c..e179f051f493751b3bdc4df1f00d6ec08b1c9f7c 100644 (file)
 #include "Subscriber.h"
 #include <qtimer.h>
 #include <qrect.h>
-#include <orte.h>
+#include <orte_api.h>
+
 
 Subscriber::Subscriber( QWidget *parent, const char *name )
         : QWidget( parent, name )
 {
 }
 
-void Subscriber::Create(QString name, char shape, char color)
-{
+void
+recvCallBack(const ORTERecvInfo *info,void *vinstance, void *recvCallBackParam) {
+  BoxType *boxType=(BoxType*)vinstance;
+  Subscriber *s=(Subscriber*)recvCallBackParam;
+  QRect   rect;
 
+  switch (info->status) {
+    case NEW_DATA:
+      rect.setCoords(
+          boxType->rectangle.top_left_x,
+         boxType->rectangle.top_left_y,
+         boxType->rectangle.bottom_right_x,
+         boxType->rectangle.bottom_right_y);
+      pthread_mutex_lock(&s->mutex);
+      s->m_mainFrm->ShapeColorRect(boxType->color,boxType->shape,boxType->color,rect);
+      pthread_mutex_unlock(&s->mutex);
+      break;
+    case DEADLINE:
+//      printf("deadline occured\n");
+      break;
+  }
+}
+
+void Subscriber::Create(QString name, char eBlue,char eGreen,
+                       char eRed,char eBlack,char eYellow )
+{
+       subBlue=NULL;
+        NtpTimeAssembFromMs(minimumSeparationBlue, 0, 0);
+       subGreen=NULL;
+       NtpTimeAssembFromMs(minimumSeparationGreen, 0, 0);
+       subRed=NULL;
+       NtpTimeAssembFromMs(minimumSeparationRed, 0, 0);
+       subBlack=NULL;
+       NtpTimeAssembFromMs(minimumSeparationBlack, 0, 0);
+       subYellow=NULL;
+       NtpTimeAssembFromMs(minimumSeparationYellow, 0, 0);
+        
        //init main frame
        m_mainFrm = new MainForm;
        Text = new QLabel( m_mainFrm, "Text" );
        Text->setGeometry( QRect(10 , 0, 110, 15 ) );
-    Text->setText( trUtf8( "Minimum Separation : " ) );
+        Text->setText( trUtf8( "Minimum Separation : " ) );
        MinSep = new QSlider(m_mainFrm, "str" );
-    MinSep->setGeometry( QRect( 120, 0, 130, 15 ) );
+        MinSep->setGeometry( QRect( 120, 0, 130, 15 ) );
        MinSep->setMaxValue( 10 );
-    MinSep->setOrientation( QSlider::Horizontal );
+        MinSep->setOrientation( QSlider::Horizontal );
+        MinSep->setTickmarks( QSlider::NoMarks );
        connect( MinSep, SIGNAL( valueChanged(int) ), this, SLOT(changeMinSep() ) );
        m_mainFrm->show();
-       m_mainFrm->SetProperties(shape,color);
 
 
        //init caption
+        QString topic;
 
-
-       strTitle="Subscriber : "+name+" (Topic=";
-typS=color;
-topS=shape;
-       switch(shape)
-       {
-       case RECTANGLE:
-               strTitle+="RECTANGLE, Type=";
-               topic="Rectangle";
-               break;
-       case ELLIPSE:
-               strTitle+="ELLIPSE, Type=";
-               topic="Ellipse";
-               break;
-       case TRIANGLE:
-               strTitle+="TRIANGLE, Type=";
-               topic="Triangle";
-               break;
-       }
-
-       switch(color)
-       {
-       case BLUE:
-               strTitle+="BLUE";
-               type="Blue";
-               break;
-       case GREEN:
-               strTitle+="GREEN";
-               type="Green";
-               break;
-       case RED:
-               strTitle+="RED";
-               type="Red";
-               break;
-       case BLACK:
-               strTitle+="BLACK";
-               type="Black";
-               break;
-       }
-       strTitle+=" Min.Sep.=0 )";
+       strTitle="Subscriber : "+name;
        m_mainFrm->setCaption(strTitle);
+
+        pthread_mutex_init(&mutex,NULL);
+       
+        ORTEInit(); 
+       domain=ORTEDomainAppCreate(ORTE_DEFAULT_DOMAIN,NULL,NULL,ORTE_FALSE);
+       ORTETypeRegisterBoxType(domain);
+       NtpTime deadline;
+        NtpTimeAssembFromMs(deadline, 1, 0);
+       if (eBlue) {
+          subBlue=ORTESubscriptionCreate(
+              domain,
+              IMMEDIATE,
+              BEST_EFFORTS,
+              "Blue",
+              "BoxType",
+              &boxType,
+              &deadline,
+              &minimumSeparationBlue,
+              recvCallBack,
+              this);
+          m_mainFrm->SetActiveObject(0);
+         }
+       if (eGreen) {
+          subGreen=ORTESubscriptionCreate(
+              domain,
+              IMMEDIATE,
+              BEST_EFFORTS,
+              "Green",
+              "BoxType",
+              &boxType,
+              &deadline,
+              &minimumSeparationGreen,
+              recvCallBack,
+              this);
+          m_mainFrm->SetActiveObject(1);
+         }
+       if (eRed) {
+          subRed=ORTESubscriptionCreate(
+              domain,
+              IMMEDIATE,
+              BEST_EFFORTS,
+              "Red",
+              "BoxType",
+              &boxType,
+              &deadline,
+              &minimumSeparationRed,
+              recvCallBack,
+              this);
+          m_mainFrm->SetActiveObject(2);
+         }
+       if (eBlack) {
+          subBlack=ORTESubscriptionCreate(
+              domain,
+              IMMEDIATE,
+              BEST_EFFORTS,
+              "Black",
+              "BoxType",
+              &boxType,
+              &deadline,
+              &minimumSeparationBlack,
+              recvCallBack,
+              this);
+          m_mainFrm->SetActiveObject(3);
+         }
+       if (eYellow) {
+          subYellow=ORTESubscriptionCreate(
+              domain,
+              IMMEDIATE,
+              BEST_EFFORTS,
+              "Yellow",
+              "BoxType",
+              &boxType,
+              &deadline,
+              &minimumSeparationYellow,
+              recvCallBack,
+              this);
+          m_mainFrm->SetActiveObject(4);
+         }
+
 }
 
 
 void Subscriber::Destroy()
 {
-                m_mainFrm->WantClose();
+        m_mainFrm->WantClose();
        m_mainFrm->close();
+       ORTEDomainAppDestroy(domain);
+        pthread_mutex_destroy(&mutex);
 
 }
 
+
 void Subscriber::changeMinSep()
 {
-       ORTESubsProp  sub_prop;
-       ORTEAppSubsPropGet(app,1,&sub_prop);
-       NtpTimeAssembFromMs(sub_prop.minimumSeparation,MinSep->value(),0);
-       ORTEAppSubsPropSet(app,1,&sub_prop);
+       ORTESubsProp  sp;
+
+//        ORTESubscriptionPropertiesGet(subscriber,&sp);
+//     NtpTimeAssembFromMs(sp.minimumSeparation,MinSep->value(),0);
+//        ORTESubscriptionPropertiesSet(subscriber,&sp);
        QString name=QString::number(MinSep->value());
        if((MinSep->value())<10) name+=" ";
        (this->strTitle).replace((this->strTitle).length()-3,2,name);
index 2cf4a303b5680853b9f601871138cb7808d6bd78..1531a1db578af6b5eadbc8748f5382900125a67f 100644 (file)
@@ -1,10 +1,9 @@
 #if !defined SUBSCRIBER_H
 #define SUBSCRIBER_H
 
-#include <define.h>
+#include <ortedemo_types.h>
 #include "MainFrm.h"
 #include <qwidget.h>
-#include <orte.h>
 #include <qslider.h>
 #include <qlabel.h>
 class Subscriber : public QWidget
@@ -12,21 +11,33 @@ class Subscriber : public QWidget
     Q_OBJECT
 public:
        Subscriber(QWidget *parent=0, const char *name=0);
-       QString topic;
-       QString type;
        QString strTitle;
-       int typS,topS;
-       ManagedApp    *app;
        MainForm* m_mainFrm;
        QSlider* MinSep;
        QLabel *Text;
+       ORTEDomain  *domain;
+       ORTESubscription *subBlue;
+       NtpTime minimumSeparationBlue;
+       ORTESubscription *subGreen;
+       NtpTime minimumSeparationGreen;
+       ORTESubscription *subRed;
+       NtpTime minimumSeparationRed;
+       ORTESubscription *subBlack;
+       NtpTime minimumSeparationBlack;
+       ORTESubscription *subYellow;
+       NtpTime minimumSeparationYellow;
+       pthread_mutex_t mutex;
 
 public:
-       void Create(QString name, char shape, char color);
+       void Create(QString name, char eBlue,char eGreen,
+                   char eRed,char eBlack,char eYellow );
        void Destroy();
        
 public slots:
        void changeMinSep();
 
+protected:
+       BoxType boxType;
+       
 };
 #endif
index e2f10b494ee5afdc1d1eea9b73602164a42ad63a..c9781b717f57d1e828f0d43ba86a4727bf005aee 100644 (file)
@@ -15,33 +15,33 @@ View_Frame::View_Frame( QWidget *parent, const char *name )
        m_mousePressed=0;
 }
 
-void View_Frame::SetShape(char shape)
+void View_Frame::SetActiveObject(char object)
 {
-       m_shape=shape;
+  active_object[object]=1;
 }
 
-void View_Frame::SetShapeColor(char color)
+
+void View_Frame::ShapeColorRect(char object,char shape,char color,QRect rect)
 {
+       m_shape[object]=shape;
+
        switch(color)
        {
        case BLUE:
-               m_shapeColor=QColor(0,0,255);
+               m_shapeColor[object]=QColor(0,0,255);
                break;
        case GREEN:
-               m_shapeColor=QColor(0,255,0);
+               m_shapeColor[object]=QColor(0,255,0);
                break;
        case RED:
-               m_shapeColor=QColor(255,0,0);
+               m_shapeColor[object]=QColor(255,0,0);
                break;
        case BLACK:
-               m_shapeColor=QColor(0,0,0);
+               m_shapeColor[object]=QColor(0,0,0);
                break;
        }
-}
 
-void View_Frame::SetShapeRect(QRect rect)
-{
-       m_shapeRect=rect;
+       m_shapeRect[object]=rect;
        repaint();
 }
 
@@ -49,30 +49,32 @@ void View_Frame::paintEvent(QPaintEvent*)
 {
        QPainter p(this);
        
-       p.setBrush(m_shapeColor);
-       p.setPen(NoPen);
-
-
-       switch(m_shape)
-       {
-       case RECTANGLE:
-               p.drawRect(m_shapeRect);
+        for(int i=0;i<5;i++) {
+           if (!active_object[i]) continue;
+           p.setBrush(m_shapeColor[i]);
+           p.setPen(NoPen);
+           switch(m_shape[i])
+           {
+           case RECTANGLE:
+               p.drawRect(m_shapeRect[i]);
                break;
-       case ELLIPSE:
-               p.drawEllipse(m_shapeRect);
+           case ELLIPSE:
+               p.drawEllipse(m_shapeRect[i]);
                break;
-       case TRIANGLE:
+           case TRIANGLE:
                QPointArray pt(3);
-               pt.putPoints(0,3, m_shapeRect.center().x(),m_shapeRect.top(), m_shapeRect.right(),m_shapeRect.bottom(), m_shapeRect.left(),m_shapeRect.bottom());
+               pt.putPoints(0,3, m_shapeRect[i].center().x(),m_shapeRect[i].top(), 
+                                 m_shapeRect[i].right(),m_shapeRect[i].bottom(), 
+                                 m_shapeRect[i].left(),m_shapeRect[i].bottom());
                p.drawPolygon(pt);
                break;
+           }
+           QString strPos;
+           strPos="X:" + QString::number(m_shapeRect[i].center().x())+
+                  "  Y:"+QString::number(m_shapeRect[i].center().y());
+           p.drawText(m_shapeRect[i].left()-(70-m_shapeRect[i].width())/2,m_shapeRect[i].top()-1,strPos);
        }
 
-       QString strPos;
-       
-       strPos="X:" + QString::number(m_shapeRect.center().x())+"  Y:"+QString::number(m_shapeRect.center().y());
-       
-       p.drawText(m_shapeRect.left()-(70-m_shapeRect.width())/2,m_shapeRect.top()-1,strPos);
 }
 
 void View_Frame::mouseMoveEvent(QMouseEvent *e)
index 2dcd4d94a82465ce8894e6ba2804bca9bba4785b..20351263b621bab788d04ad147aa593095017a0e 100644 (file)
@@ -10,7 +10,7 @@
 #include <qwidget.h>
 #include <qrect.h>
 #include <qcolor.h>
-#include "define.h"
+#include "ortedemo_types.h"
 
 class View_Frame : public QWidget
 {
@@ -19,28 +19,28 @@ public:
     View_Frame( QWidget *parent=0, const char *name=0 );
     
 protected:
-       void mouseMoveEvent(QMouseEvent *e);
-       void mousePressEvent(QMouseEvent *e);
-       void mouseReleaseEvent(QMouseEvent *e);
+    void mouseMoveEvent(QMouseEvent *e);
+    void mousePressEvent(QMouseEvent *e);
+    void mouseReleaseEvent(QMouseEvent *e);
 
 
 public:
-    void SetShape(char shape);
-    void SetShapeColor(char color);
+    void SetActiveObject(char object);
+    void ShapeColorRect(char object,char shape,char color,QRect rect);
     void paintEvent(QPaintEvent*);
-    void SetShapeRect(QRect rect);
 
 protected:
-    QRect m_shapeRect;
-    QColor m_shapeColor;
+    int active_object[5];
+    QRect m_shapeRect[5];
+    QColor m_shapeColor[5];
 
 private:
-    char m_shape;
+    char m_shape[5];
 
 public:
-       char m_mousePressed;
-       int m_mouseX;
-       int m_mouseY;
+    char m_mousePressed;
+    int m_mouseX;
+    int m_mouseY;
 
 };
 
diff --git a/orte/contrib/shape/define.h b/orte/contrib/shape/define.h
deleted file mode 100644 (file)
index 338ba13..0000000
+++ /dev/null
@@ -1,14 +0,0 @@
-#if !defined CONST_DEFINE
-#define CONST_DEFINE
-
-
-#define ELLIPSE                0
-#define RECTANGLE      1
-#define TRIANGLE       2
-
-#define BLUE           0
-#define GREEN          1
-#define RED            2
-#define BLACK          3
-
-#endif
index fe7eb699d3674a7d28ee9196de26c3084772fb51..d17b2437e39d7165161f56678a7880d6dc907157 100644 (file)
@@ -4,7 +4,7 @@
 int main( int argc, char ** argv )
 {
     QApplication a( argc, argv );
-     MulticlipForm *w = new MulticlipForm();
+    MulticlipForm *w = new MulticlipForm();
     w->show();
     a.connect( &a, SIGNAL( lastWindowClosed() ), &a, SLOT( quit() ) );
     return a.exec();
diff --git a/orte/contrib/shape/ortedemo.pro b/orte/contrib/shape/ortedemo.pro
new file mode 100644 (file)
index 0000000..8c657d5
--- /dev/null
@@ -0,0 +1,21 @@
+SOURCES        += main.cpp \
+       Publisher.cpp \
+       ViewFrm.cpp \
+       Subscriber.cpp \
+       ortedemo_types.c
+HEADERS        += Publisher.h \
+       ViewFrm.h \
+       ortedemo_types.h \
+       Subscriber.h
+unix {
+  UI_DIR = .ui
+  MOC_DIR = .moc
+  OBJECTS_DIR = .obj
+}
+FORMS  = MulticlipForm.ui \
+       MainFrm.ui 
+TEMPLATE       =app
+CONFIG += qt warn_on release
+INCLUDEPATH    += ../../include
+LIBS   += ../../../debug/orte/liborte/liborte.a -lpthread
+LANGUAGE       = C++
diff --git a/orte/contrib/shape/ortedemo_types.c b/orte/contrib/shape/ortedemo_types.c
new file mode 100644 (file)
index 0000000..26f6fa0
--- /dev/null
@@ -0,0 +1,68 @@
+#include "ortedemo_types.h"
+
+/*****************************************************************************/
+void
+BoxTypeSerialize(ORTECDRStream *cdr_stream, void *instance) {
+  BoxType  *boxType=(BoxType*)instance;
+
+  //color
+  *(int*)cdr_stream->bufferPtr=boxType->color;
+  cdr_stream->bufferPtr+=sizeof(int);
+  //shape
+  *(int*)cdr_stream->bufferPtr=boxType->shape;
+  cdr_stream->bufferPtr+=sizeof(int);
+  //************************************************************
+  //Box position
+  //top_left_x
+  *(int*)cdr_stream->bufferPtr=boxType->rectangle.top_left_x;
+  cdr_stream->bufferPtr+=sizeof(int);
+  //top_left_y
+  *(int*)cdr_stream->bufferPtr=boxType->rectangle.top_left_y;
+  cdr_stream->bufferPtr+=sizeof(int);
+  //bottom_right_x
+  *(int*)cdr_stream->bufferPtr=boxType->rectangle.bottom_right_x;
+  cdr_stream->bufferPtr+=sizeof(int);
+  //bottom_right_y
+  *(int*)cdr_stream->bufferPtr=boxType->rectangle.bottom_right_y;
+  cdr_stream->bufferPtr+=sizeof(int);
+}
+
+/*****************************************************************************/
+void
+BoxTypeDeserialize(ORTECDRStream *cdr_stream, void *instance) {
+  BoxType  *boxType=(BoxType*)instance;
+
+  //color
+  boxType->color=*(int*)cdr_stream->bufferPtr;
+  cdr_stream->bufferPtr+=sizeof(int);
+  //shape
+  boxType->shape=*(int*)cdr_stream->bufferPtr;
+  cdr_stream->bufferPtr+=sizeof(int);
+  //************************************************************
+  //Box position
+  //top_left_x
+  boxType->rectangle.top_left_x=*(int*)cdr_stream->bufferPtr;
+  cdr_stream->bufferPtr+=sizeof(int);
+  //top_left_y
+  boxType->rectangle.top_left_y=*(int*)cdr_stream->bufferPtr;
+  cdr_stream->bufferPtr+=sizeof(int);
+  //bottom_right_x
+  boxType->rectangle.bottom_right_x=*(int*)cdr_stream->bufferPtr;
+  cdr_stream->bufferPtr+=sizeof(int);
+  //bottom_right_y
+  boxType->rectangle.bottom_right_y=*(int*)cdr_stream->bufferPtr;
+  cdr_stream->bufferPtr+=sizeof(int);
+}
+
+/*****************************************************************************/
+Boolean 
+ORTETypeRegisterBoxType(ORTEDomain *d) {
+   return ORTETypeRegisterAdd(
+                d,
+                "BoxType",
+               BoxTypeSerialize, 
+               BoxTypeDeserialize,
+               sizeof(BoxType));
+
+}
+
diff --git a/orte/contrib/shape/ortedemo_types.h b/orte/contrib/shape/ortedemo_types.h
new file mode 100644 (file)
index 0000000..688314f
--- /dev/null
@@ -0,0 +1,41 @@
+#ifndef ORTEDEMO_TYPES_H
+#define ORTEDEMO_TYPES_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include <sys/types.h>
+#include <orte_api.h>
+
+
+#define ELLIPSE                0
+#define RECTANGLE      1
+#define TRIANGLE       2
+
+#define BLUE           0
+#define GREEN          1
+#define RED            2
+#define BLACK          3
+
+typedef struct BoxRect {
+    int top_left_x;
+    int top_left_y;
+    int bottom_right_x;
+    int bottom_right_y;
+} BoxRect;
+       
+typedef struct BoxType {
+    int      color;
+    int      shape;
+    BoxRect  rectangle;
+} BoxType;
+                           
+extern Boolean 
+ORTETypeRegisterBoxType(ORTEDomain *d);
+
+#ifdef __cplusplus
+} /* extern "C"*/
+#endif
+
+#endif
index 5ba9483031a652d49e78e57035ca62928b1500f0..d4dafa48e08555bf613c8a9556fc7cde03c40527 100644 (file)
@@ -8,5 +8,5 @@
 if CONFIG_ORTE_RT
 SUBDIRS = hello 
 else
-SUBDIRS        = hello reliable ORTEPing ORTESpy
+SUBDIRS        = hello reliable ping spy
 endif
index a68107bc158bef7da6f97212c7ec60832336aa53..fd3ea1a169614646ccbf3c56a9953c83ef0f2f96 100644 (file)
@@ -68,6 +68,7 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 AMTAR = @AMTAR@
 AWK = @AWK@
 CC = @CC@
+CONFIG_ORTE_KERNEL = @CONFIG_ORTE_KERNEL@
 CONFIG_ORTE_RT = @CONFIG_ORTE_RT@
 DEPDIR = @DEPDIR@
 INCLUDES = @INCLUDES@
@@ -109,7 +110,7 @@ moduledir = @moduledir@
 #  Uncomment and customize the following to ORTE your needs:
 #
 @CONFIG_ORTE_RT_TRUE@SUBDIRS = hello 
-@CONFIG_ORTE_RT_FALSE@SUBDIRS = hello reliable ORTEPing ORTESpy
+@CONFIG_ORTE_RT_FALSE@SUBDIRS = hello reliable ping spy
 subdir = orte/examples
 mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
 CONFIG_HEADER = $(top_builddir)/orte/include/config.h
@@ -121,7 +122,7 @@ RECURSIVE_TARGETS = info-recursive dvi-recursive install-info-recursive \
        install-exec-recursive installdirs-recursive install-recursive \
        uninstall-recursive check-recursive installcheck-recursive
 DIST_COMMON = Makefile.am Makefile.in
-DIST_SUBDIRS = hello reliable ORTEPing ORTESpy
+DIST_SUBDIRS = hello reliable ping spy
 all: all-recursive
 
 .SUFFIXES:
index 49ac3d21a1abb15ea1f56673df100b0bd472e25f..ae55be0c9d69f5a9a28b5d05613f115feb7e1951 100644 (file)
@@ -1 +1 @@
-SUBDIRS = ORTEPing ORTESpy hello reliable
+SUBDIRS = ping spy hello reliable
index 06bbd188cd84195930e756ed067d6e0100986269..12908ebb7203b624cddfade5b93d65aa4d43ff41 100644 (file)
 #ifdef HAVE_CONFIG_H
   #include <orte_config.h>
 #endif
-#if defined(CONFIG_ORTE_RTL)
-  #include <stdio.h>
+#include "orte_api.h"
+#ifdef CONFIG_ORTE_RTL
+  #include <linux/module.h>
   #include <posix/pthread.h>
   #define printf rtl_printf
-#elif defined(CONFIG_ORTE_RTAI)
+#elif defined CONFIG_ORTE_RTAI
   #include <linux/module.h>
-  #include <rtai.h>
-  #include <rtai_sched.h>
-  #include <rtai_sem.h>
+  #include <rtai/compat.h>  
   #define printf rt_printk
 #else
   #include <stdio.h>
 #endif
-#include "orte_api.h"
 
-ORTEDomain        *d;
+ORTEDomain        *d=NULL;
 char              instance2Send[64];
-char              terminate=0;
 int               counter=0;
-#ifdef CONFIG_ORTE_RTAI
-int               terminated = 0;
-SEM               term_sem;
-#endif
 
 void
 sendCallBack(const ORTESendInfo *info,void *vinstance, void *sendCallBackParam) {
@@ -61,25 +54,13 @@ sendCallBack(const ORTESendInfo *info,void *vinstance, void *sendCallBackParam)
 }
 
 void *
-publisher(void *arg) {
+publisherCreate(void *arg) {
   ORTEPublication     *p;
-  ORTEDomainProp      dp;
   NtpTime             persistence, delay;
 
-  ORTEInit();
-//  ORTEVerbositySetOptions("ALL,5");
-  ORTEDomainPropDefaultGet(&dp);
-  #ifdef CONFIG_ORTE_RTL
-  dp.appLocalManager=StringToIPAddress("192.168.4.1");
-  #endif
-  d=ORTEDomainAppCreate(ORTE_DEFAULT_DOMAIN,&dp,NULL,ORTE_FALSE);
-  if (!d) {
-    printf("ORTEDomainAppCreate failed!\n");
-    return 0;
-  }
   ORTETypeRegisterAdd(d,"HelloMsg",NULL,NULL,64);
   NTPTIME_BUILD(persistence,3);
-  NTPTIME_BUILD(delay,10); //10s
+  NTPTIME_BUILD(delay,1); 
   p=ORTEPublicationCreate(
        d,
       "Example HelloMsg",
@@ -90,27 +71,64 @@ publisher(void *arg) {
       sendCallBack,
       NULL,
       &delay);
-  return 0;
+  return arg;
 }
 
+
 #ifndef CONFIG_ORTE_RT
+
 int
 main(int argc, char *args[]) {
-  publisher(NULL);
-  while(1) {
-    ORTESleepMs(1000);
+  ORTEInit();
+  d=ORTEDomainAppCreate(ORTE_DEFAULT_DOMAIN,NULL,NULL,ORTE_FALSE);
+  if (!d) {
+    printf("ORTEDomainAppCreate failed!\n");
+    return 0;
   }
+  publisherCreate((void*)d);
+  while(1) 
+    ORTESleepMs(1000);
   return 0;
 }
+
 #else
+
+char *manager="127.0.0.1";
+MODULE_PARM(manager,"1s");
+MODULE_PARM_DESC(manager,"IP address of local manager");
 MODULE_LICENSE("GPL");
+pthread_t thread;
+
+void *
+domainDestroy(void *arg) {
+  if (!d) return NULL;
+  ORTEDomainAppDestroy(d);
+  return arg;
+}
+
 int
 init_module(void) {
-  publisher(NULL);
+  ORTEDomainProp      dp;
+
+  ORTEDomainPropDefaultGet(&dp);
+  dp.appLocalManager=StringToIPAddress(manager);
+  d=ORTEDomainAppCreate(ORTE_DEFAULT_DOMAIN,&dp,NULL,ORTE_FALSE);
+  if (d) 
+    pthread_create(&thread,NULL,&publisherCreate,NULL);
+  else
+    printf("ORTEDomainAppCreate failed!\n");
   return 0;
 }
+
+
 void
 cleanup_module(void) {
-  ORTEDomainAppDestroy(d);
+  if (!d) return;
+  pthread_join(thread,NULL);
+  pthread_create(&thread,NULL,&domainDestroy,NULL);
+  pthread_join(thread,NULL);
 }
+
 #endif
+
+
index f72ab779da67fdb7fb72a241fe4e75efc2cead52..af26aecc03f3d9a65af4e71e37eff9aaa5b97926 100644 (file)
  *  GNU General Public License for more details.
  *
  */
-
 #ifdef HAVE_CONFIG_H
   #include <orte_config.h>
 #endif
-
+#include "orte_api.h"
 #ifdef CONFIG_ORTE_RTL
-  #include <stdio.h>
+  #include <linux/module.h>
   #include <posix/pthread.h>
   #define printf rtl_printf
-#elif defined(CONFIG_ORTE_RTAI)
+#elif defined CONFIG_ORTE_RTAI
   #include <linux/module.h>
-  #include <rtai.h>
-  #include <rtai_sched.h>
-  #include <rtai_sem.h>
+  #include <rtai/compat.h>  
   #define printf rt_printk
 #else
   #include <stdio.h>
 #endif
-#include "orte_api.h"
 
-ORTEDomain *d=NULL;
+
+ORTEDomain        *d = NULL;
+char              instance2Recv[64];
 
 void
 recvCallBack(const ORTERecvInfo *info,void *vinstance, void *recvCallBackParam) {
@@ -54,24 +52,12 @@ recvCallBack(const ORTERecvInfo *info,void *vinstance, void *recvCallBackParam)
   }
 }
 
-void
-subscriberCreate(void) {
+
+void *
+subscriberCreate(void *arg) {
   ORTESubscription    *s;
-  ORTEDomainProp      dp;
   NtpTime             deadline,minimumSeparation;
-  char                instance2Recv[64];
 
-  ORTEInit();
-//  ORTEVerbositySetOptions("ALL,5");
-  ORTEDomainPropDefaultGet(&dp);
-  #ifdef CONFIG_ORTE_RTL
-  dp.appLocalManager=StringToIPAddress("192.168.4.1");
-  #endif
-  d=ORTEDomainAppCreate(ORTE_DEFAULT_DOMAIN,&dp,NULL,ORTE_FALSE);
-  if (!d) {
-    printf("ORTEDomainAppCreate failed!\n");
-    return;
-  }
   ORTETypeRegisterAdd(d,"HelloMsg",NULL,NULL,64);
   NTPTIME_BUILD(deadline,20);
   NTPTIME_BUILD(minimumSeparation,0);
@@ -86,27 +72,68 @@ subscriberCreate(void) {
        &minimumSeparation,
        recvCallBack,
        NULL);
+  return arg;
 }
 
+
 #ifndef CONFIG_ORTE_RT
+
 int
 main(int argc, char *args[]) {
-  subscriberCreate();
+  ORTEInit();
+  d=ORTEDomainAppCreate(ORTE_DEFAULT_DOMAIN,NULL,NULL,ORTE_FALSE);
+  if (!d) {
+    printf("ORTEDomainAppCreate failed!\n");
+    return 0;
+  }
+  subscriberCreate(NULL);
   while (1)
     ORTESleepMs(1000);
   return 0;
 }
+
 #else
+
+char manager[MAX_STRING_IPADDRESS_LENGTH]="127.0.0.1";
+MODULE_PARM(manager,"s");
+MODULE_PARM_DESC(manager,"IP address of local manager");
 MODULE_LICENSE("GPL");
+pthread_t thread;
+
+void *
+domainDestroy(void *arg) {
+  if (!d) return NULL;
+  ORTEDomainAppDestroy(d);
+  return arg;
+}
+
 int
 init_module(void) {
-  subscriberCreate();
+  ORTEDomainProp      dp;
+
+  ORTEDomainPropDefaultGet(&dp);
+  dp.appLocalManager=StringToIPAddress(manager);
+  d=ORTEDomainAppCreate(ORTE_DEFAULT_DOMAIN,&dp,NULL,ORTE_FALSE);
+  if (d) 
+    pthread_create(&thread,NULL,&subscriberCreate,NULL);
+  else
+    printf("ORTEDomainAppCreate failed!\n");
   return 0;
 }
+
+
 void
 cleanup_module(void) {
-  if (d)
-    ORTEDomainAppDestroy(d);
+  if (!d) return;
+  pthread_join(thread,NULL);
+  pthread_create(&thread,NULL,&domainDestroy,NULL);
+  pthread_join(thread,NULL);
 }
+
 #endif
 
+
+
+
+
+
index 0dd861f45b558fa36d29cdd0a1367db86bba2d2f..7729d11cb1016b151ef39befa5381f20abd35a89 100644 (file)
@@ -1,9 +1,9 @@
 if CONFIG_ORTE_RT
   module_PROGRAMS = rt_HelloWorldSubscriber.ko rt_HelloWorldPublisher.ko
-  rt_HelloWorldSubscriber_ko_CFLAGS = $(ORTE_CFLAGS) $(LINUX_CFLAGS) $(RTAI_CFLAGS) $(RTLINUX_CFLAGS)
+#  rt_HelloWorldSubscriber_ko_CFLAGS = $(ORTE_CFLAGS) 
   rt_HelloWorldSubscriber_ko_SOURCES = HelloWorldSubscriber.c  
   rt_HelloWorldSubscriber_ko_LINK = $(top_builddir)/modtool --link -o $@
-  rt_HelloWorldPublisher_ko_CFLAGS = $(ORTE_CFLAGS) $(LINUX_CFLAGS) $(RTAI_CFLAGS) $(RTLINUX_CFLAGS)
+#  rt_HelloWorldPublisher_ko_CFLAGS = $(ORTE_CFLAGS)
   rt_HelloWorldPublisher_ko_SOURCES = HelloWorldPublisher.c  
   rt_HelloWorldPublisher_ko_LINK = $(top_builddir)/modtool --link -o $@
 else
index a0277489a2dd2ebfbcaa1926fd976629095f3317..bfb33da151ec015b3a8c27fbd15d1d6fd53b87c4 100644 (file)
@@ -68,6 +68,7 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 AMTAR = @AMTAR@
 AWK = @AWK@
 CC = @CC@
+CONFIG_ORTE_KERNEL = @CONFIG_ORTE_KERNEL@
 CONFIG_ORTE_RT = @CONFIG_ORTE_RT@
 DEPDIR = @DEPDIR@
 INCLUDES = @INCLUDES@
@@ -101,10 +102,10 @@ install_sh = @install_sh@
 modulePROGRAMS_INSTALL = @modulePROGRAMS_INSTALL@
 moduledir = @moduledir@
 @CONFIG_ORTE_RT_TRUE@module_PROGRAMS = rt_HelloWorldSubscriber.ko rt_HelloWorldPublisher.ko
-@CONFIG_ORTE_RT_TRUE@rt_HelloWorldSubscriber_ko_CFLAGS = $(ORTE_CFLAGS) $(LINUX_CFLAGS) $(RTAI_CFLAGS) $(RTLINUX_CFLAGS)
+#  rt_HelloWorldSubscriber_ko_CFLAGS = $(ORTE_CFLAGS) 
 @CONFIG_ORTE_RT_TRUE@rt_HelloWorldSubscriber_ko_SOURCES = HelloWorldSubscriber.c  
 @CONFIG_ORTE_RT_TRUE@rt_HelloWorldSubscriber_ko_LINK = $(top_builddir)/modtool --link -o $@
-@CONFIG_ORTE_RT_TRUE@rt_HelloWorldPublisher_ko_CFLAGS = $(ORTE_CFLAGS) $(LINUX_CFLAGS) $(RTAI_CFLAGS) $(RTLINUX_CFLAGS)
+#  rt_HelloWorldPublisher_ko_CFLAGS = $(ORTE_CFLAGS)
 @CONFIG_ORTE_RT_TRUE@rt_HelloWorldPublisher_ko_SOURCES = HelloWorldPublisher.c  
 @CONFIG_ORTE_RT_TRUE@rt_HelloWorldPublisher_ko_LINK = $(top_builddir)/modtool --link -o $@
 @CONFIG_ORTE_RT_FALSE@noinst_PROGRAMS = HelloWorldPublisher HelloWorldSubscriber
@@ -149,14 +150,14 @@ HelloWorldSubscriber_OBJECTS = $(am_HelloWorldSubscriber_OBJECTS)
 @CONFIG_ORTE_RT_TRUE@@CONFIG_ORTE_WIN_FALSE@HelloWorldSubscriber_DEPENDENCIES =
 HelloWorldSubscriber_LDFLAGS =
 @CONFIG_ORTE_RT_TRUE@am_rt_HelloWorldPublisher_ko_OBJECTS = \
-@CONFIG_ORTE_RT_TRUE@  rt_HelloWorldPublisher_ko-HelloWorldPublisher.$(OBJEXT)
+@CONFIG_ORTE_RT_TRUE@  HelloWorldPublisher.$(OBJEXT)
 rt_HelloWorldPublisher_ko_OBJECTS = \
        $(am_rt_HelloWorldPublisher_ko_OBJECTS)
 rt_HelloWorldPublisher_ko_LDADD = $(LDADD)
 rt_HelloWorldPublisher_ko_DEPENDENCIES =
 rt_HelloWorldPublisher_ko_LDFLAGS =
 @CONFIG_ORTE_RT_TRUE@am_rt_HelloWorldSubscriber_ko_OBJECTS = \
-@CONFIG_ORTE_RT_TRUE@  rt_HelloWorldSubscriber_ko-HelloWorldSubscriber.$(OBJEXT)
+@CONFIG_ORTE_RT_TRUE@  HelloWorldSubscriber.$(OBJEXT)
 rt_HelloWorldSubscriber_ko_OBJECTS = \
        $(am_rt_HelloWorldSubscriber_ko_OBJECTS)
 rt_HelloWorldSubscriber_ko_LDADD = $(LDADD)
@@ -171,9 +172,7 @@ LIBS = @LIBS@
 depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
 am__depfiles_maybe = depfiles
 @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/HelloWorldPublisher.Po \
-@AMDEP_TRUE@   ./$(DEPDIR)/HelloWorldSubscriber.Po \
-@AMDEP_TRUE@   ./$(DEPDIR)/rt_HelloWorldPublisher_ko-HelloWorldPublisher.Po \
-@AMDEP_TRUE@   ./$(DEPDIR)/rt_HelloWorldSubscriber_ko-HelloWorldSubscriber.Po
+@AMDEP_TRUE@   ./$(DEPDIR)/HelloWorldSubscriber.Po
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
        $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 CCLD = $(CC)
@@ -227,13 +226,9 @@ HelloWorldPublisher$(EXEEXT): $(HelloWorldPublisher_OBJECTS) $(HelloWorldPublish
 HelloWorldSubscriber$(EXEEXT): $(HelloWorldSubscriber_OBJECTS) $(HelloWorldSubscriber_DEPENDENCIES) 
        @rm -f HelloWorldSubscriber$(EXEEXT)
        $(LINK) $(HelloWorldSubscriber_LDFLAGS) $(HelloWorldSubscriber_OBJECTS) $(HelloWorldSubscriber_LDADD) $(LIBS)
-rt_HelloWorldPublisher_ko-HelloWorldPublisher.$(OBJEXT): \
-       HelloWorldPublisher.c
 rt_HelloWorldPublisher.ko$(EXEEXT): $(rt_HelloWorldPublisher_ko_OBJECTS) $(rt_HelloWorldPublisher_ko_DEPENDENCIES) 
        @rm -f rt_HelloWorldPublisher.ko$(EXEEXT)
        $(rt_HelloWorldPublisher_ko_LINK) $(rt_HelloWorldPublisher_ko_LDFLAGS) $(rt_HelloWorldPublisher_ko_OBJECTS) $(rt_HelloWorldPublisher_ko_LDADD) $(LIBS)
-rt_HelloWorldSubscriber_ko-HelloWorldSubscriber.$(OBJEXT): \
-       HelloWorldSubscriber.c
 rt_HelloWorldSubscriber.ko$(EXEEXT): $(rt_HelloWorldSubscriber_ko_OBJECTS) $(rt_HelloWorldSubscriber_ko_DEPENDENCIES) 
        @rm -f rt_HelloWorldSubscriber.ko$(EXEEXT)
        $(rt_HelloWorldSubscriber_ko_LINK) $(rt_HelloWorldSubscriber_ko_LDFLAGS) $(rt_HelloWorldSubscriber_ko_OBJECTS) $(rt_HelloWorldSubscriber_ko_LDADD) $(LIBS)
@@ -246,8 +241,6 @@ distclean-compile:
 
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/HelloWorldPublisher.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/HelloWorldSubscriber.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rt_HelloWorldPublisher_ko-HelloWorldPublisher.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rt_HelloWorldSubscriber_ko-HelloWorldSubscriber.Po@am__quote@
 
 distclean-depend:
        -rm -rf ./$(DEPDIR)
@@ -263,30 +256,6 @@ distclean-depend:
 @AMDEP_TRUE@   depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
 @AMDEP_TRUE@   $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
        $(COMPILE) -c `cygpath -w $<`
-
-rt_HelloWorldPublisher_ko-HelloWorldPublisher.o: HelloWorldPublisher.c
-@AMDEP_TRUE@   source='HelloWorldPublisher.c' object='rt_HelloWorldPublisher_ko-HelloWorldPublisher.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@   depfile='$(DEPDIR)/rt_HelloWorldPublisher_ko-HelloWorldPublisher.Po' tmpdepfile='$(DEPDIR)/rt_HelloWorldPublisher_ko-HelloWorldPublisher.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@   $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-       $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(rt_HelloWorldPublisher_ko_CFLAGS) $(CFLAGS) -c -o rt_HelloWorldPublisher_ko-HelloWorldPublisher.o `test -f 'HelloWorldPublisher.c' || echo '$(srcdir)/'`HelloWorldPublisher.c
-
-rt_HelloWorldPublisher_ko-HelloWorldPublisher.obj: HelloWorldPublisher.c
-@AMDEP_TRUE@   source='HelloWorldPublisher.c' object='rt_HelloWorldPublisher_ko-HelloWorldPublisher.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@   depfile='$(DEPDIR)/rt_HelloWorldPublisher_ko-HelloWorldPublisher.Po' tmpdepfile='$(DEPDIR)/rt_HelloWorldPublisher_ko-HelloWorldPublisher.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@   $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-       $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(rt_HelloWorldPublisher_ko_CFLAGS) $(CFLAGS) -c -o rt_HelloWorldPublisher_ko-HelloWorldPublisher.obj `cygpath -w HelloWorldPublisher.c`
-
-rt_HelloWorldSubscriber_ko-HelloWorldSubscriber.o: HelloWorldSubscriber.c
-@AMDEP_TRUE@   source='HelloWorldSubscriber.c' object='rt_HelloWorldSubscriber_ko-HelloWorldSubscriber.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@   depfile='$(DEPDIR)/rt_HelloWorldSubscriber_ko-HelloWorldSubscriber.Po' tmpdepfile='$(DEPDIR)/rt_HelloWorldSubscriber_ko-HelloWorldSubscriber.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@   $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-       $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(rt_HelloWorldSubscriber_ko_CFLAGS) $(CFLAGS) -c -o rt_HelloWorldSubscriber_ko-HelloWorldSubscriber.o `test -f 'HelloWorldSubscriber.c' || echo '$(srcdir)/'`HelloWorldSubscriber.c
-
-rt_HelloWorldSubscriber_ko-HelloWorldSubscriber.obj: HelloWorldSubscriber.c
-@AMDEP_TRUE@   source='HelloWorldSubscriber.c' object='rt_HelloWorldSubscriber_ko-HelloWorldSubscriber.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@   depfile='$(DEPDIR)/rt_HelloWorldSubscriber_ko-HelloWorldSubscriber.Po' tmpdepfile='$(DEPDIR)/rt_HelloWorldSubscriber_ko-HelloWorldSubscriber.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@   $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-       $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(rt_HelloWorldSubscriber_ko_CFLAGS) $(CFLAGS) -c -o rt_HelloWorldSubscriber_ko-HelloWorldSubscriber.obj `cygpath -w HelloWorldSubscriber.c`
 CCDEPMODE = @CCDEPMODE@
 uninstall-info-am:
 
index d26528c99d7798705aceb00f3f98ff84290486c7..34c571ae2b0c9ea1070a9981789bc5673e2037bf 100644 (file)
@@ -1,4 +1,4 @@
-INCLUDES = -D_OMK_UNIX
+INCLUDES = -I $(srcdir)/../../include -DORTE_OMK_UNIX
 
 utils_PROGRAMS = helloPublisher helloSubscriber
 
@@ -12,9 +12,11 @@ lib_LOADLIBES =  orte pthread
 # RT-Linux version of build
 
 rtlinux_MODULES = HelloWorldPublisher HelloWorldSubscriber
+
+rtlinux_INCLUDES = -I $(srcdir)/../../include -DORTE_OMK_RTL
                
 HelloWorldPublisher_SOURCES = HelloWorldPublisher.c
 
 HelloWorldSubscriber_SOURCES = HelloWorldSubscriber.c
 
-rtlinux_LOADLIBES =  orte_rtl pthread_rwlock
+rtlinux_LOADLIBES =  orte_rt pthread_rwlock
diff --git a/orte/examples/ping/Makefile b/orte/examples/ping/Makefile
new file mode 100644 (file)
index 0000000..f595272
--- /dev/null
@@ -0,0 +1,14 @@
+# Generic directory or leaf node makefile for OCERA make framework
+
+ifndef MAKERULES_DIR
+MAKERULES_DIR := $(shell ( old_pwd="" ;  while [ ! -e Makefile.rules ] ; do if [ "$$old_pwd" == `pwd`  ] ; then exit 1 ; else old_pwd=`pwd` ; cd -L .. 2>/dev/null ; fi ; done ; pwd ) )
+endif
+
+ifeq ($(MAKERULES_DIR),)
+all : default
+.DEFAULT::
+       @echo -e "\nThe Makefile.rules has not been found in this or partent directory\n"
+else   
+include $(MAKERULES_DIR)/Makefile.rules
+endif
+
diff --git a/orte/examples/ping/Makefile.am b/orte/examples/ping/Makefile.am
new file mode 100644 (file)
index 0000000..c64c044
--- /dev/null
@@ -0,0 +1,8 @@
+bin_PROGRAMS = orteping
+
+orteping_SOURCES = orteping.c
+if CONFIG_ORTE_WIN
+  win_libs= $(top_srcdir)/orte/contrib/win_pthread/libpthreadGC.a 
+endif
+orteping_LDADD   = ../../liborte/liborte.a $(win_libs)
+
diff --git a/orte/examples/ping/Makefile.in b/orte/examples/ping/Makefile.in
new file mode 100644 (file)
index 0000000..8d70130
--- /dev/null
@@ -0,0 +1,344 @@
+# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# @configure_input@
+
+# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
+# Free Software Foundation, Inc.
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+@SET_MAKE@
+SHELL = @SHELL@
+
+srcdir = @srcdir@
+top_srcdir = @top_srcdir@
+VPATH = @srcdir@
+prefix = @prefix@
+exec_prefix = @exec_prefix@
+
+bindir = @bindir@
+sbindir = @sbindir@
+libexecdir = @libexecdir@
+datadir = @datadir@
+sysconfdir = @sysconfdir@
+sharedstatedir = @sharedstatedir@
+localstatedir = @localstatedir@
+libdir = @libdir@
+infodir = @infodir@
+mandir = @mandir@
+includedir = @includedir@
+oldincludedir = /usr/include
+pkgdatadir = $(datadir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+top_builddir = ../../..
+
+ACLOCAL = @ACLOCAL@
+AUTOCONF = @AUTOCONF@
+AUTOMAKE = @AUTOMAKE@
+AUTOHEADER = @AUTOHEADER@
+
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+INSTALL = @INSTALL@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_DATA = @INSTALL_DATA@
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = @program_transform_name@
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+host_alias = @host_alias@
+host_triplet = @host@
+
+EXEEXT = @EXEEXT@
+OBJEXT = @OBJEXT@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+AMTAR = @AMTAR@
+AWK = @AWK@
+CC = @CC@
+CONFIG_ORTE_KERNEL = @CONFIG_ORTE_KERNEL@
+CONFIG_ORTE_RT = @CONFIG_ORTE_RT@
+DEPDIR = @DEPDIR@
+INCLUDES = @INCLUDES@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+LINUX_AFLAGS = @LINUX_AFLAGS@
+LINUX_ARCH = @LINUX_ARCH@
+LINUX_ARFLAGS = @LINUX_ARFLAGS@
+LINUX_AS = @LINUX_AS@
+LINUX_CC = @LINUX_CC@
+LINUX_CFLAGS = @LINUX_CFLAGS@
+LINUX_CROSS_COMPILE = @LINUX_CROSS_COMPILE@
+LINUX_DIR = @LINUX_DIR@
+LINUX_KERNELRELEASE = @LINUX_KERNELRELEASE@
+LINUX_LD = @LINUX_LD@
+LINUX_LDFLAGS = @LINUX_LDFLAGS@
+LINUX_MODULE_EXT = @LINUX_MODULE_EXT@
+MAINT = @MAINT@
+ORTE_MAJOR_VERSION = @ORTE_MAJOR_VERSION@
+ORTE_MICRO_VERSION = @ORTE_MICRO_VERSION@
+ORTE_MINOR_VERSION = @ORTE_MINOR_VERSION@
+ORTE_VERSION = @ORTE_VERSION@
+PACKAGE = @PACKAGE@
+RANLIB = @RANLIB@
+RTAI_CFLAGS = @RTAI_CFLAGS@
+RTLINUX_CFLAGS = @RTLINUX_CFLAGS@
+STRIP = @STRIP@
+VERSION = @VERSION@
+am__include = @am__include@
+am__quote = @am__quote@
+install_sh = @install_sh@
+modulePROGRAMS_INSTALL = @modulePROGRAMS_INSTALL@
+moduledir = @moduledir@
+bin_PROGRAMS = orteping
+
+orteping_SOURCES = orteping.c
+@CONFIG_ORTE_WIN_TRUE@win_libs = $(top_srcdir)/orte/contrib/win_pthread/libpthreadGC.a 
+orteping_LDADD = ../../liborte/liborte.a $(win_libs)
+subdir = orte/examples/ping
+mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
+CONFIG_HEADER = $(top_builddir)/orte/include/config.h
+CONFIG_CLEAN_FILES =
+bin_PROGRAMS = orteping$(EXEEXT)
+PROGRAMS = $(bin_PROGRAMS)
+
+am_orteping_OBJECTS = orteping.$(OBJEXT)
+orteping_OBJECTS = $(am_orteping_OBJECTS)
+@CONFIG_ORTE_WIN_TRUE@orteping_DEPENDENCIES = ../../liborte/liborte.a \
+@CONFIG_ORTE_WIN_TRUE@ $(top_srcdir)/orte/contrib/win_pthread/libpthreadGC.a
+@CONFIG_ORTE_WIN_FALSE@orteping_DEPENDENCIES = ../../liborte/liborte.a
+orteping_LDFLAGS =
+
+DEFS = @DEFS@
+DEFAULT_INCLUDES =  -I. -I$(srcdir) -I$(top_builddir)/orte/include
+CPPFLAGS = @CPPFLAGS@
+LDFLAGS = @LDFLAGS@
+LIBS = @LIBS@
+depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
+am__depfiles_maybe = depfiles
+@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/orteping.Po
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+       $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+CCLD = $(CC)
+LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+CFLAGS = @CFLAGS@
+DIST_SOURCES = $(orteping_SOURCES)
+DIST_COMMON = Makefile.am Makefile.in
+SOURCES = $(orteping_SOURCES)
+
+all: all-am
+
+.SUFFIXES:
+.SUFFIXES: .c .o .obj
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
+       cd $(top_srcdir) && \
+         $(AUTOMAKE) --gnu  orte/examples/ping/Makefile
+Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in  $(top_builddir)/config.status
+       cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
+binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
+install-binPROGRAMS: $(bin_PROGRAMS)
+       @$(NORMAL_INSTALL)
+       $(mkinstalldirs) $(DESTDIR)$(bindir)
+       @list='$(bin_PROGRAMS)'; for p in $$list; do \
+         p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
+         if test -f $$p \
+         ; then \
+           f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
+          echo " $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f"; \
+          $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f; \
+         else :; fi; \
+       done
+
+uninstall-binPROGRAMS:
+       @$(NORMAL_UNINSTALL)
+       @list='$(bin_PROGRAMS)'; for p in $$list; do \
+         f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
+         echo " rm -f $(DESTDIR)$(bindir)/$$f"; \
+         rm -f $(DESTDIR)$(bindir)/$$f; \
+       done
+
+clean-binPROGRAMS:
+       -test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS)
+orteping$(EXEEXT): $(orteping_OBJECTS) $(orteping_DEPENDENCIES) 
+       @rm -f orteping$(EXEEXT)
+       $(LINK) $(orteping_LDFLAGS) $(orteping_OBJECTS) $(orteping_LDADD) $(LIBS)
+
+mostlyclean-compile:
+       -rm -f *.$(OBJEXT) core *.core
+
+distclean-compile:
+       -rm -f *.tab.c
+
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/orteping.Po@am__quote@
+
+distclean-depend:
+       -rm -rf ./$(DEPDIR)
+
+.c.o:
+@AMDEP_TRUE@   source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@   depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@   $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+       $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$<
+
+.c.obj:
+@AMDEP_TRUE@   source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@   depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@   $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+       $(COMPILE) -c `cygpath -w $<`
+CCDEPMODE = @CCDEPMODE@
+uninstall-info-am:
+
+ETAGS = etags
+ETAGSFLAGS =
+
+tags: TAGS
+
+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+       list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+       unique=`for i in $$list; do \
+           if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+         done | \
+         $(AWK) '    { files[$$0] = 1; } \
+              END { for (i in files) print i; }'`; \
+       mkid -fID $$unique
+
+TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+               $(TAGS_FILES) $(LISP)
+       tags=; \
+       here=`pwd`; \
+       list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+       unique=`for i in $$list; do \
+           if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+         done | \
+         $(AWK) '    { files[$$0] = 1; } \
+              END { for (i in files) print i; }'`; \
+       test -z "$(ETAGS_ARGS)$$tags$$unique" \
+         || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+            $$tags $$unique
+
+GTAGS:
+       here=`$(am__cd) $(top_builddir) && pwd` \
+         && cd $(top_srcdir) \
+         && gtags -i $(GTAGS_ARGS) $$here
+
+distclean-tags:
+       -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+
+top_distdir = ../../..
+distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
+
+distdir: $(DISTFILES)
+       @list='$(DISTFILES)'; for file in $$list; do \
+         if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+         dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+         if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+           dir="/$$dir"; \
+           $(mkinstalldirs) "$(distdir)$$dir"; \
+         else \
+           dir=''; \
+         fi; \
+         if test -d $$d/$$file; then \
+           if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+             cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+           fi; \
+           cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+         else \
+           test -f $(distdir)/$$file \
+           || cp -p $$d/$$file $(distdir)/$$file \
+           || exit 1; \
+         fi; \
+       done
+check-am: all-am
+check: check-am
+all-am: Makefile $(PROGRAMS)
+
+installdirs:
+       $(mkinstalldirs) $(DESTDIR)$(bindir)
+
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+       @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+       $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+         INSTALL_STRIP_FLAG=-s \
+         `test -z '$(STRIP)' || \
+           echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+       -rm -f Makefile $(CONFIG_CLEAN_FILES)
+
+maintainer-clean-generic:
+       @echo "This command is intended for maintainers to use"
+       @echo "it deletes files that may require special tools to rebuild."
+clean: clean-am
+
+clean-am: clean-binPROGRAMS clean-generic mostlyclean-am
+
+distclean: distclean-am
+
+distclean-am: clean-am distclean-compile distclean-depend \
+       distclean-generic distclean-tags
+
+dvi: dvi-am
+
+dvi-am:
+
+info: info-am
+
+info-am:
+
+install-data-am:
+
+install-exec-am: install-binPROGRAMS
+
+install-info: install-info-am
+
+install-man:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-compile mostlyclean-generic
+
+uninstall-am: uninstall-binPROGRAMS uninstall-info-am
+
+.PHONY: GTAGS all all-am check check-am clean clean-binPROGRAMS \
+       clean-generic distclean distclean-compile distclean-depend \
+       distclean-generic distclean-tags distdir dvi dvi-am info \
+       info-am install install-am install-binPROGRAMS install-data \
+       install-data-am install-exec install-exec-am install-info \
+       install-info-am install-man install-strip installcheck \
+       installcheck-am installdirs maintainer-clean \
+       maintainer-clean-generic mostlyclean mostlyclean-compile \
+       mostlyclean-generic tags uninstall uninstall-am \
+       uninstall-binPROGRAMS uninstall-info-am
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
diff --git a/orte/examples/ping/Makefile.omk b/orte/examples/ping/Makefile.omk
new file mode 100644 (file)
index 0000000..fd37ca5
--- /dev/null
@@ -0,0 +1,8 @@
+bin_PROGRAMS = orteping
+
+INCLUDES = -I $(srcdir)/../../include -DORTE_OMK_UNIX
+
+orteping_SOURCES = orteping.c
+
+lib_LOADLIBES =  orte pthread
+
diff --git a/orte/examples/ping/msvc/getopt.c b/orte/examples/ping/msvc/getopt.c
new file mode 100644 (file)
index 0000000..f2e9cb7
--- /dev/null
@@ -0,0 +1,114 @@
+#include <assert.h>
+#include <errno.h>
+#include <stdio.h>
+#include <string.h>
+
+#define __P(x) x
+#define _DIAGASSERT(x) assert(x)
+
+#ifdef __weak_alias
+__weak_alias(getopt,_getopt);
+#endif
+
+
+int    opterr = 1,             /* if error message should be printed */
+       optind = 1,             /* index into parent argv vector */
+       optopt,                 /* character checked for validity */
+       optreset;               /* reset getopt */
+char   *optarg;                /* argument associated with option */
+
+static char * _progname __P((char *));
+int getopt_internal __P((int, char * const *, const char *));
+
+static char *
+_progname(nargv0)
+       char * nargv0;
+{
+       char * tmp;
+
+       _DIAGASSERT(nargv0 != NULL);
+
+       tmp = strrchr(nargv0, '/');
+       if (tmp)
+               tmp++;
+       else
+               tmp = nargv0;
+       return(tmp);
+}
+
+#define        BADCH   (int)'?'
+#define        BADARG  (int)':'
+#define        EMSG    ""
+
+/*
+ * getopt --
+ *     Parse argc/argv argument vector.
+ */
+int
+getopt(nargc, nargv, ostr)
+       int nargc;
+       char * const nargv[];
+       const char *ostr;
+{
+       static char *__progname = 0;
+       static char *place = EMSG;              /* option letter processing */
+       char *oli;                              /* option letter list index */
+        __progname = __progname?__progname:_progname(*nargv);
+
+       _DIAGASSERT(nargv != NULL);
+       _DIAGASSERT(ostr != NULL);
+
+       if (optreset || !*place) {              /* update scanning pointer */
+               optreset = 0;
+               if (optind >= nargc || *(place = nargv[optind]) != '-') {
+                       place = EMSG;
+                       return (-1);
+               }
+               if (place[1] && *++place == '-' /* found "--" */
+                   && place[1] == '\0') {
+                       ++optind;
+                       place = EMSG;
+                       return (-1);
+               }
+       }                                       /* option letter okay? */
+       if ((optopt = (int)*place++) == (int)':' ||
+           !(oli = strchr(ostr, optopt))) {
+               /*
+                * if the user didn't specify '-' as an option,
+                * assume it means -1.
+                */
+               if (optopt == (int)'-')
+                       return (-1);
+               if (!*place)
+                       ++optind;
+               if (opterr && *ostr != ':')
+                       (void)fprintf(stderr,
+                           "%s: illegal option -- %c\n", __progname, optopt);
+               return (BADCH);
+       }
+       if (*++oli != ':') {                    /* don't need argument */
+               optarg = NULL;
+               if (!*place)
+                       ++optind;
+       }
+       else {                                  /* need an argument */
+               if (*place)                     /* no white space */
+                       optarg = place;
+               else if (nargc <= ++optind) {   /* no arg */
+                       place = EMSG;
+                       if (*ostr == ':')
+                               return (BADARG);
+                       if (opterr)
+                               (void)fprintf(stderr,
+                                   "%s: option requires an argument -- %c\n",
+                                   __progname, optopt);
+                       return (BADCH);
+               }
+               else                            /* white space */
+                       optarg = nargv[optind];
+               place = EMSG;
+               ++optind;
+       }
+       return (optopt);                        /* dump back option letter */
+}
+
diff --git a/orte/examples/ping/msvc/getopt_long.c b/orte/examples/ping/msvc/getopt_long.c
new file mode 100644 (file)
index 0000000..b956823
--- /dev/null
@@ -0,0 +1,205 @@
+#include <assert.h>
+#include <errno.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include "getopt.h"
+
+extern int       opterr;       /* if error message should be printed */
+extern int       optind;       /* index into parent argv vector */
+extern int       optopt;       /* character checked for validity */
+extern int       optreset;     /* reset getopt */
+extern char *optarg;   /* argument associated with option */
+
+#define __P(x) x
+#define _DIAGASSERT(x) assert(x)
+
+static char * __progname __P((char *));
+int getopt_internal __P((int, char * const *, const char *));
+
+static char *
+__progname(nargv0)
+       char * nargv0;
+{
+       char * tmp;
+
+       _DIAGASSERT(nargv0 != NULL);
+
+       tmp = strrchr(nargv0, '/');
+       if (tmp)
+               tmp++;
+       else
+               tmp = nargv0;
+       return(tmp);
+}
+
+#define        BADCH   (int)'?'
+#define        BADARG  (int)':'
+#define        EMSG    ""
+
+/*
+ * getopt --
+ *     Parse argc/argv argument vector.
+ */
+int
+getopt_internal(nargc, nargv, ostr)
+       int nargc;
+       char * const *nargv;
+       const char *ostr;
+{
+       static char *place = EMSG;              /* option letter processing */
+       char *oli;                              /* option letter list index */
+
+       _DIAGASSERT(nargv != NULL);
+       _DIAGASSERT(ostr != NULL);
+
+       if (optreset || !*place) {              /* update scanning pointer */
+               optreset = 0;
+               if (optind >= nargc || *(place = nargv[optind]) != '-') {
+                       place = EMSG;
+                       return (-1);
+               }
+               if (place[1] && *++place == '-') {      /* found "--" */
+                       /* ++optind; */
+                       place = EMSG;
+                       return (-2);
+               }
+       }                                       /* option letter okay? */
+       if ((optopt = (int)*place++) == (int)':' ||
+           !(oli = strchr(ostr, optopt))) {
+               /*
+                * if the user didn't specify '-' as an option,
+                * assume it means -1.
+                */
+               if (optopt == (int)'-')
+                       return (-1);
+               if (!*place)
+                       ++optind;
+               if (opterr && *ostr != ':')
+                       (void)fprintf(stderr,
+                           "%s: illegal option -- %c\n", __progname(nargv[0]), optopt);
+               return (BADCH);
+       }
+       if (*++oli != ':') {                    /* don't need argument */
+               optarg = NULL;
+               if (!*place)
+                       ++optind;
+       } else {                                /* need an argument */
+               if (*place)                     /* no white space */
+                       optarg = place;
+               else if (nargc <= ++optind) {   /* no arg */
+                       place = EMSG;
+                       if ((opterr) && (*ostr != ':'))
+                               (void)fprintf(stderr,
+                                   "%s: option requires an argument -- %c\n",
+                                   __progname(nargv[0]), optopt);
+                       return (BADARG);
+               } else                          /* white space */
+                       optarg = nargv[optind];
+               place = EMSG;
+               ++optind;
+       }
+       return (optopt);                        /* dump back option letter */
+}
+
+#if 0
+/*
+ * getopt --
+ *     Parse argc/argv argument vector.
+ */
+int
+getopt2(nargc, nargv, ostr)
+       int nargc;
+       char * const *nargv;
+       const char *ostr;
+{
+       int retval;
+
+       if ((retval = getopt_internal(nargc, nargv, ostr)) == -2) {
+               retval = -1;
+               ++optind;
+       }
+       return(retval);
+}
+#endif
+
+/*
+ * getopt_long --
+ *     Parse argc/argv argument vector.
+ */
+int
+getopt_long(nargc, nargv, options, long_options, index)
+       int nargc;
+       char ** nargv;
+       char * options;
+       struct option * long_options;
+       int * index;
+{
+       int retval;
+
+       _DIAGASSERT(nargv != NULL);
+       _DIAGASSERT(options != NULL);
+       _DIAGASSERT(long_options != NULL);
+       /* index may be NULL */
+
+       if ((retval = getopt_internal(nargc, nargv, options)) == -2) {
+               char *current_argv = nargv[optind++] + 2, *has_equal;
+               int i, current_argv_len, match = -1;
+
+               if (*current_argv == '\0') {
+                       return(-1);
+               }
+               if ((has_equal = strchr(current_argv, '=')) != NULL) {
+                       current_argv_len = has_equal - current_argv;
+                       has_equal++;
+               } else
+                       current_argv_len = strlen(current_argv);
+
+               for (i = 0; long_options[i].name; i++) {
+                       if (strncmp(current_argv, long_options[i].name, current_argv_len))
+                               continue;
+
+                       if (strlen(long_options[i].name) == (unsigned)current_argv_len) {
+                               match = i;
+                               break;
+                       }
+                       if (match == -1)
+                               match = i;
+               }
+               if (match != -1) {
+                       if (long_options[match].has_arg == required_argument ||
+                           long_options[match].has_arg == optional_argument) {
+                               if (has_equal)
+                                       optarg = has_equal;
+                               else
+                                       optarg = nargv[optind++];
+                       }
+                       if ((long_options[match].has_arg == required_argument)
+                           && (optarg == NULL)) {
+                               /*
+                                * Missing argument, leading :
+                                * indicates no error should be generated
+                                */
+                               if ((opterr) && (*options != ':'))
+                                       (void)fprintf(stderr,
+                                     "%s: option requires an argument -- %s\n",
+                                     __progname(nargv[0]), current_argv);
+                               return (BADARG);
+                       }
+               } else { /* No matching argument */
+                       if ((opterr) && (*options != ':'))
+                               (void)fprintf(stderr,
+                                   "%s: illegal option -- %s\n", __progname(nargv[0]), current_argv);
+                       return (BADCH);
+               }
+               if (long_options[match].flag) {
+                       *long_options[match].flag = long_options[match].val;
+                       retval = 0;
+               } else
+                       retval = long_options[match].val;
+               if (index)
+                       *index = match;
+       }
+       return(retval);
+}
+
diff --git a/orte/examples/ping/msvc/m.bat b/orte/examples/ping/msvc/m.bat
new file mode 100755 (executable)
index 0000000..9a26e08
--- /dev/null
@@ -0,0 +1 @@
+make /f makefile.msc\r
diff --git a/orte/examples/ping/msvc/makefile.msc b/orte/examples/ping/msvc/makefile.msc
new file mode 100644 (file)
index 0000000..a146d9a
--- /dev/null
@@ -0,0 +1,46 @@
+# ---------------------------------------------------------------------
+# Microsoft C/C++ Installation Directory
+#
+# CHANGE this definition to point to your compiler's installation directory
+# ---------------------------------------------------------------------
+MSCDIR=                c:\Progra~1\micros~3\vc98
+
+CFLAGS = -c -Zi -MD $(INCLUDE)
+LIB_CFLAGS=    $(CFLAGS) -LD
+INCLUDE=       -I$(MSCDIR)\include -I..\..\..\include -I..\..\..\include\win32
+LIBS=          $(MSCDIR)\lib\msvcrt.lib $(MSCDIR)\lib\uuid.lib $(MSCDIR)\lib\oldnames.lib \
+            $(MSCDIR)\lib\kernel32.lib $(MSCDIR)\lib\libcd.lib $(MSCDIR)\lib\wsock32.lib \
+            $(MSCDIR)\lib\advapi32.lib $(MSCDIR)\lib\ws2_32.lib  $(MSCDIR)\lib\libc.lib\
+            ..\..\..\contrib\win_pthread\pthreadVC.lib \
+            ..\..\..\liborte\msvc\liborte.lib
+CC=                $(MSCDIR)\bin\cl
+LINK=          $(MSCDIR)\bin\link
+LIBRARIAN=     $(MSCDIR)\bin\lib
+
+TARGETS=ORTEPing.exe
+
+all :  default
+
+default : $(TARGETS)
+
+ORTEPing.exe: ..\ORTEPing.obj getopt.obj getopt_long.obj
+
+# ---------------------------------------------------------------------
+# Generic Compilation Rules
+#
+# Do NOT change anything below this point.
+# ---------------------------------------------------------------------
+#.SUFFIXES: .c .obj .exe
+
+.c.obj:
+       $(CC) $(CFLAGS) $< -Fo$*.obj
+
+.obj.exe:
+       $(LINK) -out:$@ getopt.obj getopt_long.obj $(ORTELIB) $< $(LIBS)
+
+clean :
+       del *.obj
+        del *.exe
+        del *.pdb
+
+
diff --git a/orte/examples/ping/orteping.c b/orte/examples/ping/orteping.c
new file mode 100644 (file)
index 0000000..a2dc0d9
--- /dev/null
@@ -0,0 +1,200 @@
+/*
+ *  $Id: orteping.c,v 0.0.0.1           2003/10/07 
+ *
+ *  DEBUG:  section                     orteping
+ *  AUTHOR: Petr Smolik                 petr.smolik@wo.cz
+ *
+ *  ORTE - OCERA Real-Time Ethernet     http://www.ocera.org/
+ *  --------------------------------------------------------------------
+ *
+ *  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; either version 2 of the License, or
+ *  (at your option) any later version.
+ *  
+ *  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.
+ *  
+ */ 
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <getopt.h>
+#ifndef _WIN32
+  #include <signal.h>
+#endif
+#include "orte_api.h"
+
+Boolean                 quite=ORTE_FALSE;
+
+void
+recvCallBack(const ORTERecvInfo *info,void *vinstance, void *recvCallBackParam) {
+  u_int32_t *instance=(u_int32_t*)vinstance;
+  
+  switch (info->status) {
+    case NEW_DATA:
+      if (!quite)
+        printf("received fresh issue %d\n",*instance);
+      break;
+    case DEADLINE:
+      printf("deadline occured\n");
+      break;
+  }
+}
+
+void
+sendCallBack(const ORTESendInfo *info,void *vinstance, void *sendCallBackParam) {
+  u_int32_t *instance=(u_int32_t*)vinstance;
+  
+  switch (info->status) {
+    case NEED_DATA:
+      (*instance)++;
+      if (!quite)
+        printf("sent issue %d\n",*instance);
+      break;
+    case CQL:  //criticalQueueLevel
+      break;
+  }
+}
+
+static void usage(void) {
+  printf("usage: ORTEPing <parameters> \n");
+  printf("  -d, --domain <domain>         working manager domain\n");
+  printf("  -p, --publisher               create publisher Ping,PingData\n");
+  printf("  -S, --strength                strength of publisher <1>\n");
+  printf("  -D, --delay <ms>              delay between two publications <1000>\n");
+  printf("  -s, --subscriber              create subscriber Ping,PingData\n");
+  printf("  -R, --refresh <s>             refresh period of application\n");
+  printf("  -P, --purge <s>               purge time for services\n");
+  printf("  -E, --expiration <s>          expiration time of application\n");
+  printf("  -m, --minimumSeparation <s>   minimumSeparation between two issues\n");
+  printf("  -v, --verbosity <level>       set verbosity level SECTION, up to LEVEL:...\n");
+  printf("      examples: ORTEManager -v 51,7:32,5 sections 51 and 32\n");
+  printf("                ORTEManager -v ALL,7     all sections up to level 7\n");
+  printf("  -q  --quiet                   \n");
+  printf("  -l, --logfile <filename>      set log file name\n");
+  printf("  -V, --version                 show version\n");
+  printf("  -h, --help                    this usage screen\n");
+}
+
+int main(int argc,char *argv[]) {
+  static struct option long_opts[] = {
+    { "domain",1,0, 'd' },
+    { "publisher",0,0, 'p' },
+    { "strength",1,0, 'S' },
+    { "subscriber",0,0, 's' },
+    { "refresh",1,0, 'R' },
+    { "purge",1,0, 'P' },
+    { "expiration",1,0, 'E' },
+    { "minimumSeparation",1,0, 'm' },
+    { "delay",1,0, 'D' },
+    { "verbosity",1,0, 'v' },
+    { "quiet",0,0, 'q' },
+    { "logfile",1,0, 'l' },
+    { "version",0,0, 'V' },
+    { "help",  0, 0, 'h' },
+    { 0, 0, 0, 0}
+  };
+  ORTEDomain              *d;
+  ORTEDomainProp          dp; 
+  ORTEPublication         *p=NULL;
+  ORTESubscription        *s=NULL;
+  int                     opt,domain=ORTE_DEFAULT_DOMAIN;
+  int32_t                 strength=1;
+  int32_t                 instanceSend=0,instanceRecv=0;
+  NtpTime                 persistence,deadline,minimumSeparation,delay;
+  Boolean                 havePublisher=ORTE_FALSE;
+  Boolean                 haveSubscriber=ORTE_FALSE;
+  
+  ORTEInit();
+  ORTEDomainPropDefaultGet(&dp);
+  NTPTIME_BUILD(minimumSeparation,0); 
+  NTPTIME_BUILD(delay,1); //1s
+  while ((opt = getopt_long(argc, argv, "m:S:d:v:R:E:P:l:D:Vhpsq",&long_opts[0], NULL)) != EOF) {
+    switch (opt) {
+      case 'S':
+        strength=strtol(optarg,NULL,0);
+        break;
+      case 'd':
+        domain=strtol(optarg,NULL,0);
+        break;
+      case 'p':
+          havePublisher=ORTE_TRUE;
+        break;
+      case 's':
+          haveSubscriber=ORTE_TRUE;
+        break;
+      case 'v':
+        ORTEVerbositySetOptions(optarg);
+        break;
+      case 'R':
+        NtpTimeAssembFromMs(dp.baseProp.refreshPeriod,strtol(optarg,NULL,0),0);
+        break;
+      case 'P':
+        NtpTimeAssembFromMs(dp.baseProp.purgeTime,strtol(optarg,NULL,0),0);
+        break;
+      case 'E':
+        NtpTimeAssembFromMs(dp.baseProp.expirationTime,strtol(optarg,NULL,0),0);
+        break;
+      case 'm':
+        NtpTimeAssembFromMs(minimumSeparation,strtol(optarg,NULL,0),0);
+        break;
+      case 'D':
+        NtpTimeAssembFromMs(delay,strtol(optarg,NULL,0)/1000,strtol(optarg,NULL,0)%1000);
+        break;
+      case 'l':
+        ORTEVerbositySetLogFile(optarg);
+      case 'q':
+        quite=ORTE_TRUE;
+        break;
+      case 'V':
+        printf("Ocera Real-Time Ethernet (%s).\n",dp.version);
+        exit(0);
+        break;
+      case 'h':
+      default:
+        usage();
+        exit(opt == 'h' ? 0 : 1);
+    }
+  }
+  //Create application     
+  d=ORTEDomainAppCreate(domain,&dp,NULL,ORTE_FALSE);
+  //Register ser./deser. rutines with maximal size 4 Bytes
+  ORTETypeRegisterAdd(d,"PingData",NULL,NULL,4);   
+  //Create publisher
+  if (havePublisher) {
+    NTPTIME_BUILD(persistence,5); 
+    p=ORTEPublicationCreate(
+         d,
+         "Ping",
+         "PingData",
+         &instanceSend,
+         &persistence,
+         strength,
+         sendCallBack,
+         NULL,
+         &delay);
+  }
+  if (haveSubscriber) {
+    NTPTIME_BUILD(deadline,3); 
+    s=ORTESubscriptionCreate(
+         d,
+         IMMEDIATE,
+         BEST_EFFORTS,
+         "Ping",
+         "PingData",
+         &instanceRecv,
+         &deadline,
+         &minimumSeparation,
+         recvCallBack,
+         NULL);
+  }
+  //never ending loop
+  while (1) 
+    ORTESleepMs(1000);
+  exit(0);
+}
+
index 64b0c2bf14e73d5c791a376241acba5f62cb4e5a..ce556abae1ad132cb45b9d3a8d3c46d9b4ab4921 100644 (file)
@@ -1,14 +1,14 @@
-noinst_PROGRAMS = ReliablePublisher ReliableSubscriber BestEffortSubscriber
+noinst_PROGRAMS = publisher subscriberreliable subscriberbesteffort
 
 if CONFIG_ORTE_WIN
   win_libs= $(top_srcdir)/orte/contrib/win_pthread/libpthreadGC.a
 endif
 
-ReliablePublisher_SOURCES = ReliablePublisher.c
-ReliablePublisher_LDADD   = ../../liborte/liborte.a $(win_libs)
+publisher_SOURCES = publisher.c
+publisher_LDADD   = ../../liborte/liborte.a $(win_libs)
 
-ReliableSubscriber_SOURCES = ReliableSubscriber.c
-ReliableSubscriber_LDADD   = ../../liborte/liborte.a $(win_libs)
+subscriberreliable_SOURCES = subscriberreliable.c
+subscriberreliable_LDADD   = ../../liborte/liborte.a $(win_libs)
 
-BestEffortSubscriber_SOURCES = BestEffortSubscriber.c
-BestEffortSubscriber_LDADD   = ../../liborte/liborte.a $(win_libs)
+subscriberbesteffort_SOURCES = subscriberbesteffort.c
+subscriberbesteffort_LDADD   = ../../liborte/liborte.a $(win_libs)
index df28f82b40dd3ea60c4dc3c00da2348f33ab1949..cb468edf8fde791a680a20af4623b6e8a513fe0a 100644 (file)
@@ -68,6 +68,7 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 AMTAR = @AMTAR@
 AWK = @AWK@
 CC = @CC@
+CONFIG_ORTE_KERNEL = @CONFIG_ORTE_KERNEL@
 CONFIG_ORTE_RT = @CONFIG_ORTE_RT@
 DEPDIR = @DEPDIR@
 INCLUDES = @INCLUDES@
@@ -100,50 +101,48 @@ am__quote = @am__quote@
 install_sh = @install_sh@
 modulePROGRAMS_INSTALL = @modulePROGRAMS_INSTALL@
 moduledir = @moduledir@
-noinst_PROGRAMS = ReliablePublisher ReliableSubscriber BestEffortSubscriber
+noinst_PROGRAMS = publisher subscriberreliable subscriberbesteffort
 
 @CONFIG_ORTE_WIN_TRUE@win_libs = $(top_srcdir)/orte/contrib/win_pthread/libpthreadGC.a
 
-ReliablePublisher_SOURCES = ReliablePublisher.c
-ReliablePublisher_LDADD = ../../liborte/liborte.a $(win_libs)
+publisher_SOURCES = publisher.c
+publisher_LDADD = ../../liborte/liborte.a $(win_libs)
 
-ReliableSubscriber_SOURCES = ReliableSubscriber.c
-ReliableSubscriber_LDADD = ../../liborte/liborte.a $(win_libs)
+subscriberreliable_SOURCES = subscriberreliable.c
+subscriberreliable_LDADD = ../../liborte/liborte.a $(win_libs)
 
-BestEffortSubscriber_SOURCES = BestEffortSubscriber.c
-BestEffortSubscriber_LDADD = ../../liborte/liborte.a $(win_libs)
+subscriberbesteffort_SOURCES = subscriberbesteffort.c
+subscriberbesteffort_LDADD = ../../liborte/liborte.a $(win_libs)
 subdir = orte/examples/reliable
 mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
 CONFIG_HEADER = $(top_builddir)/orte/include/config.h
 CONFIG_CLEAN_FILES =
-noinst_PROGRAMS = ReliablePublisher$(EXEEXT) ReliableSubscriber$(EXEEXT) \
-       BestEffortSubscriber$(EXEEXT)
+noinst_PROGRAMS = publisher$(EXEEXT) subscriberreliable$(EXEEXT) \
+       subscriberbesteffort$(EXEEXT)
 PROGRAMS = $(noinst_PROGRAMS)
 
-am_BestEffortSubscriber_OBJECTS = BestEffortSubscriber.$(OBJEXT)
-BestEffortSubscriber_OBJECTS = $(am_BestEffortSubscriber_OBJECTS)
-@CONFIG_ORTE_WIN_TRUE@BestEffortSubscriber_DEPENDENCIES = \
-@CONFIG_ORTE_WIN_TRUE@ ../../liborte/liborte.a \
+am_publisher_OBJECTS = publisher.$(OBJEXT)
+publisher_OBJECTS = $(am_publisher_OBJECTS)
+@CONFIG_ORTE_WIN_TRUE@publisher_DEPENDENCIES = ../../liborte/liborte.a \
 @CONFIG_ORTE_WIN_TRUE@ $(top_srcdir)/orte/contrib/win_pthread/libpthreadGC.a
-@CONFIG_ORTE_WIN_FALSE@BestEffortSubscriber_DEPENDENCIES = \
-@CONFIG_ORTE_WIN_FALSE@        ../../liborte/liborte.a
-BestEffortSubscriber_LDFLAGS =
-am_ReliablePublisher_OBJECTS = ReliablePublisher.$(OBJEXT)
-ReliablePublisher_OBJECTS = $(am_ReliablePublisher_OBJECTS)
-@CONFIG_ORTE_WIN_TRUE@ReliablePublisher_DEPENDENCIES = \
+@CONFIG_ORTE_WIN_FALSE@publisher_DEPENDENCIES = ../../liborte/liborte.a
+publisher_LDFLAGS =
+am_subscriberbesteffort_OBJECTS = subscriberbesteffort.$(OBJEXT)
+subscriberbesteffort_OBJECTS = $(am_subscriberbesteffort_OBJECTS)
+@CONFIG_ORTE_WIN_TRUE@subscriberbesteffort_DEPENDENCIES = \
 @CONFIG_ORTE_WIN_TRUE@ ../../liborte/liborte.a \
 @CONFIG_ORTE_WIN_TRUE@ $(top_srcdir)/orte/contrib/win_pthread/libpthreadGC.a
-@CONFIG_ORTE_WIN_FALSE@ReliablePublisher_DEPENDENCIES = \
+@CONFIG_ORTE_WIN_FALSE@subscriberbesteffort_DEPENDENCIES = \
 @CONFIG_ORTE_WIN_FALSE@        ../../liborte/liborte.a
-ReliablePublisher_LDFLAGS =
-am_ReliableSubscriber_OBJECTS = ReliableSubscriber.$(OBJEXT)
-ReliableSubscriber_OBJECTS = $(am_ReliableSubscriber_OBJECTS)
-@CONFIG_ORTE_WIN_TRUE@ReliableSubscriber_DEPENDENCIES = \
+subscriberbesteffort_LDFLAGS =
+am_subscriberreliable_OBJECTS = subscriberreliable.$(OBJEXT)
+subscriberreliable_OBJECTS = $(am_subscriberreliable_OBJECTS)
+@CONFIG_ORTE_WIN_TRUE@subscriberreliable_DEPENDENCIES = \
 @CONFIG_ORTE_WIN_TRUE@ ../../liborte/liborte.a \
 @CONFIG_ORTE_WIN_TRUE@ $(top_srcdir)/orte/contrib/win_pthread/libpthreadGC.a
-@CONFIG_ORTE_WIN_FALSE@ReliableSubscriber_DEPENDENCIES = \
+@CONFIG_ORTE_WIN_FALSE@subscriberreliable_DEPENDENCIES = \
 @CONFIG_ORTE_WIN_FALSE@        ../../liborte/liborte.a
-ReliableSubscriber_LDFLAGS =
+subscriberreliable_LDFLAGS =
 
 DEFS = @DEFS@
 DEFAULT_INCLUDES =  -I. -I$(srcdir) -I$(top_builddir)/orte/include
@@ -152,18 +151,18 @@ LDFLAGS = @LDFLAGS@
 LIBS = @LIBS@
 depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
 am__depfiles_maybe = depfiles
-@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/BestEffortSubscriber.Po \
-@AMDEP_TRUE@   ./$(DEPDIR)/ReliablePublisher.Po \
-@AMDEP_TRUE@   ./$(DEPDIR)/ReliableSubscriber.Po
+@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/publisher.Po \
+@AMDEP_TRUE@   ./$(DEPDIR)/subscriberbesteffort.Po \
+@AMDEP_TRUE@   ./$(DEPDIR)/subscriberreliable.Po
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
        $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 CCLD = $(CC)
 LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
 CFLAGS = @CFLAGS@
-DIST_SOURCES = $(BestEffortSubscriber_SOURCES) \
-       $(ReliablePublisher_SOURCES) $(ReliableSubscriber_SOURCES)
+DIST_SOURCES = $(publisher_SOURCES) $(subscriberbesteffort_SOURCES) \
+       $(subscriberreliable_SOURCES)
 DIST_COMMON = Makefile.am Makefile.in
-SOURCES = $(BestEffortSubscriber_SOURCES) $(ReliablePublisher_SOURCES) $(ReliableSubscriber_SOURCES)
+SOURCES = $(publisher_SOURCES) $(subscriberbesteffort_SOURCES) $(subscriberreliable_SOURCES)
 
 all: all-am
 
@@ -177,15 +176,15 @@ Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in  $(top_builddir)/config.s
 
 clean-noinstPROGRAMS:
        -test -z "$(noinst_PROGRAMS)" || rm -f $(noinst_PROGRAMS)
-BestEffortSubscriber$(EXEEXT): $(BestEffortSubscriber_OBJECTS) $(BestEffortSubscriber_DEPENDENCIES) 
-       @rm -f BestEffortSubscriber$(EXEEXT)
-       $(LINK) $(BestEffortSubscriber_LDFLAGS) $(BestEffortSubscriber_OBJECTS) $(BestEffortSubscriber_LDADD) $(LIBS)
-ReliablePublisher$(EXEEXT): $(ReliablePublisher_OBJECTS) $(ReliablePublisher_DEPENDENCIES) 
-       @rm -f ReliablePublisher$(EXEEXT)
-       $(LINK) $(ReliablePublisher_LDFLAGS) $(ReliablePublisher_OBJECTS) $(ReliablePublisher_LDADD) $(LIBS)
-ReliableSubscriber$(EXEEXT): $(ReliableSubscriber_OBJECTS) $(ReliableSubscriber_DEPENDENCIES) 
-       @rm -f ReliableSubscriber$(EXEEXT)
-       $(LINK) $(ReliableSubscriber_LDFLAGS) $(ReliableSubscriber_OBJECTS) $(ReliableSubscriber_LDADD) $(LIBS)
+publisher$(EXEEXT): $(publisher_OBJECTS) $(publisher_DEPENDENCIES) 
+       @rm -f publisher$(EXEEXT)
+       $(LINK) $(publisher_LDFLAGS) $(publisher_OBJECTS) $(publisher_LDADD) $(LIBS)
+subscriberbesteffort$(EXEEXT): $(subscriberbesteffort_OBJECTS) $(subscriberbesteffort_DEPENDENCIES) 
+       @rm -f subscriberbesteffort$(EXEEXT)
+       $(LINK) $(subscriberbesteffort_LDFLAGS) $(subscriberbesteffort_OBJECTS) $(subscriberbesteffort_LDADD) $(LIBS)
+subscriberreliable$(EXEEXT): $(subscriberreliable_OBJECTS) $(subscriberreliable_DEPENDENCIES) 
+       @rm -f subscriberreliable$(EXEEXT)
+       $(LINK) $(subscriberreliable_LDFLAGS) $(subscriberreliable_OBJECTS) $(subscriberreliable_LDADD) $(LIBS)
 
 mostlyclean-compile:
        -rm -f *.$(OBJEXT) core *.core
@@ -193,9 +192,9 @@ mostlyclean-compile:
 distclean-compile:
        -rm -f *.tab.c
 
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/BestEffortSubscriber.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ReliablePublisher.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ReliableSubscriber.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/publisher.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/subscriberbesteffort.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/subscriberreliable.Po@am__quote@
 
 distclean-depend:
        -rm -rf ./$(DEPDIR)
index 8d1fbc91dd82a614607e2c80b3b6043f2db78508..e6fee70cdd09edd21f980c5e59f4f8bffb795b6d 100644 (file)
@@ -1,12 +1,12 @@
-INCLUDES = -D_OMK_UNIX
+INCLUDES = -I $(srcdir)/../../include -DORTE_OMK_UNIX
 
-utils_PROGRAMS = ReliablePublisher ReliableSubscriber BestEffortSubscriber
+utils_PROGRAMS = publisher subscriberreliable subscriberbesteffort
 
-ReliablePublisher_SOURCES = ReliablePublisher.c
+publisher_SOURCES = publisher.c
 
-ReliableSubscriber_SOURCES = ReliableSubscriber.c
+subscriberreliable_SOURCES = subscriberreliable.c
 
-BestEffortSubscriber_SOURCES = BestEffortSubscriber.c
+subscriberbesteffort_SOURCES = subscriberbesteffort.c
 
 lib_LOADLIBES =  orte pthread
 
similarity index 68%
rename from orte/examples/reliable/ReliablePublisher.c
rename to orte/examples/reliable/publisher.c
index 2272a05ffc2f4908d2dd9cade7a83158547dabf3..003772b16c2e25ecbb25d4388729a1ea6465ea33 100644 (file)
@@ -1,7 +1,7 @@
 /*
- *  $Id: ReliablePublisher.c,v 0.0.0.1  2003/12/27 
+ *  $Id: publisher.c,v 0.0.0.1          2003/12/27 
  *
- *  DEBUG:  section                     ReliablePublisher
+ *  DEBUG:  section                     publisher
  *  AUTHOR: Petr Smolik                 petr.smolik@wo.cz
  *
  *  ORTE - OCERA Real-Time Ethernet     http://www.ocera.org/
 
 ORTEDomain        *d;
 char              instance2Send[64];
+int               counter=0;
+
+void
+sendCallBack(const ORTESendInfo *info,void *vinstance, void *sendCallBackParam) {
+  char *instance=(char*)vinstance;
+
+  switch (info->status) {
+    case NEED_DATA:
+      printf("Sampling publication, count %d\n", counter);
+      sprintf(instance,"Hello Universe! (%d)",counter++);
+      break;
+    case CQL:  //criticalQueueLevel
+      break;
+  }
+}
+
 
 int 
 main(int argc, char *args[]) {
   ORTEPublication *p;
-  NtpTime         persistence;
-  int             i=1;            
+  NtpTime         persistence,repeating;
 
   ORTEInit();
-  //ORTEVerbositySetOptions("ALL,10");
   d=ORTEDomainAppCreate(ORTE_DEFAULT_DOMAIN,NULL,NULL,ORTE_FALSE);
   ORTETypeRegisterAdd(d,"HelloMsg",NULL,NULL,64);
   NTPTIME_BUILD(persistence,3); 
+  NTPTIME_BUILD(repeating,1); 
   p=ORTEPublicationCreate(
        d,
       "Reliable HelloMsg",
@@ -46,19 +61,18 @@ main(int argc, char *args[]) {
       &instance2Send,
       &persistence,
       1,
+      sendCallBack,
       NULL,
-      NULL,
-      NULL);
-  while (1) {
+      &repeating);
+  #ifndef CONFIG_ORTE_RT
+  while(1) {
     ORTESleepMs(1000);
-    printf("Sampling publication, count %d\n", i);
-    sprintf(instance2Send,"Hello Universe! (%d)",i++);
-    ORTEPublicationSend(p);
   }
+  #endif
   return 0;
 }
 
-#ifdef __RTL__
+#ifdef CONFIG_ORTE_RT
 void 
 hello_init(void) {
   main(0,NULL);
similarity index 92%
rename from orte/examples/reliable/BestEffortSubscriber.c
rename to orte/examples/reliable/subscriberbesteffort.c
index 0d908786c2047c2eaa270a05b1182a3d5f618c64..a33fb02e2c7207d5f3921788edfcc0aabf2616f3 100644 (file)
@@ -1,7 +1,7 @@
 /*
- *  $Id: BestEffortSubscriber.c,v 0.0.0.1 2003/12/27 
+ *  $Id: subscriberbesteffort.c,v 0.0.0.1 2003/12/27 
  *
- *  DEBUG:  section                     ReliableSubscriber
+ *  DEBUG:  section                     Subscriber BestEffort
  *  AUTHOR: Petr Smolik                 petr.smolik@wo.cz
  *
  *  ORTE - OCERA Real-Time Ethernet     http://www.ocera.org/
@@ -65,14 +65,14 @@ main(int argc, char *args[]) {
        &minimumSeparation,
        recvCallBack,
        NULL);
-  #ifndef __RTL__
+  #ifndef CONFIG_ORTE_RT
   while (1) 
     ORTESleepMs(1000);
   #endif
   return 0;
 }
 
-#ifdef __RTL__
+#ifdef CONFIG_ORTE_RT
 void 
 hello_init(void) {
   main(0,NULL);
similarity index 92%
rename from orte/examples/reliable/ReliableSubscriber.c
rename to orte/examples/reliable/subscriberreliable.c
index 326ee5ca2aa1568985d273bcb654d9b12ec8d4cc..94bf3b6126a609979eb7cff9fc50e322bc0030ae 100644 (file)
@@ -1,7 +1,7 @@
 /*
- *  $Id: ReliableSubscriber.c,v 0.0.0.1 2003/12/27 
+ *  $Id: subscriberreliable.c,v 0.0.0.1 2003/12/27 
  *
- *  DEBUG:  section                     ReliableSubscriber
+ *  DEBUG:  section                     subscriber reliable
  *  AUTHOR: Petr Smolik                 petr.smolik@wo.cz
  *
  *  ORTE - OCERA Real-Time Ethernet     http://www.ocera.org/
@@ -65,14 +65,14 @@ main(int argc, char *args[]) {
        &minimumSeparation,
        recvCallBack,
        NULL);
-  #ifndef __RTL__
+  #ifndef CONFIG_ORTE_RT
   while (1) 
     ORTESleepMs(1000);
   #endif
   return 0;
 }
 
-#ifdef __RTL__
+#ifdef CONFIG_ORTE_RT
 void 
 hello_init(void) {
   main(0,NULL);
diff --git a/orte/examples/spy/Makefile b/orte/examples/spy/Makefile
new file mode 100644 (file)
index 0000000..f595272
--- /dev/null
@@ -0,0 +1,14 @@
+# Generic directory or leaf node makefile for OCERA make framework
+
+ifndef MAKERULES_DIR
+MAKERULES_DIR := $(shell ( old_pwd="" ;  while [ ! -e Makefile.rules ] ; do if [ "$$old_pwd" == `pwd`  ] ; then exit 1 ; else old_pwd=`pwd` ; cd -L .. 2>/dev/null ; fi ; done ; pwd ) )
+endif
+
+ifeq ($(MAKERULES_DIR),)
+all : default
+.DEFAULT::
+       @echo -e "\nThe Makefile.rules has not been found in this or partent directory\n"
+else   
+include $(MAKERULES_DIR)/Makefile.rules
+endif
+
diff --git a/orte/examples/spy/Makefile.am b/orte/examples/spy/Makefile.am
new file mode 100644 (file)
index 0000000..8faec11
--- /dev/null
@@ -0,0 +1,8 @@
+bin_PROGRAMS = ortespy
+
+ortespy_SOURCES = ortespy.c
+if CONFIG_ORTE_WIN
+  win_libs= $(top_srcdir)/orte/contrib/win_pthread/libpthreadGC.a
+endif
+ortespy_LDADD   = ../../liborte/liborte.a $(win_libs)
+
diff --git a/orte/examples/spy/Makefile.in b/orte/examples/spy/Makefile.in
new file mode 100644 (file)
index 0000000..8e79a6b
--- /dev/null
@@ -0,0 +1,344 @@
+# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# @configure_input@
+
+# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
+# Free Software Foundation, Inc.
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+@SET_MAKE@
+SHELL = @SHELL@
+
+srcdir = @srcdir@
+top_srcdir = @top_srcdir@
+VPATH = @srcdir@
+prefix = @prefix@
+exec_prefix = @exec_prefix@
+
+bindir = @bindir@
+sbindir = @sbindir@
+libexecdir = @libexecdir@
+datadir = @datadir@
+sysconfdir = @sysconfdir@
+sharedstatedir = @sharedstatedir@
+localstatedir = @localstatedir@
+libdir = @libdir@
+infodir = @infodir@
+mandir = @mandir@
+includedir = @includedir@
+oldincludedir = /usr/include
+pkgdatadir = $(datadir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+top_builddir = ../../..
+
+ACLOCAL = @ACLOCAL@
+AUTOCONF = @AUTOCONF@
+AUTOMAKE = @AUTOMAKE@
+AUTOHEADER = @AUTOHEADER@
+
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+INSTALL = @INSTALL@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_DATA = @INSTALL_DATA@
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = @program_transform_name@
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+host_alias = @host_alias@
+host_triplet = @host@
+
+EXEEXT = @EXEEXT@
+OBJEXT = @OBJEXT@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+AMTAR = @AMTAR@
+AWK = @AWK@
+CC = @CC@
+CONFIG_ORTE_KERNEL = @CONFIG_ORTE_KERNEL@
+CONFIG_ORTE_RT = @CONFIG_ORTE_RT@
+DEPDIR = @DEPDIR@
+INCLUDES = @INCLUDES@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+LINUX_AFLAGS = @LINUX_AFLAGS@
+LINUX_ARCH = @LINUX_ARCH@
+LINUX_ARFLAGS = @LINUX_ARFLAGS@
+LINUX_AS = @LINUX_AS@
+LINUX_CC = @LINUX_CC@
+LINUX_CFLAGS = @LINUX_CFLAGS@
+LINUX_CROSS_COMPILE = @LINUX_CROSS_COMPILE@
+LINUX_DIR = @LINUX_DIR@
+LINUX_KERNELRELEASE = @LINUX_KERNELRELEASE@
+LINUX_LD = @LINUX_LD@
+LINUX_LDFLAGS = @LINUX_LDFLAGS@
+LINUX_MODULE_EXT = @LINUX_MODULE_EXT@
+MAINT = @MAINT@
+ORTE_MAJOR_VERSION = @ORTE_MAJOR_VERSION@
+ORTE_MICRO_VERSION = @ORTE_MICRO_VERSION@
+ORTE_MINOR_VERSION = @ORTE_MINOR_VERSION@
+ORTE_VERSION = @ORTE_VERSION@
+PACKAGE = @PACKAGE@
+RANLIB = @RANLIB@
+RTAI_CFLAGS = @RTAI_CFLAGS@
+RTLINUX_CFLAGS = @RTLINUX_CFLAGS@
+STRIP = @STRIP@
+VERSION = @VERSION@
+am__include = @am__include@
+am__quote = @am__quote@
+install_sh = @install_sh@
+modulePROGRAMS_INSTALL = @modulePROGRAMS_INSTALL@
+moduledir = @moduledir@
+bin_PROGRAMS = ortespy
+
+ortespy_SOURCES = ortespy.c
+@CONFIG_ORTE_WIN_TRUE@win_libs = $(top_srcdir)/orte/contrib/win_pthread/libpthreadGC.a
+ortespy_LDADD = ../../liborte/liborte.a $(win_libs)
+subdir = orte/examples/spy
+mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
+CONFIG_HEADER = $(top_builddir)/orte/include/config.h
+CONFIG_CLEAN_FILES =
+bin_PROGRAMS = ortespy$(EXEEXT)
+PROGRAMS = $(bin_PROGRAMS)
+
+am_ortespy_OBJECTS = ortespy.$(OBJEXT)
+ortespy_OBJECTS = $(am_ortespy_OBJECTS)
+@CONFIG_ORTE_WIN_TRUE@ortespy_DEPENDENCIES = ../../liborte/liborte.a \
+@CONFIG_ORTE_WIN_TRUE@ $(top_srcdir)/orte/contrib/win_pthread/libpthreadGC.a
+@CONFIG_ORTE_WIN_FALSE@ortespy_DEPENDENCIES = ../../liborte/liborte.a
+ortespy_LDFLAGS =
+
+DEFS = @DEFS@
+DEFAULT_INCLUDES =  -I. -I$(srcdir) -I$(top_builddir)/orte/include
+CPPFLAGS = @CPPFLAGS@
+LDFLAGS = @LDFLAGS@
+LIBS = @LIBS@
+depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
+am__depfiles_maybe = depfiles
+@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/ortespy.Po
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+       $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+CCLD = $(CC)
+LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+CFLAGS = @CFLAGS@
+DIST_SOURCES = $(ortespy_SOURCES)
+DIST_COMMON = Makefile.am Makefile.in
+SOURCES = $(ortespy_SOURCES)
+
+all: all-am
+
+.SUFFIXES:
+.SUFFIXES: .c .o .obj
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
+       cd $(top_srcdir) && \
+         $(AUTOMAKE) --gnu  orte/examples/spy/Makefile
+Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in  $(top_builddir)/config.status
+       cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
+binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
+install-binPROGRAMS: $(bin_PROGRAMS)
+       @$(NORMAL_INSTALL)
+       $(mkinstalldirs) $(DESTDIR)$(bindir)
+       @list='$(bin_PROGRAMS)'; for p in $$list; do \
+         p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
+         if test -f $$p \
+         ; then \
+           f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
+          echo " $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f"; \
+          $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f; \
+         else :; fi; \
+       done
+
+uninstall-binPROGRAMS:
+       @$(NORMAL_UNINSTALL)
+       @list='$(bin_PROGRAMS)'; for p in $$list; do \
+         f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
+         echo " rm -f $(DESTDIR)$(bindir)/$$f"; \
+         rm -f $(DESTDIR)$(bindir)/$$f; \
+       done
+
+clean-binPROGRAMS:
+       -test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS)
+ortespy$(EXEEXT): $(ortespy_OBJECTS) $(ortespy_DEPENDENCIES) 
+       @rm -f ortespy$(EXEEXT)
+       $(LINK) $(ortespy_LDFLAGS) $(ortespy_OBJECTS) $(ortespy_LDADD) $(LIBS)
+
+mostlyclean-compile:
+       -rm -f *.$(OBJEXT) core *.core
+
+distclean-compile:
+       -rm -f *.tab.c
+
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ortespy.Po@am__quote@
+
+distclean-depend:
+       -rm -rf ./$(DEPDIR)
+
+.c.o:
+@AMDEP_TRUE@   source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@   depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@   $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+       $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$<
+
+.c.obj:
+@AMDEP_TRUE@   source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@   depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@   $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+       $(COMPILE) -c `cygpath -w $<`
+CCDEPMODE = @CCDEPMODE@
+uninstall-info-am:
+
+ETAGS = etags
+ETAGSFLAGS =
+
+tags: TAGS
+
+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+       list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+       unique=`for i in $$list; do \
+           if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+         done | \
+         $(AWK) '    { files[$$0] = 1; } \
+              END { for (i in files) print i; }'`; \
+       mkid -fID $$unique
+
+TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+               $(TAGS_FILES) $(LISP)
+       tags=; \
+       here=`pwd`; \
+       list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+       unique=`for i in $$list; do \
+           if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+         done | \
+         $(AWK) '    { files[$$0] = 1; } \
+              END { for (i in files) print i; }'`; \
+       test -z "$(ETAGS_ARGS)$$tags$$unique" \
+         || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+            $$tags $$unique
+
+GTAGS:
+       here=`$(am__cd) $(top_builddir) && pwd` \
+         && cd $(top_srcdir) \
+         && gtags -i $(GTAGS_ARGS) $$here
+
+distclean-tags:
+       -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+
+top_distdir = ../../..
+distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
+
+distdir: $(DISTFILES)
+       @list='$(DISTFILES)'; for file in $$list; do \
+         if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+         dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+         if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+           dir="/$$dir"; \
+           $(mkinstalldirs) "$(distdir)$$dir"; \
+         else \
+           dir=''; \
+         fi; \
+         if test -d $$d/$$file; then \
+           if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+             cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+           fi; \
+           cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+         else \
+           test -f $(distdir)/$$file \
+           || cp -p $$d/$$file $(distdir)/$$file \
+           || exit 1; \
+         fi; \
+       done
+check-am: all-am
+check: check-am
+all-am: Makefile $(PROGRAMS)
+
+installdirs:
+       $(mkinstalldirs) $(DESTDIR)$(bindir)
+
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+       @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+       $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+         INSTALL_STRIP_FLAG=-s \
+         `test -z '$(STRIP)' || \
+           echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+       -rm -f Makefile $(CONFIG_CLEAN_FILES)
+
+maintainer-clean-generic:
+       @echo "This command is intended for maintainers to use"
+       @echo "it deletes files that may require special tools to rebuild."
+clean: clean-am
+
+clean-am: clean-binPROGRAMS clean-generic mostlyclean-am
+
+distclean: distclean-am
+
+distclean-am: clean-am distclean-compile distclean-depend \
+       distclean-generic distclean-tags
+
+dvi: dvi-am
+
+dvi-am:
+
+info: info-am
+
+info-am:
+
+install-data-am:
+
+install-exec-am: install-binPROGRAMS
+
+install-info: install-info-am
+
+install-man:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-compile mostlyclean-generic
+
+uninstall-am: uninstall-binPROGRAMS uninstall-info-am
+
+.PHONY: GTAGS all all-am check check-am clean clean-binPROGRAMS \
+       clean-generic distclean distclean-compile distclean-depend \
+       distclean-generic distclean-tags distdir dvi dvi-am info \
+       info-am install install-am install-binPROGRAMS install-data \
+       install-data-am install-exec install-exec-am install-info \
+       install-info-am install-man install-strip installcheck \
+       installcheck-am installdirs maintainer-clean \
+       maintainer-clean-generic mostlyclean mostlyclean-compile \
+       mostlyclean-generic tags uninstall uninstall-am \
+       uninstall-binPROGRAMS uninstall-info-am
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
diff --git a/orte/examples/spy/Makefile.omk b/orte/examples/spy/Makefile.omk
new file mode 100644 (file)
index 0000000..72200cf
--- /dev/null
@@ -0,0 +1,8 @@
+bin_PROGRAMS = ortespy
+
+INCLUDES = -I $(srcdir)/../../include -DORTE_OMK_UNIX
+
+ortespy_SOURCES = ortespy.c
+
+lib_LOADLIBES =  orte pthread
+
diff --git a/orte/examples/spy/ortespy.c b/orte/examples/spy/ortespy.c
new file mode 100644 (file)
index 0000000..930e649
--- /dev/null
@@ -0,0 +1,148 @@
+/*
+ *  $Id: ortespy.c,v 0.0.0.1            2003/10/07 
+ *
+ *  DEBUG:  section                     ortespy
+ *  AUTHOR: Petr Smolik                 petr.smolik@wo.cz
+ *
+ *  ORTE - OCERA Real-Time Ethernet     http://www.ocera.org/
+ *  --------------------------------------------------------------------
+ *
+ *  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; either version 2 of the License, or
+ *  (at your option) any later version.
+ *  
+ *  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.
+ *  
+ */ 
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <getopt.h>
+#ifndef _WIN32
+  #include <signal.h>
+#endif
+#include "orte_api.h"
+
+#include "string.h"
+
+ORTEDomain              *d;
+NtpTime                 deadline,minimumSeparation;
+int32_t                 instanceRecv;
+
+void
+recvCallBack(const ORTERecvInfo *info,void *vinstance, void *recvCallBackParam) {
+  char lbuff[MAX_STRING_NTPTIME_LENGTH];
+  char rbuff[MAX_STRING_NTPTIME_LENGTH];
+  switch (info->status) {
+    case NEW_DATA:
+      printf("| %-10s | %-9s | %-9s | %-18s | %-18s |\n",
+             "NEW_DATA",
+             info->topic,
+             info->type,
+             NtpTimeToStringUs(info->localTimeReceived, lbuff),
+             NtpTimeToStringUs(info->remoteTimePublished, rbuff));
+      break;
+    case DEADLINE:
+//      printf("deadline occured\n");
+      break;
+  }
+}
+
+ORTESubscription*
+subscriptionCallBack(const char *topic, const char *type, void *param) {
+  ORTETypeRegisterAdd(d,type,NULL,NULL,0);   
+  if (strcmp(topic,"Red")==0) return NULL;
+  return ORTESubscriptionCreate(
+        d,
+        IMMEDIATE,
+        BEST_EFFORTS,
+        topic,
+        type,
+        &instanceRecv,
+        &deadline,
+        &minimumSeparation,
+        recvCallBack,
+        NULL);
+}
+
+static void usage(void) {
+  printf("usage: ORTESpy <parameters> \n");
+  printf("  -d, --domain <domain>         working manager domain\n");
+  printf("  -v, --verbosity <level>       set verbosity level SECTION, up to LEVEL:...\n");
+  printf("      examples: ORTEManager -v 51,7:32,5 sections 51 and 32\n");
+  printf("                ORTEManager -v ALL,7     all sections up to level 7\n");
+  printf("  -R, --refresh <s>             refresh period in second(s)\n");
+  printf("  -P, --purge <s>               purge time in second(s)\n");
+  printf("  -e, --expiration <s>          expiration time of manager in second(s)\n");
+  printf("  -l, --logfile <filename>      set log file name\n");
+  printf("  -V, --version                 show version\n");
+  printf("  -h, --help                    this usage screen\n");
+}
+
+int main(int argc,char *argv[]) {
+  static struct option long_opts[] = {
+    { "domain",1,0, 'd' },
+    { "verbosity",1,0, 'v' },
+    { "refresh",1,0, 'R' },
+    { "purge",1,0, 'P' },
+    { "expiration",1,0, 'E' },
+    { "logfile",1,0, 'l' },
+    { "version",0,0, 'V' },
+    { "help",  0, 0, 'h' },
+    { 0, 0, 0, 0}
+  };
+  ORTEDomainProp          dp; 
+  int                     opt,domain=ORTE_DEFAULT_DOMAIN;
+  
+  ORTEInit();
+  ORTEDomainPropDefaultGet(&dp);
+  NTPTIME_BUILD(deadline,3); 
+  NTPTIME_BUILD(minimumSeparation,0); 
+  while ((opt = getopt_long(argc, argv, "d:v:R:E:P:l:Vh",&long_opts[0], NULL)) != EOF) {
+    switch (opt) {
+      case 'd':
+        domain=strtol(optarg,NULL,0);
+        break;
+      case 'v':
+        ORTEVerbositySetOptions(optarg);
+        break;
+      case 'R':
+        NtpTimeAssembFromMs(dp.baseProp.refreshPeriod,strtol(optarg,NULL,0),0);
+        break;
+      case 'P':
+        NtpTimeAssembFromMs(dp.baseProp.purgeTime,strtol(optarg,NULL,0),0);
+        break;
+      case 'E':
+        NtpTimeAssembFromMs(dp.baseProp.expirationTime,strtol(optarg,NULL,0),0);
+        break;
+      case 'l':
+        ORTEVerbositySetLogFile(optarg);
+      case 'V':
+        printf("Ocera Real-Time Ethernet (%s).\n",dp.version);
+        exit(0);
+        break;
+      case 'h':
+      default:
+        usage();
+        exit(opt == 'h' ? 0 : 1);
+    }
+  }
+  //Create application     
+  printf("|------------------------------------------------------------------------------|\n");
+  printf("| %-10s | %-9s | %-9s | %-18s | %-18s |\n", 
+         "status", "type","topic","time received", "time sent");
+  printf("|------------------------------------------------------------------------------|\n");
+  d=ORTEDomainAppCreate(domain,&dp,NULL,ORTE_TRUE);
+  ORTEDomainAppSubscriptionPatternAdd(d,"*","*",subscriptionCallBack,NULL);
+  ORTEDomainStart(d,ORTE_TRUE,ORTE_TRUE,ORTE_TRUE);
+  while (1) {
+    ORTESleepMs(1000);
+  }
+  exit(0);
+}
+
diff --git a/orte/examples/type/readme.txt b/orte/examples/type/readme.txt
new file mode 100644 (file)
index 0000000..b554863
--- /dev/null
@@ -0,0 +1 @@
+see contib/shape/ortedemo
\ No newline at end of file
index de1b089dcec3546f506341f68a969f30b5a625d2..1ba1085305352142d4ee6743cab60e449e1d0e43 100644 (file)
@@ -1,5 +1,8 @@
 /* orte/include/config.h.in.  Generated from configure.in by autoheader.  */
 
+/* Define if linux kernel is found */
+#undef CONFIG_ORTE_KERNEL
+
 /* Define to enable ORTE's RT support */
 #undef CONFIG_ORTE_RT
 
 /* Define to 1 if you have the <arpa/inet.h> header file. */
 #undef HAVE_ARPA_INET_H
 
+/* Define to 1 if you have the <asm/byteorder.h> header file. */
+#undef HAVE_ASM_BYTEORDER_H
+
 /* Define to 1 if you have the <byteswap.h> header file. */
 #undef HAVE_BYTESWAP_H
 
 /* Define to 1 if you have the <ctype.h> header file. */
 #undef HAVE_CTYPE_H
 
-/* Define to 1 if you have the <errno.h> header file. */
-#undef HAVE_ERRNO_H
-
 /* Define to 1 if you have the <fcntl.h> header file. */
 #undef HAVE_FCNTL_H
 
+/* Define to 1 if you have the `gethostbyname' function. */
+#undef HAVE_GETHOSTBYNAME
+
 /* Define to 1 if you have the <getopt.h> header file. */
 #undef HAVE_GETOPT_H
 
-/* Define to 1 if you have the <inttypes.h> header file. */
-#undef HAVE_INTTYPES_H
-
 /* Define to 1 if you have the `pthread' library (-lpthread). */
 #undef HAVE_LIBPTHREAD
 
 /* Define to 1 if you have the `ws2_32' library (-lws2_32). */
 #undef HAVE_LIBWS2_32
 
-/* Define to 1 if you have the <memory.h> header file. */
-#undef HAVE_MEMORY_H
+/* Define to 1 if you have the <linux/ctype.h> header file. */
+#undef HAVE_LINUX_CTYPE_H
+
+/* Define to 1 if you have the <linux/if.h> header file. */
+#undef HAVE_LINUX_IF_H
+
+/* Define to 1 if you have the <linux/in.h> header file. */
+#undef HAVE_LINUX_IN_H
+
+/* Define to 1 if you have the <linux/module.h> header file. */
+#undef HAVE_LINUX_MODULE_H
+
+/* Define to 1 if you have the <linux/socket.h> header file. */
+#undef HAVE_LINUX_SOCKET_H
+
+/* Define to 1 if you have the <linux/string.h> header file. */
+#undef HAVE_LINUX_STRING_H
+
+/* Define to 1 if you have the <linux/time.h> header file. */
+#undef HAVE_LINUX_TIME_H
+
+/* Define to 1 if you have the <linux/types.h> header file. */
+#undef HAVE_LINUX_TYPES_H
 
 /* Define to 1 if you have the <netdb.h> header file. */
 #undef HAVE_NETDB_H
 /* Define to 1 if you have the <net/if.h> header file. */
 #undef HAVE_NET_IF_H
 
+/* Define to 1 if you have the <nictab.h> header file. */
+#undef HAVE_NICTAB_H
+
+/* Define to 1 if you have the <nic.h> header file. */
+#undef HAVE_NIC_H
+
 /* Define to 1 if you have the <pthread.h> header file. */
 #undef HAVE_PTHREAD_H
 
+/* Define to 1 if you have the <rtl.h> header file. */
+#undef HAVE_RTL_H
+
+/* Define to 1 if you have the <rtl_malloc.h> header file. */
+#undef HAVE_RTL_MALLOC_H
+
+/* Define to 1 if you have the <rtnet.h> header file. */
+#undef HAVE_RTNET_H
+
+/* Define to 1 if you have the <semaphore.h> header file. */
+#undef HAVE_SEMAPHORE_H
+
 /* Define to 1 if you have the <signal.h> header file. */
 #undef HAVE_SIGNAL_H
 
 /* Define to 1 if you have the <stdarg.h> header file. */
 #undef HAVE_STDARG_H
 
-/* Define to 1 if you have the <stdint.h> header file. */
-#undef HAVE_STDINT_H
-
 /* Define to 1 if you have the <stdio.h> header file. */
 #undef HAVE_STDIO_H
 
 /* Define to 1 if you have the `strdup' function. */
 #undef HAVE_STRDUP
 
-/* Define to 1 if you have the <strings.h> header file. */
-#undef HAVE_STRINGS_H
-
 /* Define to 1 if you have the <string.h> header file. */
 #undef HAVE_STRING_H
 
 /* Define to 1 if you have the <sys/socket.h> header file. */
 #undef HAVE_SYS_SOCKET_H
 
-/* Define to 1 if you have the <sys/stat.h> header file. */
-#undef HAVE_SYS_STAT_H
-
 /* Define to 1 if you have the <sys/time.h> header file. */
 #undef HAVE_SYS_TIME_H
 
 /* Define to 1 if you have the <sys/types.h> header file. */
 #undef HAVE_SYS_TYPES_H
 
+/* Define to 1 if you have the <time.h> header file. */
+#undef HAVE_TIME_H
+
+/* Define to 1 if you have the <udp.h> header file. */
+#undef HAVE_UDP_H
+
 /* Define to 1 if you have the <unistd.h> header file. */
 #undef HAVE_UNISTD_H
 
+/* Define to 1 if you have the <windows.h> header file. */
+#undef HAVE_WINDOWS_H
+
 /* Define to 1 if you have the <winsock2.h> header file. */
 #undef HAVE_WINSOCK2_H
 
    first (like Motorola and SPARC, unlike Intel and VAX). */
 #undef WORDS_BIGENDIAN
 
+
+#ifndef _GNU_SOURCE
+  #define _GNU_SOURCE
+#endif
+
+
 /* Define to empty if `const' does not conform to ANSI C. */
 #undef const
 
-/* Define as `__inline' if that's what the C compiler calls it, or to nothing
-   if it is not supported. */
+/* Define to `__inline__' or `__inline' if that's what the C compiler
+   calls it, or to nothing if 'inline' is not supported under any name.  */
+#ifndef __cplusplus
 #undef inline
-
-/* Define to `int' if <sys/types.h> does not define. */
-#undef pid_t
-
-/* Define to `unsigned' if <sys/types.h> does not define. */
-#undef size_t
+#endif
index 318cecc0670c2efbba3d91ac1be5f00a05006066..55d996669026cc659d5460b4cedda91d0a7184a0 100644 (file)
@@ -26,30 +26,16 @@ extern "C" {
 #endif
 
 #define MAX_INTERFACES            5
-
 #define ORTE_DEFAULT_DOMAIN       0
-
 #define MAX_STRING_IPADDRESS_LENGTH 4*3+3+1
-
-#define MAX_STRING_NTPTIME_LENGTH   30    //need fix
-
-
-/*  Sleep for Windows is a stupid loop with I/O :))) */
-#ifdef _WIN32
-/**
- * ORTESleepMs - suspends calling thread for given time
- * @x: time in miliseconds
- */
-  #include <windows.h>
-  #define ORTESleepMs(x)  Sleep(x)
-#else
-  #if defined(_OMK_UNIX) || defined(HAVE_UNISTD_H)
-    #ifndef CONFIG_ORTE_RT
-      #include <unistd.h>
-    #endif
-  #endif
-  #define ORTESleepMs(x)  usleep(x*1000)
-#endif
+#define MAX_STRING_NTPTIME_LENGTH 30    //need fix
+
+////////////////////////////////////////////////////////////////////////////////
+//Return values
+#define ORTE_OK                          0
+#define ORTE_BAD_HANDLE                  -1
+#define ORTE_TIMEOUT             -2
+#define ORTE_QUEUE_FULL                  -3
 
 /*****************************************************************/
 // Cmp two sequence numbers
index 32aabd129f2d9465861434ea0cc728e9cb258d11..b004f343df1a2b61eadd5c0ad2c104e3a45e58a8 100644 (file)
 extern "C" {
 #endif
 
-#define _GNU_SOURCE
-
 #ifdef HAVE_CONFIG_H
   #include "orte_config.h"
+#elif defined ORTE_OMK_UNIX
+  #include "orte_config_omk_unix.h"
+#elif defined ORTE_OMK_RTL
+  #include "orte_config_omk_rtl.h"
 #endif
 
-#ifdef HAVE_UNISTD_H
-  #include <unistd.h>
+#ifdef HAVE_ARPA_INET_H
+  #include <arpa/inet.h>
+#endif
+#ifdef HAVE_FCNTL_H
+  #include <fcntl.h>
 #endif
 #ifdef HAVE_STDIO_H
   #include <stdio.h>
 #endif
-#ifdef HAVE_STDLIB_H
-  #include <stdlib.h>
-#endif
-#ifdef HAVE_STRING_H
-  #include <string.h>
-#endif
-#ifdef HAVE_SOCKET
-  #include <sys/socket.h>
-#endif
 #ifdef HAVE_NETDB_H
   #include <netdb.h>
 #endif
-#ifdef HAVE_NET_IF_H
-  #include <net/if.h>
-#endif
 #ifdef HAVE_NETINET_IN_H
   #include <netinet/in.h>
 #endif
-#ifdef HAVE_ARPA_INET_H
-  #include <arpa/inet.h>
+#ifdef HAVE_STDLIB_H
+  #include <stdlib.h>
 #endif
-#ifdef HAVE_FCNTL_H
-  #include <fcntl.h>
+#ifdef HAVE_STRING_H
+  #include <string.h>
 #endif
 #ifdef HAVE_SYS_IOCTL_H
   #include <sys/ioctl.h>
 #endif
+#ifdef HAVE_SYS_SOCKET
+  #include <sys/socket.h>
+#endif
 #ifdef HAVE_SYS_TIME_H
   #include <sys/time.h>
 #endif
+#ifdef HAVE_UNISTD_H
+  #include <unistd.h>
+#endif
 #ifdef HAVE_PTHREAD_H
   #include <pthread.h>
 #endif
+#ifdef HAVE_STDARG_H
+  #include <stdarg.h>
+#endif
 #ifdef HAVE_SYS_TYPES_H
   #include <sys/types.h>
 #endif
+#ifdef HAVE_NET_IF_H
+  #include <net/if.h>
+#endif
 #ifdef HAVE_BYTESWAP_H
   #include <byteswap.h>
 #endif
-#ifdef HAVE_STDARG_H
-  #include <stdarg.h>
-#endif
 #ifdef HAVE_CTYPE_H
   #include <ctype.h>
 #endif
+#ifdef HAVE_SEMAPHORE_H
+  #include <semaphore.h>
+#endif
+#ifdef HAVE_GETOPT_H
+  #include <getopt.h>
+#endif
+#ifdef HAVE_SIGNAL_H
+  #include <signal.h>
+#endif
+//win32 headers
 #ifdef HAVE_WINSOCK2_H
   #include <winsock2.h>
 #endif
 #ifdef HAVE_WS2TCPIP_H
   #include <ws2tcpip.h>
 #endif
+#ifdef HAVE_WINDOWS_H
+  #include <windows.h>
+#endif
+//kernel headers
+#ifdef HAVE_ASM_BYTEORDER_H
+  #include <asm/byteorder.h>
+#endif
+#ifdef HAVE_LINUX_CTYPE_H
+  #include <linux/ctype.h>
+#endif
+#ifdef HAVE_LINUX_STRING_H
+  #include <linux/string.h>
+#endif
+#ifdef HAVE_LINUX_MODULE_H
+  #include <linux/module.h>
+#endif
+#ifdef HAVE_LINUX_IF_H
+  #include <linux/if.h>
+#endif
+#ifdef HAVE_LINUX_SOCKET_H
+  #include <linux/socket.h>
+#endif
+#ifdef HAVE_LINUX_TIME_H
+  #include <linux/time.h>
+#endif
+#ifdef HAVE_LINUX_TYPES_H
+  #include <linux/types.h>
+#endif
+#ifdef HAVE_LINUX_IN_H
+  #include <linux/in.h>
+#endif
+//RTL headers
+#ifdef HAVE_RTL_H
+  #include <rtl.h>
+#endif
+#ifdef HAVE_RTL_MALLOC_H
+  #include <rtl_malloc.h>
+#endif
+#ifdef HAVE_UDP_H
+  #include <udp.h>
+#endif
+#ifdef HAVE_NIC_H
+  #include <nic.h>
+#endif
+#ifdef HAVE_NICTAB_H
+  #include <nictab.h>
+#endif
+#ifdef HAVE_TIME_H
+  #include <time.h>
+#endif
+//RTAI headers
+#ifdef HAVE_RTNET_H
+  #include <rtnet.h>
+#endif
 
 #ifdef CONFIG_ORTE_UNIX
   #define SOCK_BSD       
 #elif defined _WIN32
+  #define SOCK_WIN
   #ifndef HAVE_CONFIG_H
     #include "config.h.undef"
     #if defined(_MSC_VER) || defined (_OMK_UNIX) 
@@ -104,70 +171,24 @@ extern "C" {
       #include <string.h>
       #include <winsock2.h>
       #include <ws2tcpip.h>
+      #include <windows.h>
     #endif
   #endif
-  #include <pthread.h>
-  #include <timeval.h>
+  #include <win32/pthread.h>
+  #include <win32/semaphore.h>
+  #include <win32/timeval.h>
+  #ifndef __GETOPT_H__  //mingw
+    #include <win32/getopt.h>
+  #endif
   #include <ew_types.h>
   #define ioctl ioctlsocket
-  #define SOCK_WIN
-#elif defined __RTL__
-  #ifndef HAVE_CONFIG_H
-    #include "config.h.undef"
-  #endif
-  #include <rtl.h>
-  #include <posix/pthread.h>
-  #include <posix/time.h>
-  #include <rtl_malloc.h>
-  #include <byteswap.h>
-  #include <udp.h>
-  #include <nic.h>
-  #include <nictab.h>
-  #include <ctype.h>
-  #include <time.h>
+#elif defined CONFIG_ORTE_RTL
+  #define SOCK_RTL
   #include <rtl/compat.h>
   #include <rtl/rwlock.h>
-  #define SOCK_RTL
 #elif defined CONFIG_ORTE_RTAI
-  #undef PACKAGE_NAME
-  #undef PACKAGE_BUGREPORT
-  #undef PACKAGE_STRING
-  #undef PACKAGE
-  #undef PACKAGE_TARNAME
-  #undef PACKAGE_VERSION
-  #undef VERSION
-//  #include "config.h.undef"
-  #include <linux/module.h>
-  #include <rtai_posix.h.patched>
-  #include <byteswap.h>
-  #include <rtnet.h>
-  #include <linux/if.h>
-  #include <linux/in.h>
-  #include <linux/ctype.h>
+  #define SOCK_BSD  
   #include <rtai/compat.h>
-  #define SOCK_BSD
-  
-//  #define SOCK_RTAI
-#elif defined _OMK_UNIX
-  #define SOCK_BSD       
-  #include "config.h.undef"
-  #include <unistd.h>
-  #include <stdio.h>
-  #include <stdlib.h>
-  #include <string.h>
-  #include <sys/socket.h>
-  #include <netdb.h>
-  #include <net/if.h>
-  #include <netinet/in.h>
-  #include <arpa/inet.h>
-  #include <fcntl.h>
-  #include <sys/ioctl.h>
-  #include <sys/time.h>
-  #include <pthread.h>
-  #include <sys/types.h>
-  #include <byteswap.h>
-  #include <stdarg.h>
-  #include <ctype.h>
 #endif
 
 #ifdef __cplusplus
index 023dacb5b722214e49835e17e79310561df276cf..61c8344ce0b1fc28ccb6479b4d662bfda48a4ae4 100644 (file)
@@ -26,23 +26,27 @@ extern "C" {
 #endif
 
 #ifdef HAVE_CONFIG_H
-  #include <orte_config.h>
+  #include "orte_config.h"
+#elif defined ORTE_OMK_UNIX
+  #include "orte_config_omk_unix.h"
+#elif defined ORTE_OMK_RTL
+  #include "orte_config_omk_rtl.h"
 #endif
-#ifdef _OMK_UNIX
-  #define HAVE_SYS_TYPES_H
-#endif
-#if defined HAVE_SYS_TYPES_H && !defined CONFIG_ORTE_RT
+
+
+#ifdef HAVE_SYS_TYPES_H
   #include <sys/types.h>
 #endif
-#ifdef _WIN32
+#ifdef HAVE_LINUX_TYPES_H
+  #include <linux/types.h>
+#endif
+#if defined _WIN32 || defined CONFIG_ORTE_WIN
   #include <ew_types.h>
-#elif defined __RTL__
-  #include <rtl.h>
 #endif
-#include "typedefs_defines_rtps.h"
-#include "defines_api.h"
-#include "typedefs_api.h"
-#include "protos_api.h"
+#include <typedefs_defines_rtps.h>
+#include <defines_api.h>
+#include <typedefs_api.h>
+#include <protos_api.h>
 
 #ifdef __cplusplus
 } /* extern "C"*/
diff --git a/orte/include/orte_config_omk_rtl.h b/orte/include/orte_config_omk_rtl.h
new file mode 100644 (file)
index 0000000..69e26f3
--- /dev/null
@@ -0,0 +1,192 @@
+/* orte/include/config.h.  Generated by configure.  */
+/* orte/include/config.h.in.  Generated from configure.in by autoheader.  */
+
+/* Define if linux kernel is found */
+#define CONFIG_ORTE_KERNEL 1
+
+/* Define to enable ORTE's RT support */
+#define CONFIG_ORTE_RT 1
+
+/* Define if kernel is RTAI patched */
+/* #undef CONFIG_ORTE_RTAI */
+
+/* Define if kernel is RTLinux patched */
+#define CONFIG_ORTE_RTL 1
+
+/* Define if is target a unix system */
+/* #undef CONFIG_ORTE_UNIX */
+
+/* Define if is target windows */
+/* #undef CONFIG_ORTE_WIN */
+
+/* Define to 1 if you have the <arpa/inet.h> header file. */
+/* #undef HAVE_ARPA_INET_H */
+
+/* Define to 1 if you have the <asm/byteorder.h> header file. */
+#define HAVE_ASM_BYTEORDER_H 1
+
+/* Define to 1 if you have the <byteswap.h> header file. */
+/* #undef HAVE_BYTESWAP_H */
+
+/* Define to 1 if you have the <ctype.h> header file. */
+/* #undef HAVE_CTYPE_H */
+
+/* Define to 1 if you have the <fcntl.h> header file. */
+/* #undef HAVE_FCNTL_H */
+
+/* Define to 1 if you have the `gethostbyname' function. */
+/* #undef HAVE_GETHOSTBYNAME */
+
+/* Define to 1 if you have the <getopt.h> header file. */
+/* #undef HAVE_GETOPT_H */
+
+/* Define to 1 if you have the `pthread' library (-lpthread). */
+/* #undef HAVE_LIBPTHREAD */
+
+/* Define to 1 if you have the `ws2_32' library (-lws2_32). */
+/* #undef HAVE_LIBWS2_32 */
+
+/* Define to 1 if you have the <linux/ctype.h> header file. */
+#define HAVE_LINUX_CTYPE_H 1
+
+/* Define to 1 if you have the <linux/if.h> header file. */
+#define HAVE_LINUX_IF_H 1
+
+/* Define to 1 if you have the <linux/in.h> header file. */
+#define HAVE_LINUX_IN_H 1
+
+/* Define to 1 if you have the <linux/module.h> header file. */
+#define HAVE_LINUX_MODULE_H 1
+
+/* Define to 1 if you have the <linux/socket.h> header file. */
+#define HAVE_LINUX_SOCKET_H 1
+
+/* Define to 1 if you have the <linux/string.h> header file. */
+#define HAVE_LINUX_STRING_H 1
+
+/* Define to 1 if you have the <linux/time.h> header file. */
+#define HAVE_LINUX_TIME_H 1
+
+/* Define to 1 if you have the <linux/types.h> header file. */
+#define HAVE_LINUX_TYPES_H 1
+
+/* Define to 1 if you have the <netdb.h> header file. */
+/* #undef HAVE_NETDB_H */
+
+/* Define to 1 if you have the <netinet/in.h> header file. */
+/* #undef HAVE_NETINET_IN_H */
+
+/* Define to 1 if you have the <net/if.h> header file. */
+/* #undef HAVE_NET_IF_H */
+
+/* Define to 1 if you have the <nictab.h> header file. */
+#define HAVE_NICTAB_H 1
+
+/* Define to 1 if you have the <nic.h> header file. */
+#define HAVE_NIC_H 1
+
+/* Define to 1 if you have the <pthread.h> header file. */
+#define HAVE_PTHREAD_H 1
+
+/* Define to 1 if you have the <rtl.h> header file. */
+#define HAVE_RTL_H 1
+
+/* Define to 1 if you have the <rtl_malloc.h> header file. */
+#define HAVE_RTL_MALLOC_H 1
+
+/* Define to 1 if you have the <rtnet.h> header file. */
+/* #undef HAVE_RTNET_H */
+
+/* Define to 1 if you have the <semaphore.h> header file. */
+#define HAVE_SEMAPHORE_H 1
+
+/* Define to 1 if you have the <signal.h> header file. */
+/* #undef HAVE_SIGNAL_H */
+
+/* Define to 1 if you have the <stdarg.h> header file. */
+/* #undef HAVE_STDARG_H */
+
+/* Define to 1 if you have the <stdio.h> header file. */
+/* #undef HAVE_STDIO_H */
+
+/* Define to 1 if you have the <stdlib.h> header file. */
+/* #undef HAVE_STDLIB_H */
+
+/* Define to 1 if you have the `strdup' function. */
+/* #undef HAVE_STRDUP */
+
+/* Define to 1 if you have the <string.h> header file. */
+#define HAVE_STRING_H 1
+
+/* Define to 1 if you have the <sys/ioctl.h> header file. */
+/* #undef HAVE_SYS_IOCTL_H */
+
+/* Define to 1 if you have the <sys/socket.h> header file. */
+/* #undef HAVE_SYS_SOCKET_H */
+
+/* Define to 1 if you have the <sys/time.h> header file. */
+/* #undef HAVE_SYS_TIME_H */
+
+/* Define to 1 if you have the <sys/types.h> header file. */
+/* #undef HAVE_SYS_TYPES_H */
+
+/* Define to 1 if you have the <time.h> header file. */
+#define HAVE_TIME_H 1
+
+/* Define to 1 if you have the <udp.h> header file. */
+#define HAVE_UDP_H 1
+
+/* Define to 1 if you have the <unistd.h> header file. */
+/* #undef HAVE_UNISTD_H */
+
+/* Define to 1 if you have the <windows.h> header file. */
+/* #undef HAVE_WINDOWS_H */
+
+/* Define to 1 if you have the <winsock2.h> header file. */
+/* #undef HAVE_WINSOCK2_H */
+
+/* Define to 1 if you have the <ws2tcpip.h> header file. */
+/* #undef HAVE_WS2TCPIP_H */
+
+/* Name of package */
+#define ORTE_PACKAGE "orte"
+
+/* Define to the address where bug reports for this package should be sent. */
+#define ORTE_PACKAGE_BUGREPORT "petr.smolik@wo.cz"
+
+/* Define to the full name of this package. */
+#define ORTE_PACKAGE_NAME "orte"
+
+/* Define to the full name and version of this package. */
+#define ORTE_PACKAGE_STRING "orte 0.2.0"
+
+/* Define to the one symbol short name of this package. */
+#define ORTE_PACKAGE_TARNAME "orte"
+
+/* Define to the version of this package. */
+#define ORTE_PACKAGE_VERSION "0.2.0"
+
+/* Define to 1 if you have the ANSI C header files. */
+/* #undef STDC_HEADERS */
+
+/* Version number of package */
+#define ORTE_VERSION "0.2.0"
+
+/* Define to 1 if your processor stores words with the most significant byte
+   first (like Motorola and SPARC, unlike Intel and VAX). */
+/* #undef WORDS_BIGENDIAN */
+
+
+#ifndef _GNU_SOURCE
+  #define _GNU_SOURCE
+#endif
+
+
+/* Define to empty if `const' does not conform to ANSI C. */
+/* #undef const */
+
+/* Define to `__inline__' or `__inline' if that's what the C compiler
+   calls it, or to nothing if 'inline' is not supported under any name.  */
+#ifndef __cplusplus
+/* #undef inline */
+#endif
diff --git a/orte/include/orte_config_omk_unix.h b/orte/include/orte_config_omk_unix.h
new file mode 100644 (file)
index 0000000..961f739
--- /dev/null
@@ -0,0 +1,192 @@
+/* orte/include/config.h.  Generated by configure.  */
+/* orte/include/config.h.in.  Generated from configure.in by autoheader.  */
+
+/* Define if linux kernel is found */
+/* #undef CONFIG_ORTE_KERNEL */
+
+/* Define to enable ORTE's RT support */
+/* #undef CONFIG_ORTE_RT */
+
+/* Define if kernel is RTAI patched */
+/* #undef CONFIG_ORTE_RTAI */
+
+/* Define if kernel is RTLinux patched */
+/* #undef CONFIG_ORTE_RTL */
+
+/* Define if is target a unix system */
+#define CONFIG_ORTE_UNIX 1
+
+/* Define if is target windows */
+/* #undef CONFIG_ORTE_WIN */
+
+/* Define to 1 if you have the <arpa/inet.h> header file. */
+#define HAVE_ARPA_INET_H 1
+
+/* Define to 1 if you have the <asm/byteorder.h> header file. */
+/* #undef HAVE_ASM_BYTEORDER_H */
+
+/* Define to 1 if you have the <byteswap.h> header file. */
+#define HAVE_BYTESWAP_H 1
+
+/* Define to 1 if you have the <ctype.h> header file. */
+#define HAVE_CTYPE_H 1
+
+/* Define to 1 if you have the <fcntl.h> header file. */
+#define HAVE_FCNTL_H 1
+
+/* Define to 1 if you have the `gethostbyname' function. */
+#define HAVE_GETHOSTBYNAME 1
+
+/* Define to 1 if you have the <getopt.h> header file. */
+#define HAVE_GETOPT_H 1
+
+/* Define to 1 if you have the `pthread' library (-lpthread). */
+#define HAVE_LIBPTHREAD 1
+
+/* Define to 1 if you have the `ws2_32' library (-lws2_32). */
+/* #undef HAVE_LIBWS2_32 */
+
+/* Define to 1 if you have the <linux/ctype.h> header file. */
+/* #undef HAVE_LINUX_CTYPE_H */
+
+/* Define to 1 if you have the <linux/if.h> header file. */
+/* #undef HAVE_LINUX_IF_H */
+
+/* Define to 1 if you have the <linux/in.h> header file. */
+/* #undef HAVE_LINUX_IN_H */
+
+/* Define to 1 if you have the <linux/module.h> header file. */
+/* #undef HAVE_LINUX_MODULE_H */
+
+/* Define to 1 if you have the <linux/socket.h> header file. */
+/* #undef HAVE_LINUX_SOCKET_H */
+
+/* Define to 1 if you have the <linux/string.h> header file. */
+/* #undef HAVE_LINUX_STRING_H */
+
+/* Define to 1 if you have the <linux/time.h> header file. */
+/* #undef HAVE_LINUX_TIME_H */
+
+/* Define to 1 if you have the <linux/types.h> header file. */
+/* #undef HAVE_LINUX_TYPES_H */
+
+/* Define to 1 if you have the <netdb.h> header file. */
+#define HAVE_NETDB_H 1
+
+/* Define to 1 if you have the <netinet/in.h> header file. */
+#define HAVE_NETINET_IN_H 1
+
+/* Define to 1 if you have the <net/if.h> header file. */
+#define HAVE_NET_IF_H 1
+
+/* Define to 1 if you have the <nictab.h> header file. */
+/* #undef HAVE_NICTAB_H */
+
+/* Define to 1 if you have the <nic.h> header file. */
+/* #undef HAVE_NIC_H */
+
+/* Define to 1 if you have the <pthread.h> header file. */
+#define HAVE_PTHREAD_H 1
+
+/* Define to 1 if you have the <rtl.h> header file. */
+/* #undef HAVE_RTL_H */
+
+/* Define to 1 if you have the <rtl_malloc.h> header file. */
+/* #undef HAVE_RTL_MALLOC_H */
+
+/* Define to 1 if you have the <rtnet.h> header file. */
+/* #undef HAVE_RTNET_H */
+
+/* Define to 1 if you have the <semaphore.h> header file. */
+#define HAVE_SEMAPHORE_H 1
+
+/* Define to 1 if you have the <signal.h> header file. */
+#define HAVE_SIGNAL_H 1
+
+/* Define to 1 if you have the <stdarg.h> header file. */
+#define HAVE_STDARG_H 1
+
+/* Define to 1 if you have the <stdio.h> header file. */
+#define HAVE_STDIO_H 1
+
+/* Define to 1 if you have the <stdlib.h> header file. */
+#define HAVE_STDLIB_H 1
+
+/* Define to 1 if you have the `strdup' function. */
+#define HAVE_STRDUP 1
+
+/* Define to 1 if you have the <string.h> header file. */
+#define HAVE_STRING_H 1
+
+/* Define to 1 if you have the <sys/ioctl.h> header file. */
+#define HAVE_SYS_IOCTL_H 1
+
+/* Define to 1 if you have the <sys/socket.h> header file. */
+#define HAVE_SYS_SOCKET_H 1
+
+/* Define to 1 if you have the <sys/time.h> header file. */
+#define HAVE_SYS_TIME_H 1
+
+/* Define to 1 if you have the <sys/types.h> header file. */
+#define HAVE_SYS_TYPES_H 1
+
+/* Define to 1 if you have the <time.h> header file. */
+/* #undef HAVE_TIME_H */
+
+/* Define to 1 if you have the <udp.h> header file. */
+/* #undef HAVE_UDP_H */
+
+/* Define to 1 if you have the <unistd.h> header file. */
+#define HAVE_UNISTD_H 1
+
+/* Define to 1 if you have the <windows.h> header file. */
+/* #undef HAVE_WINDOWS_H */
+
+/* Define to 1 if you have the <winsock2.h> header file. */
+/* #undef HAVE_WINSOCK2_H */
+
+/* Define to 1 if you have the <ws2tcpip.h> header file. */
+/* #undef HAVE_WS2TCPIP_H */
+
+/* Name of package */
+#define ORTE_PACKAGE "orte"
+
+/* Define to the address where bug reports for this package should be sent. */
+#define ORTE_PACKAGE_BUGREPORT "petr.smolik@wo.cz"
+
+/* Define to the full name of this package. */
+#define ORTE_PACKAGE_NAME "orte"
+
+/* Define to the full name and version of this package. */
+#define ORTE_PACKAGE_STRING "orte 0.2.0"
+
+/* Define to the one symbol short name of this package. */
+#define ORTE_PACKAGE_TARNAME "orte"
+
+/* Define to the version of this package. */
+#define ORTE_PACKAGE_VERSION "0.2.0"
+
+/* Define to 1 if you have the ANSI C header files. */
+#define STDC_HEADERS 1
+
+/* Version number of package */
+#define ORTE_VERSION "0.2.0"
+
+/* Define to 1 if your processor stores words with the most significant byte
+   first (like Motorola and SPARC, unlike Intel and VAX). */
+/* #undef WORDS_BIGENDIAN */
+
+
+#ifndef _GNU_SOURCE
+  #define _GNU_SOURCE
+#endif
+
+
+/* Define to empty if `const' does not conform to ANSI C. */
+/* #undef const */
+
+/* Define to `__inline__' or `__inline' if that's what the C compiler
+   calls it, or to nothing if 'inline' is not supported under any name.  */
+#ifndef __cplusplus
+/* #undef inline */
+#endif
index 5b0fc90779c151b38d4a8bc2b98364f7a91538d7..cbb510aaa06cefa09eefec12cf0fd8f597fafad8 100644 (file)
@@ -60,6 +60,8 @@ extern void
 conv_sn(SequenceNumber *sn,char ef);
 extern void 
 conv_ntp(NtpTime *ntp,char ef);
+extern int
+getStringPart(char *string,char divChar,int iterator,char *buff);
 
 ///////////////////////////////////////////////////////////////////////////////
 // htimerNtp.c
@@ -173,7 +175,8 @@ generateEvent(ORTEDomain *d,GUID_RTPS *guid,void *params,Boolean live);
 extern Boolean
 getTypeApp(ORTEDomain *d,AppParams *ap,IPAddress senderIPAddress);
 extern void 
-appSelfParamChanged(ORTEDomain *d,Boolean lock,Boolean unlock,Boolean forWM);
+appSelfParamChanged(ORTEDomain *d,Boolean lock,Boolean unlock,
+   Boolean forWM,Boolean alive);
 
 ///////////////////////////////////////////////////////////////////////////////
 // event.c
index 6a11441dfe858f0936287860dce4e5194af665c5..bf2c8c8655fc7f3867fca9a0e494ee6bef13939e 100644 (file)
@@ -46,14 +46,7 @@ extern Boolean
 ORTEDomainPropDefaultGet(ORTEDomainProp *prop);
 extern Boolean
 ORTEDomainInitEvents(ORTEDomainAppEvents *events);
-extern Boolean
-ORTEPublPropDefaultGet(ORTEDomain *d,ORTEPublProp *pp);
-extern Boolean
-ORTEPublPropDefaultSet(ORTEDomain *d,ORTEPublProp *pp);
-extern Boolean
-ORTESubsPropDefaultGet(ORTEDomain *d,ORTESubsProp *sp);
-extern Boolean
-ORTESubsPropDefaultSet(ORTEDomain *d,ORTESubsProp *sp);
+
 
 ///////////////////////////////////////////////////////////////////////////////
 // ORTEDomainApp.c
@@ -97,7 +90,7 @@ extern int
 ORTEPublicationPropertiesSet(ORTEPublication *cstWriter,ORTEPublProp *pp);
 extern int
 ORTEPublicationWaitForSubscriptions(ORTEPublication *cstWriter,NtpTime wait,
-    unsigned int retries,u_int32_t noSubscriptions);
+    unsigned int retries,unsigned int noSubscriptions);
 extern int
 ORTEPublicationGetStatus(ORTEPublication *cstWriter,ORTEPublStatus *status);
 extern int 
@@ -150,6 +143,11 @@ ORTEInit(void);
 extern void 
 ORTEAppSendThread(ORTEDomain *d);
 
+///////////////////////////////////////////////////////////////////////////////
+// ORTEMisc.c
+extern void
+ORTESleepMs(unsigned int ms);
+
 #ifdef __cplusplus
 } /* extern "C"*/
 #endif
index 04a7b653b0e8c28a8de238ac23e32bb67d0730d9..febdc6367d2ec0292dfd5402f0b51abfa73608ce 100644 (file)
  *
  */
 
-#include "defines.h"  //macro MALLOC
+#ifndef _COMPAT_H
+#define _COMPAT_H
+
+#include <linux/if.h>
+#include <linux/in.h>
+#include <rtnet.h>
+#include "rtai_posix.h.patched"
+#include <defines.h>  //macro MALLOC
+
+
 
 /* This should become a bit more generic for all platforms... */
 #define rtl_printf  rt_printk
 #define printf      rt_printk /* catch some probably forgotten printf's */
 #define malloc      rt_malloc
 #define free        rt_free
+#define bswap_16    swab16
+#define bswap_32    swab32
 
 typedef __u32 in_addr_t;
 
@@ -74,6 +85,13 @@ static inline char *strdup(const char *s)
     return new_s;
 }
 
+
+#define sem_init                    sem_init_rt
+#define sem_destroy                 sem_destroy_rt
+#define sem_timedwait               sem_timedwait_rt
+#define sem_post                    sem_post_rt
+#define sem_getvalue                sem_getvalue_rt
+
 #define pthread_rwlock_init         pthread_rwlock_init_rt
 #define pthread_rwlock_rdlock       pthread_rwlock_rdlock_rt
 #define pthread_rwlock_wrlock       pthread_rwlock_wrlock_rt
@@ -100,3 +118,5 @@ static inline char *strdup(const char *s)
 #define getsockname                 rt_socket_getsockname
 #define recvfrom                    rt_socket_recvfrom
 #define sendto                      rt_socket_sendto
+
+#endif /* _COMPAT_H */
index f5366ade1a80a22883db2aff1166fd9a66a8cdae..f94ff12ba1120739e28e3fe73d48bb3bdfebaa7c 100644 (file)
@@ -32,6 +32,8 @@
 #define STACK_SIZE     8192
 #define RR_QUANTUM_NS  1000000
 
+
+
 typedef struct rt_semaphore sem_t;
 
 typedef struct rt_semaphore pthread_mutex_t;
@@ -328,7 +330,16 @@ static inline void pthread_exit_rt(void *retval)
 static inline int pthread_join_rt(pthread_t thread, void **thread_return)
 {
        int retval1, retval2;
-       retval1 = rt_sem_wait((SEM *)(thread + 1));
+       if (rt_whoami()->priority != RT_SCHED_LINUX_PRIORITY)
+               retval1 = rt_sem_wait((SEM *)(thread + 1));
+       else {
+               while ((retval1 = rt_sem_wait_if((SEM *)(thread + 1))) <= 0) {
+                       set_current_state(TASK_INTERRUPTIBLE);
+                       schedule_timeout(HZ/10);
+               }
+       }
+       if (retval1 != 0xFFFF)
+               retval1 = 0;
        retval2 = rt_task_delete(thread);
        rt_free(thread);
        return (retval1) ? retval1 : retval2;
index c8ff77bbd9d090d46559cc0fa00d4aa2427b7d6b..921edc25ee7846a8d3caadc2f899d25eebe00753 100644 (file)
@@ -22,6 +22,8 @@
 #define _COMPAT_H
 
 #define printf rtl_printf
+#define bswap_16 swab16
+#define bswap_32 swab32
 #define gettimeofday(tv, tz) do_gettimeofday(tv)
 #define setsockopt(a, b, c, d, e) (-1)
 #define getsockopt(a, b, c, d, e) (-1)
index 250f06d5698c2e1ec07738bf1e03b8dc28686a6f..c6955d2d0fe3c34b88271c4599bf87c12f6f91d1 100644 (file)
@@ -188,11 +188,11 @@ struct ObjectEntryHID{
   gavl_cust_root_field_t aidRoot;
 };
 struct ObjectEntry{
-  gavl_cust_root_field_t objRoot;     //root of tree objects
+  gavl_cust_root_field_t objRoot;      //root of tree objects
   pthread_rwlock_t       objRootLock;
   ul_htim_queue_t        htimRoot;     //root of tree htimers
   pthread_rwlock_t       htimRootLock;
-  pthread_mutex_t        htimSendMutex; //for wake up
+  sem_t                  htimSendSem;  //for wake up
   Boolean                htimNeedWakeUp;
 };
 
@@ -222,8 +222,8 @@ typedef struct CSChange {
   ORTECDRStream          cdrStream; //for issue
   //how many times was a cstRemoteWriter acknowledged
   int                    remoteReaderCount;
-  int                    remoteReaderProcBest;
-  int                    remoteReaderProcStrict;
+  int                    remoteReaderBest;
+  int                    remoteReaderStrict;
   //receiving informations
   NtpTime                remoteTimePublished;
   NtpTime                localTimeReceived;
@@ -305,7 +305,7 @@ struct CSTWriter {
   //only for CSTPublications
   unsigned int           strictReliableCounter;
   unsigned int           bestEffortsCounter;
-  pthread_mutex_t        mutexCSChangeDestroyed;
+  sem_t                  semCSChangeDestroyed;
 };
 
 /**
@@ -446,12 +446,7 @@ struct ORTEDomain {
   ORTEAppInfo            appInfo;
   ORTEPubInfo            pubInfo;
   ORTESubInfo            subInfo;
-  
-  ////////////////////////////////////////////////////
-  //default properties for a Publication and Subscription
-  ORTEPublProp           publPropDefault;
-  ORTESubsProp           subsPropDefault;
-  
+    
   ////////////////////////////////////////////////////
   //communication objects 
   CSTWriter              writerApplicationSelf;  //Manager,App
index c8187c1608bb78f31b6ba18359156dbc8d80d314..aac51acad172cf5b5b33bc608d1d5d06e2cf5d38 100644 (file)
@@ -196,7 +196,6 @@ typedef struct ORTEPublStatus {
  * @unReliable: count of unreliable publications (strict) connected to responsible subscription
  * @issues: number of messages in receiving queue
  *
- * Current implementation has always issues=0. It means, that all messages were sent to user application
  */
 typedef struct ORTESubsStatus {
   unsigned int           strict;
@@ -322,8 +321,10 @@ typedef struct ORTEDomainProp {
   ORTEDomainBaseProp     baseProp;
   ORTEDomainWireProp     wireProp;
   ORTEMulticastProp      multicast;               //multicast properies
+  ORTEPublProp           publPropDefault;         //default properties for a Publ/Sub
+  ORTESubsProp           subsPropDefault;
   char                   *mgrs;                   //managers
-  IPAddress              mgrAddKey;               //keys
+  char                   *keys;                   //keys
   IPAddress              appLocalManager;         //applications
   char                   version[60];             //string product version
   int                    recvBuffSize;
diff --git a/orte/include/win32/semaphore.h b/orte/include/win32/semaphore.h
new file mode 100644 (file)
index 0000000..2fac0fe
--- /dev/null
@@ -0,0 +1,163 @@
+/*
+ * Module: semaphore.h
+ *
+ * Purpose:
+ *     Semaphores aren't actually part of the PThreads standard.
+ *     They are defined by the POSIX Standard:
+ *
+ *             POSIX 1003.1b-1993      (POSIX.1b)
+ *
+ * --------------------------------------------------------------------------
+ *
+ *     Pthreads-win32 - POSIX Threads Library for Win32
+ *     Copyright(C) 1998 John E. Bossom
+ *     Copyright(C) 1999,2002 Pthreads-win32 contributors
+ * 
+ *     Contact Email: rpj@ise.canberra.edu.au
+ * 
+ *     The current list of contributors is contained
+ *     in the file CONTRIBUTORS included with the source
+ *     code distribution. The list can also be seen at the
+ *     following World Wide Web location:
+ *     http://sources.redhat.com/pthreads-win32/contributors.html
+ * 
+ *     This library is free software; you can redistribute it and/or
+ *     modify it under the terms of the GNU Lesser General Public
+ *     License as published by the Free Software Foundation; either
+ *     version 2 of the License, or (at your option) any later version.
+ * 
+ *     This library 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
+ *     Lesser General Public License for more details.
+ * 
+ *     You should have received a copy of the GNU Lesser General Public
+ *     License along with this library in the file COPYING.LIB;
+ *     if not, write to the Free Software Foundation, Inc.,
+ *     59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ */
+#if !defined( SEMAPHORE_H )
+#define SEMAPHORE_H
+
+#undef PTW32_LEVEL
+
+#if defined(_POSIX_SOURCE)
+#define PTW32_LEVEL 0
+/* Early POSIX */
+#endif
+
+#if defined(_POSIX_C_SOURCE) && _POSIX_C_SOURCE >= 199309
+#undef PTW32_LEVEL
+#define PTW32_LEVEL 1
+/* Include 1b, 1c and 1d */
+#endif
+
+#if defined(INCLUDE_NP)
+#undef PTW32_LEVEL
+#define PTW32_LEVEL 2
+/* Include Non-Portable extensions */
+#endif
+
+#define PTW32_LEVEL_MAX 3
+
+#if !defined(PTW32_LEVEL)
+#define PTW32_LEVEL PTW32_LEVEL_MAX
+/* Include everything */
+#endif
+
+#if __GNUC__ && ! defined (__declspec)
+# error Please upgrade your GNU compiler to one that supports __declspec.
+#endif
+
+/*
+ * When building the DLL code, you should define PTW32_BUILD so that
+ * the variables/functions are exported correctly. When using the DLL,
+ * do NOT define PTW32_BUILD, and then the variables/functions will
+ * be imported correctly.
+ */
+#ifdef PTW32_BUILD
+# define PTW32_DLLPORT __declspec (dllexport)
+#else
+# define PTW32_DLLPORT __declspec (dllimport)
+#endif
+
+
+/*
+ * This is a duplicate of what is in the autoconf config.h,
+ * which is only used when building the pthread-win32 libraries.
+ */
+
+#ifndef PTW32_CONFIG_H
+#  if defined(WINCE)
+#    define NEED_ERRNO
+#    define NEED_SEM
+#  endif
+#  if defined(_UWIN) || defined(__MINGW32__)
+#    define HAVE_MODE_T
+#  endif
+#endif
+
+/*
+ *
+ */
+
+#if PTW32_LEVEL >= PTW32_LEVEL_MAX
+#ifdef NEED_ERRNO
+#include "need_errno.h"
+#else
+#include <errno.h>
+#endif
+#endif /* PTW32_LEVEL >= PTW32_LEVEL_MAX */
+
+#define _POSIX_SEMAPHORES
+
+#ifdef __cplusplus
+extern "C"
+{
+#endif                         /* __cplusplus */
+
+#ifndef HAVE_MODE_T
+typedef unsigned int mode_t;
+#endif
+
+
+typedef struct sem_t_ * sem_t;
+
+PTW32_DLLPORT int sem_init (sem_t * sem,
+                           int pshared,
+                           unsigned int value);
+
+PTW32_DLLPORT int sem_destroy (sem_t * sem);
+
+PTW32_DLLPORT int sem_trywait (sem_t * sem);
+
+PTW32_DLLPORT int sem_wait (sem_t * sem);
+
+PTW32_DLLPORT int sem_timedwait (sem_t * sem,
+                                const struct timespec * abstime);
+
+PTW32_DLLPORT int sem_post (sem_t * sem);
+
+PTW32_DLLPORT int sem_post_multiple (sem_t * sem,
+                                    int count);
+
+PTW32_DLLPORT int sem_open (const char * name,
+                           int oflag,
+                           mode_t mode,
+                           unsigned int value);
+
+PTW32_DLLPORT int sem_close (sem_t * sem);
+
+PTW32_DLLPORT int sem_unlink (const char * name);
+
+PTW32_DLLPORT int sem_getvalue (sem_t * sem,
+                               int * sval);
+
+#ifdef __cplusplus
+}                              /* End of extern "C" */
+#endif                         /* __cplusplus */
+
+#undef PTW32_LEVEL
+#undef PTW32_LEVEL_MAX
+
+#endif                         /* !SEMAPHORE_H */
index 04d2980b0cae08888de6addb685e7b887d53b927..60618d34893e58820063e29af653a336d53e9099 100644 (file)
@@ -27,6 +27,7 @@ ORTEThreadUtils.c \
 ORTETypeRegister.c \
 ORTEVerbosity.c \
 ORTEPattern.c \
+ORTEMisc.c \
 parameter.c \
 RTPSAck.c \
 RTPSCSTReader.c \
@@ -51,7 +52,7 @@ ul_gavlprim.c
 
 if CONFIG_ORTE_RT
 module_PROGRAMS = rt_orte.ko
-rt_orte_ko_CFLAGS = $(ORTE_CFLAGS) $(LINUX_CFLAGS) $(RTAI_CFLAGS) $(RTLINUX_CFLAGS)
+#rt_orte_ko_CFLAGS = $(ORTE_CFLAGS) 
 rt_orte_ko_SOURCES = $(LIBORTE_SOURCES)
 rt_orte_ko_LINK = $(top_builddir)/modtool --link -o $@
 
index 1ce3d9d6d20be90f0c6e8eb2cb58eb6a25bd6923..86eb09a03d46dad179da7aa57e55ab269ea77af9 100644 (file)
@@ -74,6 +74,7 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 AMTAR = @AMTAR@
 AWK = @AWK@
 CC = @CC@
+CONFIG_ORTE_KERNEL = @CONFIG_ORTE_KERNEL@
 CONFIG_ORTE_RT = @CONFIG_ORTE_RT@
 DEPDIR = @DEPDIR@
 INCLUDES = @INCLUDES@
@@ -130,6 +131,7 @@ ORTEThreadUtils.c \
 ORTETypeRegister.c \
 ORTEVerbosity.c \
 ORTEPattern.c \
+ORTEMisc.c \
 parameter.c \
 RTPSAck.c \
 RTPSCSTReader.c \
@@ -154,7 +156,7 @@ ul_gavlprim.c
 
 
 @CONFIG_ORTE_RT_TRUE@module_PROGRAMS = rt_orte.ko
-@CONFIG_ORTE_RT_TRUE@rt_orte_ko_CFLAGS = $(ORTE_CFLAGS) $(LINUX_CFLAGS) $(RTAI_CFLAGS) $(RTLINUX_CFLAGS)
+#rt_orte_ko_CFLAGS = $(ORTE_CFLAGS) 
 @CONFIG_ORTE_RT_TRUE@rt_orte_ko_SOURCES = $(LIBORTE_SOURCES)
 @CONFIG_ORTE_RT_TRUE@rt_orte_ko_LINK = $(top_builddir)/modtool --link -o $@
 
@@ -181,10 +183,11 @@ am__objects_1 = conv.$(OBJEXT) debug.$(OBJEXT) event.$(OBJEXT) \
        ORTEDomain.$(OBJEXT) ORTEDomainMgr.$(OBJEXT) ORTEInit.$(OBJEXT) \
        ORTEThreadUtils.$(OBJEXT) ORTETypeRegister.$(OBJEXT) \
        ORTEVerbosity.$(OBJEXT) ORTEPattern.$(OBJEXT) \
-       parameter.$(OBJEXT) RTPSAck.$(OBJEXT) RTPSCSTReader.$(OBJEXT) \
-       RTPSCSTReaderTimer.$(OBJEXT) RTPSCSTReaderProc.$(OBJEXT) \
-       RTPSCSTWriter.$(OBJEXT) RTPSCSTWriterTimer.$(OBJEXT) \
-       RTPSGap.$(OBJEXT) RTPSHeader.$(OBJEXT) RTPSHeardBeat.$(OBJEXT) \
+       ORTEMisc.$(OBJEXT) parameter.$(OBJEXT) RTPSAck.$(OBJEXT) \
+       RTPSCSTReader.$(OBJEXT) RTPSCSTReaderTimer.$(OBJEXT) \
+       RTPSCSTReaderProc.$(OBJEXT) RTPSCSTWriter.$(OBJEXT) \
+       RTPSCSTWriterTimer.$(OBJEXT) RTPSGap.$(OBJEXT) \
+       RTPSHeader.$(OBJEXT) RTPSHeardBeat.$(OBJEXT) \
        RTPSInfoDST.$(OBJEXT) RTPSInfoREPLY.$(OBJEXT) \
        RTPSInfoSRC.$(OBJEXT) RTPSInfoTS.$(OBJEXT) RTPSPad.$(OBJEXT) \
        RTPSUtils.$(OBJEXT) RTPSVar.$(OBJEXT) RTPSIssue.$(OBJEXT) \
@@ -195,40 +198,7 @@ liborte_a_OBJECTS = $(am_liborte_a_OBJECTS)
 @CONFIG_ORTE_RT_FALSE@module_PROGRAMS =
 PROGRAMS = $(module_PROGRAMS)
 
-am__objects_2 = rt_orte_ko-conv.$(OBJEXT) rt_orte_ko-debug.$(OBJEXT) \
-       rt_orte_ko-event.$(OBJEXT) rt_orte_ko-fnmatch.$(OBJEXT) \
-       rt_orte_ko-htimerNtp.$(OBJEXT) rt_orte_ko-objectEntry.$(OBJEXT) \
-       rt_orte_ko-objectEntryTimer.$(OBJEXT) \
-       rt_orte_ko-objectUtils.$(OBJEXT) \
-       rt_orte_ko-ORTEAppRecvMetatrafficThread.$(OBJEXT) \
-       rt_orte_ko-ORTEAppRecvUserdataThread.$(OBJEXT) \
-       rt_orte_ko-ORTEAppSendThread.$(OBJEXT) \
-       rt_orte_ko-ORTEDomainApp.$(OBJEXT) \
-       rt_orte_ko-ORTEPublication.$(OBJEXT) \
-       rt_orte_ko-ORTEPublicationTimer.$(OBJEXT) \
-       rt_orte_ko-ORTESubscription.$(OBJEXT) \
-       rt_orte_ko-ORTEDomain.$(OBJEXT) \
-       rt_orte_ko-ORTEDomainMgr.$(OBJEXT) \
-       rt_orte_ko-ORTEInit.$(OBJEXT) \
-       rt_orte_ko-ORTEThreadUtils.$(OBJEXT) \
-       rt_orte_ko-ORTETypeRegister.$(OBJEXT) \
-       rt_orte_ko-ORTEVerbosity.$(OBJEXT) \
-       rt_orte_ko-ORTEPattern.$(OBJEXT) rt_orte_ko-parameter.$(OBJEXT) \
-       rt_orte_ko-RTPSAck.$(OBJEXT) rt_orte_ko-RTPSCSTReader.$(OBJEXT) \
-       rt_orte_ko-RTPSCSTReaderTimer.$(OBJEXT) \
-       rt_orte_ko-RTPSCSTReaderProc.$(OBJEXT) \
-       rt_orte_ko-RTPSCSTWriter.$(OBJEXT) \
-       rt_orte_ko-RTPSCSTWriterTimer.$(OBJEXT) \
-       rt_orte_ko-RTPSGap.$(OBJEXT) rt_orte_ko-RTPSHeader.$(OBJEXT) \
-       rt_orte_ko-RTPSHeardBeat.$(OBJEXT) \
-       rt_orte_ko-RTPSInfoDST.$(OBJEXT) \
-       rt_orte_ko-RTPSInfoREPLY.$(OBJEXT) \
-       rt_orte_ko-RTPSInfoSRC.$(OBJEXT) \
-       rt_orte_ko-RTPSInfoTS.$(OBJEXT) rt_orte_ko-RTPSPad.$(OBJEXT) \
-       rt_orte_ko-RTPSUtils.$(OBJEXT) rt_orte_ko-RTPSVar.$(OBJEXT) \
-       rt_orte_ko-RTPSIssue.$(OBJEXT) rt_orte_ko-sock.$(OBJEXT) \
-       rt_orte_ko-ul_gavl.$(OBJEXT) rt_orte_ko-ul_gavlprim.$(OBJEXT)
-@CONFIG_ORTE_RT_TRUE@am_rt_orte_ko_OBJECTS = $(am__objects_2)
+@CONFIG_ORTE_RT_TRUE@am_rt_orte_ko_OBJECTS = $(am__objects_1)
 rt_orte_ko_OBJECTS = $(am_rt_orte_ko_OBJECTS)
 rt_orte_ko_LDADD = $(LDADD)
 rt_orte_ko_DEPENDENCIES =
@@ -247,7 +217,8 @@ am__depfiles_maybe = depfiles
 @AMDEP_TRUE@   ./$(DEPDIR)/ORTEDomain.Po \
 @AMDEP_TRUE@   ./$(DEPDIR)/ORTEDomainApp.Po \
 @AMDEP_TRUE@   ./$(DEPDIR)/ORTEDomainMgr.Po \
-@AMDEP_TRUE@   ./$(DEPDIR)/ORTEInit.Po ./$(DEPDIR)/ORTEPattern.Po \
+@AMDEP_TRUE@   ./$(DEPDIR)/ORTEInit.Po ./$(DEPDIR)/ORTEMisc.Po \
+@AMDEP_TRUE@   ./$(DEPDIR)/ORTEPattern.Po \
 @AMDEP_TRUE@   ./$(DEPDIR)/ORTEPublication.Po \
 @AMDEP_TRUE@   ./$(DEPDIR)/ORTEPublicationTimer.Po \
 @AMDEP_TRUE@   ./$(DEPDIR)/ORTESubscription.Po \
@@ -272,49 +243,6 @@ am__depfiles_maybe = depfiles
 @AMDEP_TRUE@   ./$(DEPDIR)/objectEntry.Po \
 @AMDEP_TRUE@   ./$(DEPDIR)/objectEntryTimer.Po \
 @AMDEP_TRUE@   ./$(DEPDIR)/objectUtils.Po ./$(DEPDIR)/parameter.Po \
-@AMDEP_TRUE@   ./$(DEPDIR)/rt_orte_ko-ORTEAppRecvMetatrafficThread.Po \
-@AMDEP_TRUE@   ./$(DEPDIR)/rt_orte_ko-ORTEAppRecvUserdataThread.Po \
-@AMDEP_TRUE@   ./$(DEPDIR)/rt_orte_ko-ORTEAppSendThread.Po \
-@AMDEP_TRUE@   ./$(DEPDIR)/rt_orte_ko-ORTEDomain.Po \
-@AMDEP_TRUE@   ./$(DEPDIR)/rt_orte_ko-ORTEDomainApp.Po \
-@AMDEP_TRUE@   ./$(DEPDIR)/rt_orte_ko-ORTEDomainMgr.Po \
-@AMDEP_TRUE@   ./$(DEPDIR)/rt_orte_ko-ORTEInit.Po \
-@AMDEP_TRUE@   ./$(DEPDIR)/rt_orte_ko-ORTEPattern.Po \
-@AMDEP_TRUE@   ./$(DEPDIR)/rt_orte_ko-ORTEPublication.Po \
-@AMDEP_TRUE@   ./$(DEPDIR)/rt_orte_ko-ORTEPublicationTimer.Po \
-@AMDEP_TRUE@   ./$(DEPDIR)/rt_orte_ko-ORTESubscription.Po \
-@AMDEP_TRUE@   ./$(DEPDIR)/rt_orte_ko-ORTEThreadUtils.Po \
-@AMDEP_TRUE@   ./$(DEPDIR)/rt_orte_ko-ORTETypeRegister.Po \
-@AMDEP_TRUE@   ./$(DEPDIR)/rt_orte_ko-ORTEVerbosity.Po \
-@AMDEP_TRUE@   ./$(DEPDIR)/rt_orte_ko-RTPSAck.Po \
-@AMDEP_TRUE@   ./$(DEPDIR)/rt_orte_ko-RTPSCSTReader.Po \
-@AMDEP_TRUE@   ./$(DEPDIR)/rt_orte_ko-RTPSCSTReaderProc.Po \
-@AMDEP_TRUE@   ./$(DEPDIR)/rt_orte_ko-RTPSCSTReaderTimer.Po \
-@AMDEP_TRUE@   ./$(DEPDIR)/rt_orte_ko-RTPSCSTWriter.Po \
-@AMDEP_TRUE@   ./$(DEPDIR)/rt_orte_ko-RTPSCSTWriterTimer.Po \
-@AMDEP_TRUE@   ./$(DEPDIR)/rt_orte_ko-RTPSGap.Po \
-@AMDEP_TRUE@   ./$(DEPDIR)/rt_orte_ko-RTPSHeader.Po \
-@AMDEP_TRUE@   ./$(DEPDIR)/rt_orte_ko-RTPSHeardBeat.Po \
-@AMDEP_TRUE@   ./$(DEPDIR)/rt_orte_ko-RTPSInfoDST.Po \
-@AMDEP_TRUE@   ./$(DEPDIR)/rt_orte_ko-RTPSInfoREPLY.Po \
-@AMDEP_TRUE@   ./$(DEPDIR)/rt_orte_ko-RTPSInfoSRC.Po \
-@AMDEP_TRUE@   ./$(DEPDIR)/rt_orte_ko-RTPSInfoTS.Po \
-@AMDEP_TRUE@   ./$(DEPDIR)/rt_orte_ko-RTPSIssue.Po \
-@AMDEP_TRUE@   ./$(DEPDIR)/rt_orte_ko-RTPSPad.Po \
-@AMDEP_TRUE@   ./$(DEPDIR)/rt_orte_ko-RTPSUtils.Po \
-@AMDEP_TRUE@   ./$(DEPDIR)/rt_orte_ko-RTPSVar.Po \
-@AMDEP_TRUE@   ./$(DEPDIR)/rt_orte_ko-conv.Po \
-@AMDEP_TRUE@   ./$(DEPDIR)/rt_orte_ko-debug.Po \
-@AMDEP_TRUE@   ./$(DEPDIR)/rt_orte_ko-event.Po \
-@AMDEP_TRUE@   ./$(DEPDIR)/rt_orte_ko-fnmatch.Po \
-@AMDEP_TRUE@   ./$(DEPDIR)/rt_orte_ko-htimerNtp.Po \
-@AMDEP_TRUE@   ./$(DEPDIR)/rt_orte_ko-objectEntry.Po \
-@AMDEP_TRUE@   ./$(DEPDIR)/rt_orte_ko-objectEntryTimer.Po \
-@AMDEP_TRUE@   ./$(DEPDIR)/rt_orte_ko-objectUtils.Po \
-@AMDEP_TRUE@   ./$(DEPDIR)/rt_orte_ko-parameter.Po \
-@AMDEP_TRUE@   ./$(DEPDIR)/rt_orte_ko-sock.Po \
-@AMDEP_TRUE@   ./$(DEPDIR)/rt_orte_ko-ul_gavl.Po \
-@AMDEP_TRUE@   ./$(DEPDIR)/rt_orte_ko-ul_gavlprim.Po \
 @AMDEP_TRUE@   ./$(DEPDIR)/sock.Po ./$(DEPDIR)/ul_gavl.Po \
 @AMDEP_TRUE@   ./$(DEPDIR)/ul_gavlprim.Po
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
@@ -400,51 +328,6 @@ uninstall-modulePROGRAMS:
 
 clean-modulePROGRAMS:
        -test -z "$(module_PROGRAMS)" || rm -f $(module_PROGRAMS)
-rt_orte_ko-conv.$(OBJEXT): conv.c
-rt_orte_ko-debug.$(OBJEXT): debug.c
-rt_orte_ko-event.$(OBJEXT): event.c
-rt_orte_ko-fnmatch.$(OBJEXT): fnmatch.c
-rt_orte_ko-htimerNtp.$(OBJEXT): htimerNtp.c
-rt_orte_ko-objectEntry.$(OBJEXT): objectEntry.c
-rt_orte_ko-objectEntryTimer.$(OBJEXT): objectEntryTimer.c
-rt_orte_ko-objectUtils.$(OBJEXT): objectUtils.c
-rt_orte_ko-ORTEAppRecvMetatrafficThread.$(OBJEXT): \
-       ORTEAppRecvMetatrafficThread.c
-rt_orte_ko-ORTEAppRecvUserdataThread.$(OBJEXT): \
-       ORTEAppRecvUserdataThread.c
-rt_orte_ko-ORTEAppSendThread.$(OBJEXT): ORTEAppSendThread.c
-rt_orte_ko-ORTEDomainApp.$(OBJEXT): ORTEDomainApp.c
-rt_orte_ko-ORTEPublication.$(OBJEXT): ORTEPublication.c
-rt_orte_ko-ORTEPublicationTimer.$(OBJEXT): ORTEPublicationTimer.c
-rt_orte_ko-ORTESubscription.$(OBJEXT): ORTESubscription.c
-rt_orte_ko-ORTEDomain.$(OBJEXT): ORTEDomain.c
-rt_orte_ko-ORTEDomainMgr.$(OBJEXT): ORTEDomainMgr.c
-rt_orte_ko-ORTEInit.$(OBJEXT): ORTEInit.c
-rt_orte_ko-ORTEThreadUtils.$(OBJEXT): ORTEThreadUtils.c
-rt_orte_ko-ORTETypeRegister.$(OBJEXT): ORTETypeRegister.c
-rt_orte_ko-ORTEVerbosity.$(OBJEXT): ORTEVerbosity.c
-rt_orte_ko-ORTEPattern.$(OBJEXT): ORTEPattern.c
-rt_orte_ko-parameter.$(OBJEXT): parameter.c
-rt_orte_ko-RTPSAck.$(OBJEXT): RTPSAck.c
-rt_orte_ko-RTPSCSTReader.$(OBJEXT): RTPSCSTReader.c
-rt_orte_ko-RTPSCSTReaderTimer.$(OBJEXT): RTPSCSTReaderTimer.c
-rt_orte_ko-RTPSCSTReaderProc.$(OBJEXT): RTPSCSTReaderProc.c
-rt_orte_ko-RTPSCSTWriter.$(OBJEXT): RTPSCSTWriter.c
-rt_orte_ko-RTPSCSTWriterTimer.$(OBJEXT): RTPSCSTWriterTimer.c
-rt_orte_ko-RTPSGap.$(OBJEXT): RTPSGap.c
-rt_orte_ko-RTPSHeader.$(OBJEXT): RTPSHeader.c
-rt_orte_ko-RTPSHeardBeat.$(OBJEXT): RTPSHeardBeat.c
-rt_orte_ko-RTPSInfoDST.$(OBJEXT): RTPSInfoDST.c
-rt_orte_ko-RTPSInfoREPLY.$(OBJEXT): RTPSInfoREPLY.c
-rt_orte_ko-RTPSInfoSRC.$(OBJEXT): RTPSInfoSRC.c
-rt_orte_ko-RTPSInfoTS.$(OBJEXT): RTPSInfoTS.c
-rt_orte_ko-RTPSPad.$(OBJEXT): RTPSPad.c
-rt_orte_ko-RTPSUtils.$(OBJEXT): RTPSUtils.c
-rt_orte_ko-RTPSVar.$(OBJEXT): RTPSVar.c
-rt_orte_ko-RTPSIssue.$(OBJEXT): RTPSIssue.c
-rt_orte_ko-sock.$(OBJEXT): sock.c
-rt_orte_ko-ul_gavl.$(OBJEXT): ul_gavl.c
-rt_orte_ko-ul_gavlprim.$(OBJEXT): ul_gavlprim.c
 rt_orte.ko$(EXEEXT): $(rt_orte_ko_OBJECTS) $(rt_orte_ko_DEPENDENCIES) 
        @rm -f rt_orte.ko$(EXEEXT)
        $(rt_orte_ko_LINK) $(rt_orte_ko_LDFLAGS) $(rt_orte_ko_OBJECTS) $(rt_orte_ko_LDADD) $(LIBS)
@@ -462,6 +345,7 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ORTEDomainApp.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ORTEDomainMgr.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ORTEInit.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ORTEMisc.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ORTEPattern.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ORTEPublication.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ORTEPublicationTimer.Po@am__quote@
@@ -495,49 +379,6 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/objectEntryTimer.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/objectUtils.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/parameter.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rt_orte_ko-ORTEAppRecvMetatrafficThread.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rt_orte_ko-ORTEAppRecvUserdataThread.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rt_orte_ko-ORTEAppSendThread.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rt_orte_ko-ORTEDomain.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rt_orte_ko-ORTEDomainApp.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rt_orte_ko-ORTEDomainMgr.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rt_orte_ko-ORTEInit.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rt_orte_ko-ORTEPattern.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rt_orte_ko-ORTEPublication.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rt_orte_ko-ORTEPublicationTimer.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rt_orte_ko-ORTESubscription.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rt_orte_ko-ORTEThreadUtils.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rt_orte_ko-ORTETypeRegister.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rt_orte_ko-ORTEVerbosity.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rt_orte_ko-RTPSAck.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rt_orte_ko-RTPSCSTReader.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rt_orte_ko-RTPSCSTReaderProc.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rt_orte_ko-RTPSCSTReaderTimer.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rt_orte_ko-RTPSCSTWriter.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rt_orte_ko-RTPSCSTWriterTimer.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rt_orte_ko-RTPSGap.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rt_orte_ko-RTPSHeader.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rt_orte_ko-RTPSHeardBeat.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rt_orte_ko-RTPSInfoDST.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rt_orte_ko-RTPSInfoREPLY.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rt_orte_ko-RTPSInfoSRC.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rt_orte_ko-RTPSInfoTS.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rt_orte_ko-RTPSIssue.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rt_orte_ko-RTPSPad.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rt_orte_ko-RTPSUtils.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rt_orte_ko-RTPSVar.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rt_orte_ko-conv.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rt_orte_ko-debug.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rt_orte_ko-event.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rt_orte_ko-fnmatch.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rt_orte_ko-htimerNtp.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rt_orte_ko-objectEntry.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rt_orte_ko-objectEntryTimer.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rt_orte_ko-objectUtils.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rt_orte_ko-parameter.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rt_orte_ko-sock.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rt_orte_ko-ul_gavl.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rt_orte_ko-ul_gavlprim.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sock.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ul_gavl.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ul_gavlprim.Po@am__quote@
@@ -556,522 +397,6 @@ distclean-depend:
 @AMDEP_TRUE@   depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
 @AMDEP_TRUE@   $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
        $(COMPILE) -c `cygpath -w $<`
-
-rt_orte_ko-conv.o: conv.c
-@AMDEP_TRUE@   source='conv.c' object='rt_orte_ko-conv.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@   depfile='$(DEPDIR)/rt_orte_ko-conv.Po' tmpdepfile='$(DEPDIR)/rt_orte_ko-conv.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@   $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-       $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(rt_orte_ko_CFLAGS) $(CFLAGS) -c -o rt_orte_ko-conv.o `test -f 'conv.c' || echo '$(srcdir)/'`conv.c
-
-rt_orte_ko-conv.obj: conv.c
-@AMDEP_TRUE@   source='conv.c' object='rt_orte_ko-conv.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@   depfile='$(DEPDIR)/rt_orte_ko-conv.Po' tmpdepfile='$(DEPDIR)/rt_orte_ko-conv.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@   $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-       $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(rt_orte_ko_CFLAGS) $(CFLAGS) -c -o rt_orte_ko-conv.obj `cygpath -w conv.c`
-
-rt_orte_ko-debug.o: debug.c
-@AMDEP_TRUE@   source='debug.c' object='rt_orte_ko-debug.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@   depfile='$(DEPDIR)/rt_orte_ko-debug.Po' tmpdepfile='$(DEPDIR)/rt_orte_ko-debug.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@   $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-       $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(rt_orte_ko_CFLAGS) $(CFLAGS) -c -o rt_orte_ko-debug.o `test -f 'debug.c' || echo '$(srcdir)/'`debug.c
-
-rt_orte_ko-debug.obj: debug.c
-@AMDEP_TRUE@   source='debug.c' object='rt_orte_ko-debug.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@   depfile='$(DEPDIR)/rt_orte_ko-debug.Po' tmpdepfile='$(DEPDIR)/rt_orte_ko-debug.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@   $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-       $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(rt_orte_ko_CFLAGS) $(CFLAGS) -c -o rt_orte_ko-debug.obj `cygpath -w debug.c`
-
-rt_orte_ko-event.o: event.c
-@AMDEP_TRUE@   source='event.c' object='rt_orte_ko-event.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@   depfile='$(DEPDIR)/rt_orte_ko-event.Po' tmpdepfile='$(DEPDIR)/rt_orte_ko-event.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@   $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-       $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(rt_orte_ko_CFLAGS) $(CFLAGS) -c -o rt_orte_ko-event.o `test -f 'event.c' || echo '$(srcdir)/'`event.c
-
-rt_orte_ko-event.obj: event.c
-@AMDEP_TRUE@   source='event.c' object='rt_orte_ko-event.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@   depfile='$(DEPDIR)/rt_orte_ko-event.Po' tmpdepfile='$(DEPDIR)/rt_orte_ko-event.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@   $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-       $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(rt_orte_ko_CFLAGS) $(CFLAGS) -c -o rt_orte_ko-event.obj `cygpath -w event.c`
-
-rt_orte_ko-fnmatch.o: fnmatch.c
-@AMDEP_TRUE@   source='fnmatch.c' object='rt_orte_ko-fnmatch.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@   depfile='$(DEPDIR)/rt_orte_ko-fnmatch.Po' tmpdepfile='$(DEPDIR)/rt_orte_ko-fnmatch.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@   $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-       $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(rt_orte_ko_CFLAGS) $(CFLAGS) -c -o rt_orte_ko-fnmatch.o `test -f 'fnmatch.c' || echo '$(srcdir)/'`fnmatch.c
-
-rt_orte_ko-fnmatch.obj: fnmatch.c
-@AMDEP_TRUE@   source='fnmatch.c' object='rt_orte_ko-fnmatch.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@   depfile='$(DEPDIR)/rt_orte_ko-fnmatch.Po' tmpdepfile='$(DEPDIR)/rt_orte_ko-fnmatch.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@   $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-       $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(rt_orte_ko_CFLAGS) $(CFLAGS) -c -o rt_orte_ko-fnmatch.obj `cygpath -w fnmatch.c`
-
-rt_orte_ko-htimerNtp.o: htimerNtp.c
-@AMDEP_TRUE@   source='htimerNtp.c' object='rt_orte_ko-htimerNtp.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@   depfile='$(DEPDIR)/rt_orte_ko-htimerNtp.Po' tmpdepfile='$(DEPDIR)/rt_orte_ko-htimerNtp.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@   $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-       $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(rt_orte_ko_CFLAGS) $(CFLAGS) -c -o rt_orte_ko-htimerNtp.o `test -f 'htimerNtp.c' || echo '$(srcdir)/'`htimerNtp.c
-
-rt_orte_ko-htimerNtp.obj: htimerNtp.c
-@AMDEP_TRUE@   source='htimerNtp.c' object='rt_orte_ko-htimerNtp.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@   depfile='$(DEPDIR)/rt_orte_ko-htimerNtp.Po' tmpdepfile='$(DEPDIR)/rt_orte_ko-htimerNtp.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@   $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-       $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(rt_orte_ko_CFLAGS) $(CFLAGS) -c -o rt_orte_ko-htimerNtp.obj `cygpath -w htimerNtp.c`
-
-rt_orte_ko-objectEntry.o: objectEntry.c
-@AMDEP_TRUE@   source='objectEntry.c' object='rt_orte_ko-objectEntry.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@   depfile='$(DEPDIR)/rt_orte_ko-objectEntry.Po' tmpdepfile='$(DEPDIR)/rt_orte_ko-objectEntry.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@   $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-       $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(rt_orte_ko_CFLAGS) $(CFLAGS) -c -o rt_orte_ko-objectEntry.o `test -f 'objectEntry.c' || echo '$(srcdir)/'`objectEntry.c
-
-rt_orte_ko-objectEntry.obj: objectEntry.c
-@AMDEP_TRUE@   source='objectEntry.c' object='rt_orte_ko-objectEntry.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@   depfile='$(DEPDIR)/rt_orte_ko-objectEntry.Po' tmpdepfile='$(DEPDIR)/rt_orte_ko-objectEntry.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@   $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-       $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(rt_orte_ko_CFLAGS) $(CFLAGS) -c -o rt_orte_ko-objectEntry.obj `cygpath -w objectEntry.c`
-
-rt_orte_ko-objectEntryTimer.o: objectEntryTimer.c
-@AMDEP_TRUE@   source='objectEntryTimer.c' object='rt_orte_ko-objectEntryTimer.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@   depfile='$(DEPDIR)/rt_orte_ko-objectEntryTimer.Po' tmpdepfile='$(DEPDIR)/rt_orte_ko-objectEntryTimer.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@   $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-       $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(rt_orte_ko_CFLAGS) $(CFLAGS) -c -o rt_orte_ko-objectEntryTimer.o `test -f 'objectEntryTimer.c' || echo '$(srcdir)/'`objectEntryTimer.c
-
-rt_orte_ko-objectEntryTimer.obj: objectEntryTimer.c
-@AMDEP_TRUE@   source='objectEntryTimer.c' object='rt_orte_ko-objectEntryTimer.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@   depfile='$(DEPDIR)/rt_orte_ko-objectEntryTimer.Po' tmpdepfile='$(DEPDIR)/rt_orte_ko-objectEntryTimer.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@   $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-       $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(rt_orte_ko_CFLAGS) $(CFLAGS) -c -o rt_orte_ko-objectEntryTimer.obj `cygpath -w objectEntryTimer.c`
-
-rt_orte_ko-objectUtils.o: objectUtils.c
-@AMDEP_TRUE@   source='objectUtils.c' object='rt_orte_ko-objectUtils.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@   depfile='$(DEPDIR)/rt_orte_ko-objectUtils.Po' tmpdepfile='$(DEPDIR)/rt_orte_ko-objectUtils.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@   $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-       $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(rt_orte_ko_CFLAGS) $(CFLAGS) -c -o rt_orte_ko-objectUtils.o `test -f 'objectUtils.c' || echo '$(srcdir)/'`objectUtils.c
-
-rt_orte_ko-objectUtils.obj: objectUtils.c
-@AMDEP_TRUE@   source='objectUtils.c' object='rt_orte_ko-objectUtils.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@   depfile='$(DEPDIR)/rt_orte_ko-objectUtils.Po' tmpdepfile='$(DEPDIR)/rt_orte_ko-objectUtils.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@   $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-       $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(rt_orte_ko_CFLAGS) $(CFLAGS) -c -o rt_orte_ko-objectUtils.obj `cygpath -w objectUtils.c`
-
-rt_orte_ko-ORTEAppRecvMetatrafficThread.o: ORTEAppRecvMetatrafficThread.c
-@AMDEP_TRUE@   source='ORTEAppRecvMetatrafficThread.c' object='rt_orte_ko-ORTEAppRecvMetatrafficThread.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@   depfile='$(DEPDIR)/rt_orte_ko-ORTEAppRecvMetatrafficThread.Po' tmpdepfile='$(DEPDIR)/rt_orte_ko-ORTEAppRecvMetatrafficThread.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@   $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-       $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(rt_orte_ko_CFLAGS) $(CFLAGS) -c -o rt_orte_ko-ORTEAppRecvMetatrafficThread.o `test -f 'ORTEAppRecvMetatrafficThread.c' || echo '$(srcdir)/'`ORTEAppRecvMetatrafficThread.c
-
-rt_orte_ko-ORTEAppRecvMetatrafficThread.obj: ORTEAppRecvMetatrafficThread.c
-@AMDEP_TRUE@   source='ORTEAppRecvMetatrafficThread.c' object='rt_orte_ko-ORTEAppRecvMetatrafficThread.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@   depfile='$(DEPDIR)/rt_orte_ko-ORTEAppRecvMetatrafficThread.Po' tmpdepfile='$(DEPDIR)/rt_orte_ko-ORTEAppRecvMetatrafficThread.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@   $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-       $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(rt_orte_ko_CFLAGS) $(CFLAGS) -c -o rt_orte_ko-ORTEAppRecvMetatrafficThread.obj `cygpath -w ORTEAppRecvMetatrafficThread.c`
-
-rt_orte_ko-ORTEAppRecvUserdataThread.o: ORTEAppRecvUserdataThread.c
-@AMDEP_TRUE@   source='ORTEAppRecvUserdataThread.c' object='rt_orte_ko-ORTEAppRecvUserdataThread.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@   depfile='$(DEPDIR)/rt_orte_ko-ORTEAppRecvUserdataThread.Po' tmpdepfile='$(DEPDIR)/rt_orte_ko-ORTEAppRecvUserdataThread.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@   $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-       $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(rt_orte_ko_CFLAGS) $(CFLAGS) -c -o rt_orte_ko-ORTEAppRecvUserdataThread.o `test -f 'ORTEAppRecvUserdataThread.c' || echo '$(srcdir)/'`ORTEAppRecvUserdataThread.c
-
-rt_orte_ko-ORTEAppRecvUserdataThread.obj: ORTEAppRecvUserdataThread.c
-@AMDEP_TRUE@   source='ORTEAppRecvUserdataThread.c' object='rt_orte_ko-ORTEAppRecvUserdataThread.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@   depfile='$(DEPDIR)/rt_orte_ko-ORTEAppRecvUserdataThread.Po' tmpdepfile='$(DEPDIR)/rt_orte_ko-ORTEAppRecvUserdataThread.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@   $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-       $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(rt_orte_ko_CFLAGS) $(CFLAGS) -c -o rt_orte_ko-ORTEAppRecvUserdataThread.obj `cygpath -w ORTEAppRecvUserdataThread.c`
-
-rt_orte_ko-ORTEAppSendThread.o: ORTEAppSendThread.c
-@AMDEP_TRUE@   source='ORTEAppSendThread.c' object='rt_orte_ko-ORTEAppSendThread.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@   depfile='$(DEPDIR)/rt_orte_ko-ORTEAppSendThread.Po' tmpdepfile='$(DEPDIR)/rt_orte_ko-ORTEAppSendThread.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@   $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-       $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(rt_orte_ko_CFLAGS) $(CFLAGS) -c -o rt_orte_ko-ORTEAppSendThread.o `test -f 'ORTEAppSendThread.c' || echo '$(srcdir)/'`ORTEAppSendThread.c
-
-rt_orte_ko-ORTEAppSendThread.obj: ORTEAppSendThread.c
-@AMDEP_TRUE@   source='ORTEAppSendThread.c' object='rt_orte_ko-ORTEAppSendThread.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@   depfile='$(DEPDIR)/rt_orte_ko-ORTEAppSendThread.Po' tmpdepfile='$(DEPDIR)/rt_orte_ko-ORTEAppSendThread.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@   $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-       $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(rt_orte_ko_CFLAGS) $(CFLAGS) -c -o rt_orte_ko-ORTEAppSendThread.obj `cygpath -w ORTEAppSendThread.c`
-
-rt_orte_ko-ORTEDomainApp.o: ORTEDomainApp.c
-@AMDEP_TRUE@   source='ORTEDomainApp.c' object='rt_orte_ko-ORTEDomainApp.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@   depfile='$(DEPDIR)/rt_orte_ko-ORTEDomainApp.Po' tmpdepfile='$(DEPDIR)/rt_orte_ko-ORTEDomainApp.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@   $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-       $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(rt_orte_ko_CFLAGS) $(CFLAGS) -c -o rt_orte_ko-ORTEDomainApp.o `test -f 'ORTEDomainApp.c' || echo '$(srcdir)/'`ORTEDomainApp.c
-
-rt_orte_ko-ORTEDomainApp.obj: ORTEDomainApp.c
-@AMDEP_TRUE@   source='ORTEDomainApp.c' object='rt_orte_ko-ORTEDomainApp.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@   depfile='$(DEPDIR)/rt_orte_ko-ORTEDomainApp.Po' tmpdepfile='$(DEPDIR)/rt_orte_ko-ORTEDomainApp.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@   $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-       $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(rt_orte_ko_CFLAGS) $(CFLAGS) -c -o rt_orte_ko-ORTEDomainApp.obj `cygpath -w ORTEDomainApp.c`
-
-rt_orte_ko-ORTEPublication.o: ORTEPublication.c
-@AMDEP_TRUE@   source='ORTEPublication.c' object='rt_orte_ko-ORTEPublication.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@   depfile='$(DEPDIR)/rt_orte_ko-ORTEPublication.Po' tmpdepfile='$(DEPDIR)/rt_orte_ko-ORTEPublication.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@   $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-       $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(rt_orte_ko_CFLAGS) $(CFLAGS) -c -o rt_orte_ko-ORTEPublication.o `test -f 'ORTEPublication.c' || echo '$(srcdir)/'`ORTEPublication.c
-
-rt_orte_ko-ORTEPublication.obj: ORTEPublication.c
-@AMDEP_TRUE@   source='ORTEPublication.c' object='rt_orte_ko-ORTEPublication.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@   depfile='$(DEPDIR)/rt_orte_ko-ORTEPublication.Po' tmpdepfile='$(DEPDIR)/rt_orte_ko-ORTEPublication.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@   $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-       $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(rt_orte_ko_CFLAGS) $(CFLAGS) -c -o rt_orte_ko-ORTEPublication.obj `cygpath -w ORTEPublication.c`
-
-rt_orte_ko-ORTEPublicationTimer.o: ORTEPublicationTimer.c
-@AMDEP_TRUE@   source='ORTEPublicationTimer.c' object='rt_orte_ko-ORTEPublicationTimer.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@   depfile='$(DEPDIR)/rt_orte_ko-ORTEPublicationTimer.Po' tmpdepfile='$(DEPDIR)/rt_orte_ko-ORTEPublicationTimer.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@   $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-       $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(rt_orte_ko_CFLAGS) $(CFLAGS) -c -o rt_orte_ko-ORTEPublicationTimer.o `test -f 'ORTEPublicationTimer.c' || echo '$(srcdir)/'`ORTEPublicationTimer.c
-
-rt_orte_ko-ORTEPublicationTimer.obj: ORTEPublicationTimer.c
-@AMDEP_TRUE@   source='ORTEPublicationTimer.c' object='rt_orte_ko-ORTEPublicationTimer.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@   depfile='$(DEPDIR)/rt_orte_ko-ORTEPublicationTimer.Po' tmpdepfile='$(DEPDIR)/rt_orte_ko-ORTEPublicationTimer.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@   $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-       $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(rt_orte_ko_CFLAGS) $(CFLAGS) -c -o rt_orte_ko-ORTEPublicationTimer.obj `cygpath -w ORTEPublicationTimer.c`
-
-rt_orte_ko-ORTESubscription.o: ORTESubscription.c
-@AMDEP_TRUE@   source='ORTESubscription.c' object='rt_orte_ko-ORTESubscription.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@   depfile='$(DEPDIR)/rt_orte_ko-ORTESubscription.Po' tmpdepfile='$(DEPDIR)/rt_orte_ko-ORTESubscription.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@   $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-       $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(rt_orte_ko_CFLAGS) $(CFLAGS) -c -o rt_orte_ko-ORTESubscription.o `test -f 'ORTESubscription.c' || echo '$(srcdir)/'`ORTESubscription.c
-
-rt_orte_ko-ORTESubscription.obj: ORTESubscription.c
-@AMDEP_TRUE@   source='ORTESubscription.c' object='rt_orte_ko-ORTESubscription.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@   depfile='$(DEPDIR)/rt_orte_ko-ORTESubscription.Po' tmpdepfile='$(DEPDIR)/rt_orte_ko-ORTESubscription.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@   $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-       $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(rt_orte_ko_CFLAGS) $(CFLAGS) -c -o rt_orte_ko-ORTESubscription.obj `cygpath -w ORTESubscription.c`
-
-rt_orte_ko-ORTEDomain.o: ORTEDomain.c
-@AMDEP_TRUE@   source='ORTEDomain.c' object='rt_orte_ko-ORTEDomain.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@   depfile='$(DEPDIR)/rt_orte_ko-ORTEDomain.Po' tmpdepfile='$(DEPDIR)/rt_orte_ko-ORTEDomain.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@   $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-       $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(rt_orte_ko_CFLAGS) $(CFLAGS) -c -o rt_orte_ko-ORTEDomain.o `test -f 'ORTEDomain.c' || echo '$(srcdir)/'`ORTEDomain.c
-
-rt_orte_ko-ORTEDomain.obj: ORTEDomain.c
-@AMDEP_TRUE@   source='ORTEDomain.c' object='rt_orte_ko-ORTEDomain.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@   depfile='$(DEPDIR)/rt_orte_ko-ORTEDomain.Po' tmpdepfile='$(DEPDIR)/rt_orte_ko-ORTEDomain.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@   $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-       $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(rt_orte_ko_CFLAGS) $(CFLAGS) -c -o rt_orte_ko-ORTEDomain.obj `cygpath -w ORTEDomain.c`
-
-rt_orte_ko-ORTEDomainMgr.o: ORTEDomainMgr.c
-@AMDEP_TRUE@   source='ORTEDomainMgr.c' object='rt_orte_ko-ORTEDomainMgr.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@   depfile='$(DEPDIR)/rt_orte_ko-ORTEDomainMgr.Po' tmpdepfile='$(DEPDIR)/rt_orte_ko-ORTEDomainMgr.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@   $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-       $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(rt_orte_ko_CFLAGS) $(CFLAGS) -c -o rt_orte_ko-ORTEDomainMgr.o `test -f 'ORTEDomainMgr.c' || echo '$(srcdir)/'`ORTEDomainMgr.c
-
-rt_orte_ko-ORTEDomainMgr.obj: ORTEDomainMgr.c
-@AMDEP_TRUE@   source='ORTEDomainMgr.c' object='rt_orte_ko-ORTEDomainMgr.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@   depfile='$(DEPDIR)/rt_orte_ko-ORTEDomainMgr.Po' tmpdepfile='$(DEPDIR)/rt_orte_ko-ORTEDomainMgr.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@   $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-       $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(rt_orte_ko_CFLAGS) $(CFLAGS) -c -o rt_orte_ko-ORTEDomainMgr.obj `cygpath -w ORTEDomainMgr.c`
-
-rt_orte_ko-ORTEInit.o: ORTEInit.c
-@AMDEP_TRUE@   source='ORTEInit.c' object='rt_orte_ko-ORTEInit.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@   depfile='$(DEPDIR)/rt_orte_ko-ORTEInit.Po' tmpdepfile='$(DEPDIR)/rt_orte_ko-ORTEInit.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@   $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-       $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(rt_orte_ko_CFLAGS) $(CFLAGS) -c -o rt_orte_ko-ORTEInit.o `test -f 'ORTEInit.c' || echo '$(srcdir)/'`ORTEInit.c
-
-rt_orte_ko-ORTEInit.obj: ORTEInit.c
-@AMDEP_TRUE@   source='ORTEInit.c' object='rt_orte_ko-ORTEInit.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@   depfile='$(DEPDIR)/rt_orte_ko-ORTEInit.Po' tmpdepfile='$(DEPDIR)/rt_orte_ko-ORTEInit.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@   $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-       $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(rt_orte_ko_CFLAGS) $(CFLAGS) -c -o rt_orte_ko-ORTEInit.obj `cygpath -w ORTEInit.c`
-
-rt_orte_ko-ORTEThreadUtils.o: ORTEThreadUtils.c
-@AMDEP_TRUE@   source='ORTEThreadUtils.c' object='rt_orte_ko-ORTEThreadUtils.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@   depfile='$(DEPDIR)/rt_orte_ko-ORTEThreadUtils.Po' tmpdepfile='$(DEPDIR)/rt_orte_ko-ORTEThreadUtils.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@   $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-       $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(rt_orte_ko_CFLAGS) $(CFLAGS) -c -o rt_orte_ko-ORTEThreadUtils.o `test -f 'ORTEThreadUtils.c' || echo '$(srcdir)/'`ORTEThreadUtils.c
-
-rt_orte_ko-ORTEThreadUtils.obj: ORTEThreadUtils.c
-@AMDEP_TRUE@   source='ORTEThreadUtils.c' object='rt_orte_ko-ORTEThreadUtils.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@   depfile='$(DEPDIR)/rt_orte_ko-ORTEThreadUtils.Po' tmpdepfile='$(DEPDIR)/rt_orte_ko-ORTEThreadUtils.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@   $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-       $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(rt_orte_ko_CFLAGS) $(CFLAGS) -c -o rt_orte_ko-ORTEThreadUtils.obj `cygpath -w ORTEThreadUtils.c`
-
-rt_orte_ko-ORTETypeRegister.o: ORTETypeRegister.c
-@AMDEP_TRUE@   source='ORTETypeRegister.c' object='rt_orte_ko-ORTETypeRegister.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@   depfile='$(DEPDIR)/rt_orte_ko-ORTETypeRegister.Po' tmpdepfile='$(DEPDIR)/rt_orte_ko-ORTETypeRegister.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@   $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-       $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(rt_orte_ko_CFLAGS) $(CFLAGS) -c -o rt_orte_ko-ORTETypeRegister.o `test -f 'ORTETypeRegister.c' || echo '$(srcdir)/'`ORTETypeRegister.c
-
-rt_orte_ko-ORTETypeRegister.obj: ORTETypeRegister.c
-@AMDEP_TRUE@   source='ORTETypeRegister.c' object='rt_orte_ko-ORTETypeRegister.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@   depfile='$(DEPDIR)/rt_orte_ko-ORTETypeRegister.Po' tmpdepfile='$(DEPDIR)/rt_orte_ko-ORTETypeRegister.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@   $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-       $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(rt_orte_ko_CFLAGS) $(CFLAGS) -c -o rt_orte_ko-ORTETypeRegister.obj `cygpath -w ORTETypeRegister.c`
-
-rt_orte_ko-ORTEVerbosity.o: ORTEVerbosity.c
-@AMDEP_TRUE@   source='ORTEVerbosity.c' object='rt_orte_ko-ORTEVerbosity.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@   depfile='$(DEPDIR)/rt_orte_ko-ORTEVerbosity.Po' tmpdepfile='$(DEPDIR)/rt_orte_ko-ORTEVerbosity.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@   $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-       $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(rt_orte_ko_CFLAGS) $(CFLAGS) -c -o rt_orte_ko-ORTEVerbosity.o `test -f 'ORTEVerbosity.c' || echo '$(srcdir)/'`ORTEVerbosity.c
-
-rt_orte_ko-ORTEVerbosity.obj: ORTEVerbosity.c
-@AMDEP_TRUE@   source='ORTEVerbosity.c' object='rt_orte_ko-ORTEVerbosity.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@   depfile='$(DEPDIR)/rt_orte_ko-ORTEVerbosity.Po' tmpdepfile='$(DEPDIR)/rt_orte_ko-ORTEVerbosity.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@   $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-       $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(rt_orte_ko_CFLAGS) $(CFLAGS) -c -o rt_orte_ko-ORTEVerbosity.obj `cygpath -w ORTEVerbosity.c`
-
-rt_orte_ko-ORTEPattern.o: ORTEPattern.c
-@AMDEP_TRUE@   source='ORTEPattern.c' object='rt_orte_ko-ORTEPattern.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@   depfile='$(DEPDIR)/rt_orte_ko-ORTEPattern.Po' tmpdepfile='$(DEPDIR)/rt_orte_ko-ORTEPattern.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@   $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-       $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(rt_orte_ko_CFLAGS) $(CFLAGS) -c -o rt_orte_ko-ORTEPattern.o `test -f 'ORTEPattern.c' || echo '$(srcdir)/'`ORTEPattern.c
-
-rt_orte_ko-ORTEPattern.obj: ORTEPattern.c
-@AMDEP_TRUE@   source='ORTEPattern.c' object='rt_orte_ko-ORTEPattern.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@   depfile='$(DEPDIR)/rt_orte_ko-ORTEPattern.Po' tmpdepfile='$(DEPDIR)/rt_orte_ko-ORTEPattern.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@   $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-       $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(rt_orte_ko_CFLAGS) $(CFLAGS) -c -o rt_orte_ko-ORTEPattern.obj `cygpath -w ORTEPattern.c`
-
-rt_orte_ko-parameter.o: parameter.c
-@AMDEP_TRUE@   source='parameter.c' object='rt_orte_ko-parameter.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@   depfile='$(DEPDIR)/rt_orte_ko-parameter.Po' tmpdepfile='$(DEPDIR)/rt_orte_ko-parameter.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@   $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-       $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(rt_orte_ko_CFLAGS) $(CFLAGS) -c -o rt_orte_ko-parameter.o `test -f 'parameter.c' || echo '$(srcdir)/'`parameter.c
-
-rt_orte_ko-parameter.obj: parameter.c
-@AMDEP_TRUE@   source='parameter.c' object='rt_orte_ko-parameter.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@   depfile='$(DEPDIR)/rt_orte_ko-parameter.Po' tmpdepfile='$(DEPDIR)/rt_orte_ko-parameter.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@   $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-       $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(rt_orte_ko_CFLAGS) $(CFLAGS) -c -o rt_orte_ko-parameter.obj `cygpath -w parameter.c`
-
-rt_orte_ko-RTPSAck.o: RTPSAck.c
-@AMDEP_TRUE@   source='RTPSAck.c' object='rt_orte_ko-RTPSAck.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@   depfile='$(DEPDIR)/rt_orte_ko-RTPSAck.Po' tmpdepfile='$(DEPDIR)/rt_orte_ko-RTPSAck.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@   $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-       $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(rt_orte_ko_CFLAGS) $(CFLAGS) -c -o rt_orte_ko-RTPSAck.o `test -f 'RTPSAck.c' || echo '$(srcdir)/'`RTPSAck.c
-
-rt_orte_ko-RTPSAck.obj: RTPSAck.c
-@AMDEP_TRUE@   source='RTPSAck.c' object='rt_orte_ko-RTPSAck.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@   depfile='$(DEPDIR)/rt_orte_ko-RTPSAck.Po' tmpdepfile='$(DEPDIR)/rt_orte_ko-RTPSAck.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@   $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-       $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(rt_orte_ko_CFLAGS) $(CFLAGS) -c -o rt_orte_ko-RTPSAck.obj `cygpath -w RTPSAck.c`
-
-rt_orte_ko-RTPSCSTReader.o: RTPSCSTReader.c
-@AMDEP_TRUE@   source='RTPSCSTReader.c' object='rt_orte_ko-RTPSCSTReader.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@   depfile='$(DEPDIR)/rt_orte_ko-RTPSCSTReader.Po' tmpdepfile='$(DEPDIR)/rt_orte_ko-RTPSCSTReader.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@   $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-       $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(rt_orte_ko_CFLAGS) $(CFLAGS) -c -o rt_orte_ko-RTPSCSTReader.o `test -f 'RTPSCSTReader.c' || echo '$(srcdir)/'`RTPSCSTReader.c
-
-rt_orte_ko-RTPSCSTReader.obj: RTPSCSTReader.c
-@AMDEP_TRUE@   source='RTPSCSTReader.c' object='rt_orte_ko-RTPSCSTReader.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@   depfile='$(DEPDIR)/rt_orte_ko-RTPSCSTReader.Po' tmpdepfile='$(DEPDIR)/rt_orte_ko-RTPSCSTReader.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@   $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-       $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(rt_orte_ko_CFLAGS) $(CFLAGS) -c -o rt_orte_ko-RTPSCSTReader.obj `cygpath -w RTPSCSTReader.c`
-
-rt_orte_ko-RTPSCSTReaderTimer.o: RTPSCSTReaderTimer.c
-@AMDEP_TRUE@   source='RTPSCSTReaderTimer.c' object='rt_orte_ko-RTPSCSTReaderTimer.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@   depfile='$(DEPDIR)/rt_orte_ko-RTPSCSTReaderTimer.Po' tmpdepfile='$(DEPDIR)/rt_orte_ko-RTPSCSTReaderTimer.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@   $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-       $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(rt_orte_ko_CFLAGS) $(CFLAGS) -c -o rt_orte_ko-RTPSCSTReaderTimer.o `test -f 'RTPSCSTReaderTimer.c' || echo '$(srcdir)/'`RTPSCSTReaderTimer.c
-
-rt_orte_ko-RTPSCSTReaderTimer.obj: RTPSCSTReaderTimer.c
-@AMDEP_TRUE@   source='RTPSCSTReaderTimer.c' object='rt_orte_ko-RTPSCSTReaderTimer.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@   depfile='$(DEPDIR)/rt_orte_ko-RTPSCSTReaderTimer.Po' tmpdepfile='$(DEPDIR)/rt_orte_ko-RTPSCSTReaderTimer.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@   $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-       $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(rt_orte_ko_CFLAGS) $(CFLAGS) -c -o rt_orte_ko-RTPSCSTReaderTimer.obj `cygpath -w RTPSCSTReaderTimer.c`
-
-rt_orte_ko-RTPSCSTReaderProc.o: RTPSCSTReaderProc.c
-@AMDEP_TRUE@   source='RTPSCSTReaderProc.c' object='rt_orte_ko-RTPSCSTReaderProc.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@   depfile='$(DEPDIR)/rt_orte_ko-RTPSCSTReaderProc.Po' tmpdepfile='$(DEPDIR)/rt_orte_ko-RTPSCSTReaderProc.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@   $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-       $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(rt_orte_ko_CFLAGS) $(CFLAGS) -c -o rt_orte_ko-RTPSCSTReaderProc.o `test -f 'RTPSCSTReaderProc.c' || echo '$(srcdir)/'`RTPSCSTReaderProc.c
-
-rt_orte_ko-RTPSCSTReaderProc.obj: RTPSCSTReaderProc.c
-@AMDEP_TRUE@   source='RTPSCSTReaderProc.c' object='rt_orte_ko-RTPSCSTReaderProc.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@   depfile='$(DEPDIR)/rt_orte_ko-RTPSCSTReaderProc.Po' tmpdepfile='$(DEPDIR)/rt_orte_ko-RTPSCSTReaderProc.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@   $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-       $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(rt_orte_ko_CFLAGS) $(CFLAGS) -c -o rt_orte_ko-RTPSCSTReaderProc.obj `cygpath -w RTPSCSTReaderProc.c`
-
-rt_orte_ko-RTPSCSTWriter.o: RTPSCSTWriter.c
-@AMDEP_TRUE@   source='RTPSCSTWriter.c' object='rt_orte_ko-RTPSCSTWriter.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@   depfile='$(DEPDIR)/rt_orte_ko-RTPSCSTWriter.Po' tmpdepfile='$(DEPDIR)/rt_orte_ko-RTPSCSTWriter.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@   $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-       $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(rt_orte_ko_CFLAGS) $(CFLAGS) -c -o rt_orte_ko-RTPSCSTWriter.o `test -f 'RTPSCSTWriter.c' || echo '$(srcdir)/'`RTPSCSTWriter.c
-
-rt_orte_ko-RTPSCSTWriter.obj: RTPSCSTWriter.c
-@AMDEP_TRUE@   source='RTPSCSTWriter.c' object='rt_orte_ko-RTPSCSTWriter.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@   depfile='$(DEPDIR)/rt_orte_ko-RTPSCSTWriter.Po' tmpdepfile='$(DEPDIR)/rt_orte_ko-RTPSCSTWriter.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@   $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-       $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(rt_orte_ko_CFLAGS) $(CFLAGS) -c -o rt_orte_ko-RTPSCSTWriter.obj `cygpath -w RTPSCSTWriter.c`
-
-rt_orte_ko-RTPSCSTWriterTimer.o: RTPSCSTWriterTimer.c
-@AMDEP_TRUE@   source='RTPSCSTWriterTimer.c' object='rt_orte_ko-RTPSCSTWriterTimer.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@   depfile='$(DEPDIR)/rt_orte_ko-RTPSCSTWriterTimer.Po' tmpdepfile='$(DEPDIR)/rt_orte_ko-RTPSCSTWriterTimer.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@   $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-       $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(rt_orte_ko_CFLAGS) $(CFLAGS) -c -o rt_orte_ko-RTPSCSTWriterTimer.o `test -f 'RTPSCSTWriterTimer.c' || echo '$(srcdir)/'`RTPSCSTWriterTimer.c
-
-rt_orte_ko-RTPSCSTWriterTimer.obj: RTPSCSTWriterTimer.c
-@AMDEP_TRUE@   source='RTPSCSTWriterTimer.c' object='rt_orte_ko-RTPSCSTWriterTimer.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@   depfile='$(DEPDIR)/rt_orte_ko-RTPSCSTWriterTimer.Po' tmpdepfile='$(DEPDIR)/rt_orte_ko-RTPSCSTWriterTimer.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@   $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-       $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(rt_orte_ko_CFLAGS) $(CFLAGS) -c -o rt_orte_ko-RTPSCSTWriterTimer.obj `cygpath -w RTPSCSTWriterTimer.c`
-
-rt_orte_ko-RTPSGap.o: RTPSGap.c
-@AMDEP_TRUE@   source='RTPSGap.c' object='rt_orte_ko-RTPSGap.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@   depfile='$(DEPDIR)/rt_orte_ko-RTPSGap.Po' tmpdepfile='$(DEPDIR)/rt_orte_ko-RTPSGap.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@   $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-       $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(rt_orte_ko_CFLAGS) $(CFLAGS) -c -o rt_orte_ko-RTPSGap.o `test -f 'RTPSGap.c' || echo '$(srcdir)/'`RTPSGap.c
-
-rt_orte_ko-RTPSGap.obj: RTPSGap.c
-@AMDEP_TRUE@   source='RTPSGap.c' object='rt_orte_ko-RTPSGap.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@   depfile='$(DEPDIR)/rt_orte_ko-RTPSGap.Po' tmpdepfile='$(DEPDIR)/rt_orte_ko-RTPSGap.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@   $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-       $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(rt_orte_ko_CFLAGS) $(CFLAGS) -c -o rt_orte_ko-RTPSGap.obj `cygpath -w RTPSGap.c`
-
-rt_orte_ko-RTPSHeader.o: RTPSHeader.c
-@AMDEP_TRUE@   source='RTPSHeader.c' object='rt_orte_ko-RTPSHeader.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@   depfile='$(DEPDIR)/rt_orte_ko-RTPSHeader.Po' tmpdepfile='$(DEPDIR)/rt_orte_ko-RTPSHeader.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@   $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-       $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(rt_orte_ko_CFLAGS) $(CFLAGS) -c -o rt_orte_ko-RTPSHeader.o `test -f 'RTPSHeader.c' || echo '$(srcdir)/'`RTPSHeader.c
-
-rt_orte_ko-RTPSHeader.obj: RTPSHeader.c
-@AMDEP_TRUE@   source='RTPSHeader.c' object='rt_orte_ko-RTPSHeader.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@   depfile='$(DEPDIR)/rt_orte_ko-RTPSHeader.Po' tmpdepfile='$(DEPDIR)/rt_orte_ko-RTPSHeader.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@   $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-       $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(rt_orte_ko_CFLAGS) $(CFLAGS) -c -o rt_orte_ko-RTPSHeader.obj `cygpath -w RTPSHeader.c`
-
-rt_orte_ko-RTPSHeardBeat.o: RTPSHeardBeat.c
-@AMDEP_TRUE@   source='RTPSHeardBeat.c' object='rt_orte_ko-RTPSHeardBeat.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@   depfile='$(DEPDIR)/rt_orte_ko-RTPSHeardBeat.Po' tmpdepfile='$(DEPDIR)/rt_orte_ko-RTPSHeardBeat.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@   $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-       $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(rt_orte_ko_CFLAGS) $(CFLAGS) -c -o rt_orte_ko-RTPSHeardBeat.o `test -f 'RTPSHeardBeat.c' || echo '$(srcdir)/'`RTPSHeardBeat.c
-
-rt_orte_ko-RTPSHeardBeat.obj: RTPSHeardBeat.c
-@AMDEP_TRUE@   source='RTPSHeardBeat.c' object='rt_orte_ko-RTPSHeardBeat.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@   depfile='$(DEPDIR)/rt_orte_ko-RTPSHeardBeat.Po' tmpdepfile='$(DEPDIR)/rt_orte_ko-RTPSHeardBeat.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@   $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-       $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(rt_orte_ko_CFLAGS) $(CFLAGS) -c -o rt_orte_ko-RTPSHeardBeat.obj `cygpath -w RTPSHeardBeat.c`
-
-rt_orte_ko-RTPSInfoDST.o: RTPSInfoDST.c
-@AMDEP_TRUE@   source='RTPSInfoDST.c' object='rt_orte_ko-RTPSInfoDST.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@   depfile='$(DEPDIR)/rt_orte_ko-RTPSInfoDST.Po' tmpdepfile='$(DEPDIR)/rt_orte_ko-RTPSInfoDST.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@   $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-       $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(rt_orte_ko_CFLAGS) $(CFLAGS) -c -o rt_orte_ko-RTPSInfoDST.o `test -f 'RTPSInfoDST.c' || echo '$(srcdir)/'`RTPSInfoDST.c
-
-rt_orte_ko-RTPSInfoDST.obj: RTPSInfoDST.c
-@AMDEP_TRUE@   source='RTPSInfoDST.c' object='rt_orte_ko-RTPSInfoDST.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@   depfile='$(DEPDIR)/rt_orte_ko-RTPSInfoDST.Po' tmpdepfile='$(DEPDIR)/rt_orte_ko-RTPSInfoDST.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@   $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-       $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(rt_orte_ko_CFLAGS) $(CFLAGS) -c -o rt_orte_ko-RTPSInfoDST.obj `cygpath -w RTPSInfoDST.c`
-
-rt_orte_ko-RTPSInfoREPLY.o: RTPSInfoREPLY.c
-@AMDEP_TRUE@   source='RTPSInfoREPLY.c' object='rt_orte_ko-RTPSInfoREPLY.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@   depfile='$(DEPDIR)/rt_orte_ko-RTPSInfoREPLY.Po' tmpdepfile='$(DEPDIR)/rt_orte_ko-RTPSInfoREPLY.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@   $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-       $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(rt_orte_ko_CFLAGS) $(CFLAGS) -c -o rt_orte_ko-RTPSInfoREPLY.o `test -f 'RTPSInfoREPLY.c' || echo '$(srcdir)/'`RTPSInfoREPLY.c
-
-rt_orte_ko-RTPSInfoREPLY.obj: RTPSInfoREPLY.c
-@AMDEP_TRUE@   source='RTPSInfoREPLY.c' object='rt_orte_ko-RTPSInfoREPLY.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@   depfile='$(DEPDIR)/rt_orte_ko-RTPSInfoREPLY.Po' tmpdepfile='$(DEPDIR)/rt_orte_ko-RTPSInfoREPLY.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@   $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-       $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(rt_orte_ko_CFLAGS) $(CFLAGS) -c -o rt_orte_ko-RTPSInfoREPLY.obj `cygpath -w RTPSInfoREPLY.c`
-
-rt_orte_ko-RTPSInfoSRC.o: RTPSInfoSRC.c
-@AMDEP_TRUE@   source='RTPSInfoSRC.c' object='rt_orte_ko-RTPSInfoSRC.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@   depfile='$(DEPDIR)/rt_orte_ko-RTPSInfoSRC.Po' tmpdepfile='$(DEPDIR)/rt_orte_ko-RTPSInfoSRC.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@   $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-       $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(rt_orte_ko_CFLAGS) $(CFLAGS) -c -o rt_orte_ko-RTPSInfoSRC.o `test -f 'RTPSInfoSRC.c' || echo '$(srcdir)/'`RTPSInfoSRC.c
-
-rt_orte_ko-RTPSInfoSRC.obj: RTPSInfoSRC.c
-@AMDEP_TRUE@   source='RTPSInfoSRC.c' object='rt_orte_ko-RTPSInfoSRC.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@   depfile='$(DEPDIR)/rt_orte_ko-RTPSInfoSRC.Po' tmpdepfile='$(DEPDIR)/rt_orte_ko-RTPSInfoSRC.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@   $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-       $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(rt_orte_ko_CFLAGS) $(CFLAGS) -c -o rt_orte_ko-RTPSInfoSRC.obj `cygpath -w RTPSInfoSRC.c`
-
-rt_orte_ko-RTPSInfoTS.o: RTPSInfoTS.c
-@AMDEP_TRUE@   source='RTPSInfoTS.c' object='rt_orte_ko-RTPSInfoTS.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@   depfile='$(DEPDIR)/rt_orte_ko-RTPSInfoTS.Po' tmpdepfile='$(DEPDIR)/rt_orte_ko-RTPSInfoTS.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@   $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-       $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(rt_orte_ko_CFLAGS) $(CFLAGS) -c -o rt_orte_ko-RTPSInfoTS.o `test -f 'RTPSInfoTS.c' || echo '$(srcdir)/'`RTPSInfoTS.c
-
-rt_orte_ko-RTPSInfoTS.obj: RTPSInfoTS.c
-@AMDEP_TRUE@   source='RTPSInfoTS.c' object='rt_orte_ko-RTPSInfoTS.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@   depfile='$(DEPDIR)/rt_orte_ko-RTPSInfoTS.Po' tmpdepfile='$(DEPDIR)/rt_orte_ko-RTPSInfoTS.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@   $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-       $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(rt_orte_ko_CFLAGS) $(CFLAGS) -c -o rt_orte_ko-RTPSInfoTS.obj `cygpath -w RTPSInfoTS.c`
-
-rt_orte_ko-RTPSPad.o: RTPSPad.c
-@AMDEP_TRUE@   source='RTPSPad.c' object='rt_orte_ko-RTPSPad.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@   depfile='$(DEPDIR)/rt_orte_ko-RTPSPad.Po' tmpdepfile='$(DEPDIR)/rt_orte_ko-RTPSPad.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@   $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-       $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(rt_orte_ko_CFLAGS) $(CFLAGS) -c -o rt_orte_ko-RTPSPad.o `test -f 'RTPSPad.c' || echo '$(srcdir)/'`RTPSPad.c
-
-rt_orte_ko-RTPSPad.obj: RTPSPad.c
-@AMDEP_TRUE@   source='RTPSPad.c' object='rt_orte_ko-RTPSPad.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@   depfile='$(DEPDIR)/rt_orte_ko-RTPSPad.Po' tmpdepfile='$(DEPDIR)/rt_orte_ko-RTPSPad.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@   $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-       $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(rt_orte_ko_CFLAGS) $(CFLAGS) -c -o rt_orte_ko-RTPSPad.obj `cygpath -w RTPSPad.c`
-
-rt_orte_ko-RTPSUtils.o: RTPSUtils.c
-@AMDEP_TRUE@   source='RTPSUtils.c' object='rt_orte_ko-RTPSUtils.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@   depfile='$(DEPDIR)/rt_orte_ko-RTPSUtils.Po' tmpdepfile='$(DEPDIR)/rt_orte_ko-RTPSUtils.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@   $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-       $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(rt_orte_ko_CFLAGS) $(CFLAGS) -c -o rt_orte_ko-RTPSUtils.o `test -f 'RTPSUtils.c' || echo '$(srcdir)/'`RTPSUtils.c
-
-rt_orte_ko-RTPSUtils.obj: RTPSUtils.c
-@AMDEP_TRUE@   source='RTPSUtils.c' object='rt_orte_ko-RTPSUtils.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@   depfile='$(DEPDIR)/rt_orte_ko-RTPSUtils.Po' tmpdepfile='$(DEPDIR)/rt_orte_ko-RTPSUtils.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@   $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-       $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(rt_orte_ko_CFLAGS) $(CFLAGS) -c -o rt_orte_ko-RTPSUtils.obj `cygpath -w RTPSUtils.c`
-
-rt_orte_ko-RTPSVar.o: RTPSVar.c
-@AMDEP_TRUE@   source='RTPSVar.c' object='rt_orte_ko-RTPSVar.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@   depfile='$(DEPDIR)/rt_orte_ko-RTPSVar.Po' tmpdepfile='$(DEPDIR)/rt_orte_ko-RTPSVar.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@   $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-       $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(rt_orte_ko_CFLAGS) $(CFLAGS) -c -o rt_orte_ko-RTPSVar.o `test -f 'RTPSVar.c' || echo '$(srcdir)/'`RTPSVar.c
-
-rt_orte_ko-RTPSVar.obj: RTPSVar.c
-@AMDEP_TRUE@   source='RTPSVar.c' object='rt_orte_ko-RTPSVar.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@   depfile='$(DEPDIR)/rt_orte_ko-RTPSVar.Po' tmpdepfile='$(DEPDIR)/rt_orte_ko-RTPSVar.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@   $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-       $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(rt_orte_ko_CFLAGS) $(CFLAGS) -c -o rt_orte_ko-RTPSVar.obj `cygpath -w RTPSVar.c`
-
-rt_orte_ko-RTPSIssue.o: RTPSIssue.c
-@AMDEP_TRUE@   source='RTPSIssue.c' object='rt_orte_ko-RTPSIssue.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@   depfile='$(DEPDIR)/rt_orte_ko-RTPSIssue.Po' tmpdepfile='$(DEPDIR)/rt_orte_ko-RTPSIssue.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@   $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-       $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(rt_orte_ko_CFLAGS) $(CFLAGS) -c -o rt_orte_ko-RTPSIssue.o `test -f 'RTPSIssue.c' || echo '$(srcdir)/'`RTPSIssue.c
-
-rt_orte_ko-RTPSIssue.obj: RTPSIssue.c
-@AMDEP_TRUE@   source='RTPSIssue.c' object='rt_orte_ko-RTPSIssue.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@   depfile='$(DEPDIR)/rt_orte_ko-RTPSIssue.Po' tmpdepfile='$(DEPDIR)/rt_orte_ko-RTPSIssue.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@   $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-       $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(rt_orte_ko_CFLAGS) $(CFLAGS) -c -o rt_orte_ko-RTPSIssue.obj `cygpath -w RTPSIssue.c`
-
-rt_orte_ko-sock.o: sock.c
-@AMDEP_TRUE@   source='sock.c' object='rt_orte_ko-sock.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@   depfile='$(DEPDIR)/rt_orte_ko-sock.Po' tmpdepfile='$(DEPDIR)/rt_orte_ko-sock.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@   $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-       $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(rt_orte_ko_CFLAGS) $(CFLAGS) -c -o rt_orte_ko-sock.o `test -f 'sock.c' || echo '$(srcdir)/'`sock.c
-
-rt_orte_ko-sock.obj: sock.c
-@AMDEP_TRUE@   source='sock.c' object='rt_orte_ko-sock.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@   depfile='$(DEPDIR)/rt_orte_ko-sock.Po' tmpdepfile='$(DEPDIR)/rt_orte_ko-sock.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@   $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-       $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(rt_orte_ko_CFLAGS) $(CFLAGS) -c -o rt_orte_ko-sock.obj `cygpath -w sock.c`
-
-rt_orte_ko-ul_gavl.o: ul_gavl.c
-@AMDEP_TRUE@   source='ul_gavl.c' object='rt_orte_ko-ul_gavl.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@   depfile='$(DEPDIR)/rt_orte_ko-ul_gavl.Po' tmpdepfile='$(DEPDIR)/rt_orte_ko-ul_gavl.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@   $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-       $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(rt_orte_ko_CFLAGS) $(CFLAGS) -c -o rt_orte_ko-ul_gavl.o `test -f 'ul_gavl.c' || echo '$(srcdir)/'`ul_gavl.c
-
-rt_orte_ko-ul_gavl.obj: ul_gavl.c
-@AMDEP_TRUE@   source='ul_gavl.c' object='rt_orte_ko-ul_gavl.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@   depfile='$(DEPDIR)/rt_orte_ko-ul_gavl.Po' tmpdepfile='$(DEPDIR)/rt_orte_ko-ul_gavl.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@   $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-       $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(rt_orte_ko_CFLAGS) $(CFLAGS) -c -o rt_orte_ko-ul_gavl.obj `cygpath -w ul_gavl.c`
-
-rt_orte_ko-ul_gavlprim.o: ul_gavlprim.c
-@AMDEP_TRUE@   source='ul_gavlprim.c' object='rt_orte_ko-ul_gavlprim.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@   depfile='$(DEPDIR)/rt_orte_ko-ul_gavlprim.Po' tmpdepfile='$(DEPDIR)/rt_orte_ko-ul_gavlprim.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@   $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-       $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(rt_orte_ko_CFLAGS) $(CFLAGS) -c -o rt_orte_ko-ul_gavlprim.o `test -f 'ul_gavlprim.c' || echo '$(srcdir)/'`ul_gavlprim.c
-
-rt_orte_ko-ul_gavlprim.obj: ul_gavlprim.c
-@AMDEP_TRUE@   source='ul_gavlprim.c' object='rt_orte_ko-ul_gavlprim.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@   depfile='$(DEPDIR)/rt_orte_ko-ul_gavlprim.Po' tmpdepfile='$(DEPDIR)/rt_orte_ko-ul_gavlprim.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@   $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-       $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(rt_orte_ko_CFLAGS) $(CFLAGS) -c -o rt_orte_ko-ul_gavlprim.obj `cygpath -w ul_gavlprim.c`
 CCDEPMODE = @CCDEPMODE@
 uninstall-info-am:
 
index 53ed8a207c72ea1a5dd7e5604577be1015a5b606..c7c09b6fd2b606b8e3ca1ff7db5160dbf2627a62 100644 (file)
@@ -1,6 +1,6 @@
 lib_LIBRARIES = orte
 
-INCLUDES = -I $(srcdir)/../include -D_OMK_UNIX
+INCLUDES = -I $(srcdir)/../include -DORTE_OMK_UNIX
 
 include_HEADERS = \
 ../include/orte_api.h \
@@ -32,6 +32,7 @@ ORTEThreadUtils.c \
 ORTETypeRegister.c \
 ORTEVerbosity.c \
 ORTEPattern.c \
+ORTEMisc.c \
 parameter.c \
 RTPSAck.c \
 RTPSCSTReader.c \
@@ -59,7 +60,7 @@ ul_gavlprim.c
 
 rtlinux_LIBRARIES = orte_rt
 
-rtlinux_INCLUDES = -I $(srcdir)/../include 
+rtlinux_INCLUDES = -I $(srcdir)/../include -DORTE_OMK_RTL
 
 rtlinux_HEADERS = \
 ../include/orte_api.h \
@@ -91,6 +92,7 @@ ORTEThreadUtils.c \
 ORTETypeRegister.c \
 ORTEVerbosity.c \
 ORTEPattern.c \
+ORTEMisc.c \
 parameter.c \
 RTPSAck.c \
 RTPSCSTReader.c \
index 831abd7c2822dcf8a256debe94d86962f0caa10e..7e4b4a5f38f7b59a1af4d214c9cc0638819d00ce 100644 (file)
@@ -51,7 +51,7 @@ void ORTEAppRecvUserdataThread(ORTEDomain *d) {
         // check if length of submessage header is OK 
         if ((d->mbRecvUserdata.cdrStream.bufferPtr-
              d->mbRecvUserdata.cdrStream.buffer+3)<=d->mbRecvUserdata.cdrStream.length) {
-          int8_t e_bit=d->mbRecvUserdata.cdrStream.bufferPtr[1] & 1;
+          char e_bit=d->mbRecvUserdata.cdrStream.bufferPtr[1] & 1;
           submsg_len=(u_int16_t)d->mbRecvUserdata.cdrStream.bufferPtr[2];
           conv_u16(&submsg_len,e_bit);
           // check if length of submessage OK 
@@ -61,16 +61,16 @@ void ORTEAppRecvUserdataThread(ORTEDomain *d) {
             pthread_rwlock_wrlock(&d->objectEntry.htimRootLock);
             switch ((SubmessageId)d->mbRecvUserdata.cdrStream.bufferPtr[0]) {
               case VAR:
-//                RTPSVar(d,d->taskRecvUserdata.bufferStart+msg_ptr,&mi,ntohl(des.sin_addr.s_addr));
+                //can't be
               break;
               case ACK:
-//                RTPSAck(d,d->taskRecvUserdata.bufferStart+msg_ptr,&mi,ntohl(des.sin_addr.s_addr));
+                RTPSAck(d,d->mbRecvUserdata.cdrStream.bufferPtr,&mi,ntohl(des.sin_addr.s_addr));
               break;
               case HEARTBEAT:
-//                RTPSHeardBeat(d,d->taskRecvUserdata.bufferStart+msg_ptr,&mi);
+                RTPSHeardBeat(d,d->mbRecvUserdata.cdrStream.bufferPtr,&mi);
               break;
               case GAP:
-//                RTPSGap(d,d->taskRecvUserdata.bufferStart+msg_ptr,&mi,ntohl(des.sin_addr.s_addr));
+                //can't be
               break;
               case INFO_TS:
                 RTPSInfoTS(d->mbRecvUserdata.cdrStream.bufferPtr,&mi);
index dddc446f037d7ac15b4237a612b1d7163eb331a3..8f5ae1a9ecc0056e5afd9d048c6cbfcce387ed23 100644 (file)
@@ -45,12 +45,20 @@ void ORTESendData(ORTEDomain *d,ObjectEntryAID *objectEntryAID,Boolean meta) {
             sizeof(des)); 
       } else {
         des.sin_port = htons((u_int16_t)appParams->userdataUnicastPort); 
-        sock_sendto (
-            &d->taskSend.sock,
-            d->mbSend.cdrStreamDirect->buffer,
-            d->mbSend.cdrStreamDirect->length,
-            &des,
-            sizeof(des)); 
+        if (d->mbSend.cdrStreamDirect)
+          sock_sendto (
+              &d->taskSend.sock,
+              d->mbSend.cdrStreamDirect->buffer,
+              d->mbSend.cdrStreamDirect->length,
+              &des,
+              sizeof(des)); 
+        else
+          sock_sendto (
+              &d->taskSend.sock,
+              d->mbSend.cdrStream.buffer,
+              d->mbSend.cdrStream.length,
+              &des,
+              sizeof(des)); 
       }
     }
   }
@@ -85,9 +93,9 @@ void ORTEAppSendThread(ORTEDomain *d) {
     if (s<0) s=ms=0;
     debug(24,4) ("ORTEAppSendThread: sleeping for %lis %lims\n",s,ms);
     if (!((wtime.tv_sec==0) && (wtime.tv_nsec==0))) {
-      pthread_mutex_timedlock(
-          &d->objectEntry.htimSendMutex,
-          &wtime);
+      sem_timedwait(
+          &d->objectEntry.htimSendSem,
+         &wtime);
     }
     debug(24,7) ("ORTEAppSendThread: fired\n");
     actTime=getActualNtpTime();
index 71de5bf05905517f900fa8f3364f46d5e00036ad..23ee5fc38ded9ef5921a8c6a696ec630cdf98565 100644 (file)
@@ -60,9 +60,9 @@ ORTEDomainPropDefaultGet(ORTEDomainProp *prop) {
   sock_get_local_interfaces(&sock,prop->IFProp,&prop->IFCount);
   sock_cleanup(&sock); 
 
-  prop->mgrs=NULL;
+  prop->mgrs=NULL; //only from localhost
   prop->appLocalManager=StringToIPAddress("127.0.0.1");
-  prop->mgrAddKey=0;
+  prop->keys=NULL; //are assign be orte
   sprintf(prop->version,ORTE_PACKAGE_STRING\
                         ", compiled: "\
                         __DATE__\
@@ -71,8 +71,8 @@ ORTEDomainPropDefaultGet(ORTEDomainProp *prop) {
                         
   prop->recvBuffSize=0x4000;
   prop->sendBuffSize=0x4000; 
-  prop->wireProp.metaBytesPerPacket=0x2000;
-  prop->wireProp.metaBytesPerFastPacket=0x1000;
+  prop->wireProp.metaBytesPerPacket=1500;
+  prop->wireProp.metaBytesPerFastPacket=1000;
   prop->wireProp.metabitsPerACKBitmap=32;
   prop->wireProp.userMaxSerDeserSize=0x4000;
   
@@ -88,6 +88,9 @@ ORTEDomainPropDefaultGet(ORTEDomainProp *prop) {
   prop->baseProp.ACKMaxRetries=10;
   prop->baseProp.HBMaxRetries=10;
   
+  PublParamsInit(&prop->publPropDefault);
+  SubsParamsInit(&prop->subsPropDefault);
+  
   return ORTE_TRUE;
 }
 
@@ -97,27 +100,3 @@ ORTEDomainInitEvents(ORTEDomainAppEvents *events) {
   memset(events,0,sizeof(ORTEDomainAppEvents));
   return ORTE_TRUE;
 }
-
-/*****************************************************************************/
-Boolean
-ORTEPublPropDefaultGet(ORTEDomain *d,ORTEPublProp *pp) {
-  return ORTE_TRUE;
-}
-
-/*****************************************************************************/
-Boolean
-ORTEPublPropDefaultSet(ORTEDomain *d,ORTEPublProp *pp) {
-  return ORTE_TRUE;
-}
-
-/*****************************************************************************/
-Boolean
-ORTESubsPropDefaultGet(ORTEDomain *d,ORTESubsProp *sp) {
-  return ORTE_TRUE;
-}
-
-/*****************************************************************************/
-Boolean
-ORTESubsPropDefaultSet(ORTEDomain *d,ORTESubsProp *sp) {
-  return ORTE_TRUE;
-}
index 6498699beac63e2e1e56736f19d844f065cf5307..33c1040d09df7d7a2558f01f7938952e1de8ab14 100644 (file)
@@ -33,6 +33,7 @@ ORTEDomainAppCreate(int domain, ORTEDomainProp *prop,
   CSTReaderParams   cstReaderParams;
   char              iflocal[MAX_INTERFACES*MAX_STRING_IPADDRESS_LENGTH];
   char              sIPAddress[MAX_STRING_IPADDRESS_LENGTH];
+  char              sbuff[128];
   int               i;
   u_int16_t         port=0;
 
@@ -48,14 +49,12 @@ ORTEDomainAppCreate(int domain, ORTEDomainProp *prop,
   d->taskRecvMetatraffic.sock.port=0;
   d->taskRecvUserdata.sock.port=0;
   d->taskSend.sock.port=0;
-  PublParamsInit(&d->publPropDefault);
-  SubsParamsInit(&d->subsPropDefault);
   //init structure objectEntry
   ObjectEntryHID_init_root_field(&d->objectEntry);
   pthread_rwlock_init(&d->objectEntry.objRootLock,NULL);
   htimerRoot_init_queue(&d->objectEntry);
   pthread_rwlock_init(&d->objectEntry.htimRootLock,NULL);
-  pthread_mutex_init(&d->objectEntry.htimSendMutex, NULL);
+  sem_init(&d->objectEntry.htimSendSem, 0, 0);
   //publication,subscriptions
   d->publications.counter=d->subscriptions.counter=0;
   CSTWriter_init_root_field(&d->publications);
@@ -217,10 +216,18 @@ ORTEDomainAppCreate(int domain, ORTEDomainProp *prop,
     }
   }
   //ApplicatonKeyList
-  appParams->managerKeyList[0]=StringToIPAddress("127.0.0.1");
-  for(i=0;i<d->domainProp.IFCount;i++)
-    appParams->managerKeyList[i+1]=d->domainProp.IFProp[i].ipAddress;
-  appParams->managerKeyCount=d->domainProp.IFCount+1;
+  if (!d->domainProp.keys) {
+    appParams->managerKeyList[0]=StringToIPAddress("127.0.0.1");
+    for(i=0;i<d->domainProp.IFCount;i++)
+      appParams->managerKeyList[i+1]=d->domainProp.IFProp[i].ipAddress;
+    appParams->managerKeyCount=d->domainProp.IFCount+1;
+  } else {
+    appParams->managerKeyCount=i=0;
+    while (getStringPart(d->domainProp.keys,':',i,sbuff)) {
+      appParams->managerKeyList[appParams->managerKeyCount++]=
+          StringToIPAddress(sbuff);
+    }
+  }
   d->appParams=appParams;
   //insert object, doesn't need to be locked
   d->objectEntryOID=objectEntryAdd(d,&d->guid,(void*)appParams);
@@ -310,7 +317,7 @@ ORTEDomainAppCreate(int domain, ORTEDomainProp *prop,
       OID_READ_SUBS,&cstReaderParams,NULL);
   
   //add csChange for WAS
-  appSelfParamChanged(d,ORTE_FALSE,ORTE_FALSE,ORTE_FALSE);
+  appSelfParamChanged(d,ORTE_FALSE,ORTE_FALSE,ORTE_FALSE,ORTE_TRUE);
   
   //Start threads
   if (!suspended) {
@@ -328,6 +335,11 @@ ORTEDomainAppDestroy(ORTEDomain *d) {
 
   debug(21,10) ("ORTEDomainAppDestroy: start\n");
   if (!d) return ORTE_FALSE;
+  pthread_rwlock_wrlock(&d->objectEntry.objRootLock);
+  pthread_rwlock_wrlock(&d->objectEntry.htimRootLock);
+  appSelfParamChanged(d,ORTE_TRUE,ORTE_TRUE,ORTE_FALSE,ORTE_FALSE);    
+  pthread_rwlock_unlock(&d->objectEntry.htimRootLock);
+  pthread_rwlock_unlock(&d->objectEntry.objRootLock);
   //Stoping threads
   if (!d->taskRecvMetatraffic.terminate) {
     d->taskRecvMetatraffic.terminate=ORTE_TRUE;
@@ -353,8 +365,8 @@ ORTEDomainAppDestroy(ORTEDomain *d) {
   sock_cleanup(&d->taskRecvUserdata.sock);
   sock_cleanup(&d->taskSend.sock);
 
-  //Mutex(es)
-  pthread_mutex_destroy(&d->objectEntry.htimSendMutex); 
+  //Semas
+  sem_destroy(&d->objectEntry.htimSendSem);
 
   //rwLocks
   pthread_rwlock_destroy(&d->objectEntry.objRootLock);
index e9c04135d674936466319d7c1ef977dfe65d3b88..ab876423b5de3a14ef12f82523f3d08860739008 100644 (file)
@@ -32,6 +32,7 @@ ORTEDomainMgrCreate(int domain, ORTEDomainProp *prop,
   CSTReaderParams   cstReaderParams;
   char              iflocal[MAX_INTERFACES*MAX_STRING_IPADDRESS_LENGTH];
   char              sIPAddress[MAX_STRING_IPADDRESS_LENGTH];
+  char              sbuff[128];
   int               i;
   u_int16_t         port=0;
 
@@ -50,7 +51,7 @@ ORTEDomainMgrCreate(int domain, ORTEDomainProp *prop,
   pthread_rwlock_init(&d->objectEntry.objRootLock,NULL);
   htimerRoot_init_queue(&d->objectEntry);
   pthread_rwlock_init(&d->objectEntry.htimRootLock,NULL);
-  pthread_mutex_init(&d->objectEntry.htimSendMutex, NULL);
+  sem_init(&d->objectEntry.htimSendSem, 0, 0);
   
   //create domainProp 
   if (prop!=NULL) {
@@ -182,16 +183,17 @@ ORTEDomainMgrCreate(int domain, ORTEDomainProp *prop,
     }
   }
   //managerKeyList
-  appParams->managerKeyList[0]=StringToIPAddress("127.0.0.1");
-  for(i=0;i<d->domainProp.IFCount;i++)
-    appParams->managerKeyList[i+1]=d->domainProp.IFProp[i].ipAddress;
-  appParams->managerKeyCount=d->domainProp.IFCount+1;
-  if (d->domainProp.mgrAddKey!=0) {
-    appParams->managerKeyList[appParams->managerKeyCount]=d->domainProp.mgrAddKey;
-    appParams->managerKeyCount++;
-    debug(29,4) ("ORTEDomainMgrCreate: additional manager key accepted (%s)\n",
-                  IPAddressToString(d->domainProp.mgrAddKey,sIPAddress));
-
+  if (!d->domainProp.keys) {
+    appParams->managerKeyList[0]=StringToIPAddress("127.0.0.1");
+    for(i=0;i<d->domainProp.IFCount;i++)
+      appParams->managerKeyList[i+1]=d->domainProp.IFProp[i].ipAddress;
+    appParams->managerKeyCount=d->domainProp.IFCount+1;
+  } else {
+    appParams->managerKeyCount=i=0;
+    while (getStringPart(d->domainProp.keys,':',i,sbuff)) {
+      appParams->managerKeyList[appParams->managerKeyCount++]=
+          StringToIPAddress(sbuff);
+    }
   }
   d->appParams=appParams;
   //insert object, doesn't need to be locked
@@ -209,48 +211,27 @@ ORTEDomainMgrCreate(int domain, ORTEDomainProp *prop,
   CSTWriterInit(d,&d->writerApplicationSelf,d->objectEntryOID,
       OID_WRITE_APPSELF,&cstWriterParams,NULL);
   //  add to WAS remote writer(s)
-  if (d->domainProp.mgrs) {
-    int8_t *cp=d->domainProp.mgrs;
-    while (cp[0]!=0) {  //till is length>0
-#ifndef CONFIG_ORTE_RT
-      struct hostent *hostname; 
-#endif
-      int8_t         *dcp,tcp; 
-      dcp=strchr(cp,':');
-      if (!dcp) dcp=cp+strlen(cp);
-      tcp=*dcp;  //save ending value
-      *dcp=0;    //temporary end of string
-#ifdef CONFIG_ORTE_RT
-      if (1) {
-        GUID_RTPS guid;
-        IPAddress ipAddress=StringToIPAddress(cp);
-#else
-      if ((hostname=gethostbyname(cp))) {
-        GUID_RTPS guid;
-        IPAddress ipAddress=ntohl(*((long*)(hostname->h_addr_list[0])));
-#endif
-        guid.hid=ipAddress;
-        guid.aid=AID_UNKNOWN;
-        guid.oid=OID_APP;
-        if (!objectEntryFind(d,&guid)) {
-          appParams=(AppParams*)MALLOC(sizeof(AppParams));
-          AppParamsInit(appParams);
-          appParams->hostId=guid.hid;
-          appParams->appId=guid.aid;
-          appParams->metatrafficUnicastPort=d->appParams->metatrafficUnicastPort;
-          appParams->userdataUnicastPort=0;  //Manager support only metatraffic
-          appParams->unicastIPAddressList[0]=ipAddress;
-          appParams->unicastIPAddressCount=1;
-          objectEntryOID=objectEntryAdd(d,&guid,(void*)appParams);
-          CSTWriterAddRemoteReader(d,&d->writerApplicationSelf,objectEntryOID,
-              OID_READ_MGR);
-          debug(29,2) ("ORTEDomainAppCreate: add fellow manager (%s)\n",
-                      IPAddressToString(ipAddress,sIPAddress));
-        }
-      }
-      *dcp=tcp;                   //restore value
-      if (dcp[0]!=0) cp=dcp+1;    //next value
-      else cp=dcp;
+  i=0;
+  while (getStringPart(d->domainProp.mgrs,':',i,sbuff)>0) {
+    GUID_RTPS guid;
+    IPAddress ipAddress=StringToIPAddress(sbuff);
+    guid.hid=ipAddress;
+    guid.aid=AID_UNKNOWN;
+    guid.oid=OID_APP;
+    if (!objectEntryFind(d,&guid)) {
+      appParams=(AppParams*)MALLOC(sizeof(AppParams));
+      AppParamsInit(appParams);
+      appParams->hostId=guid.hid;
+      appParams->appId=guid.aid;
+      appParams->metatrafficUnicastPort=d->appParams->metatrafficUnicastPort;
+      appParams->userdataUnicastPort=0;  //Manager support only metatraffic
+      appParams->unicastIPAddressList[0]=ipAddress;
+      appParams->unicastIPAddressCount=1;
+      objectEntryOID=objectEntryAdd(d,&guid,(void*)appParams);
+      CSTWriterAddRemoteReader(d,&d->writerApplicationSelf,objectEntryOID,
+          OID_READ_MGR);
+      debug(29,2) ("ORTEDomainAppCreate: add fellow manager (%s)\n",
+                  IPAddressToString(ipAddress,sIPAddress));
     }
   }
   //  readerManagers
@@ -289,7 +270,7 @@ ORTEDomainMgrCreate(int domain, ORTEDomainProp *prop,
       OID_WRITE_MGR,&cstWriterParams,NULL);
   
   //add csChange for WAS
-  appSelfParamChanged(d,ORTE_FALSE,ORTE_FALSE,ORTE_FALSE);
+  appSelfParamChanged(d,ORTE_FALSE,ORTE_FALSE,ORTE_FALSE,ORTE_TRUE);
   
   //Start threads
   if (!suspended) {
@@ -305,6 +286,11 @@ Boolean
 ORTEDomainMgrDestroy(ORTEDomain *d) {
 
   debug(29,10) ("ORTEDomainMgrDestroy: start\n");
+  pthread_rwlock_wrlock(&d->objectEntry.objRootLock);
+  pthread_rwlock_wrlock(&d->objectEntry.htimRootLock);
+  appSelfParamChanged(d,ORTE_TRUE,ORTE_TRUE,ORTE_FALSE,ORTE_FALSE);    
+  pthread_rwlock_unlock(&d->objectEntry.htimRootLock);
+  pthread_rwlock_unlock(&d->objectEntry.objRootLock);
   //Stoping threads
   if(!d->taskRecvMetatraffic.terminate) {
     d->taskRecvMetatraffic.terminate=ORTE_TRUE;
@@ -325,8 +311,8 @@ ORTEDomainMgrDestroy(ORTEDomain *d) {
   sock_cleanup(&d->taskRecvMetatraffic.sock);
   sock_cleanup(&d->taskSend.sock);
 
-  //Mutex(es)
-  pthread_mutex_destroy(&d->objectEntry.htimSendMutex); 
+  //Semas
+  sem_destroy(&d->objectEntry.htimSendSem);
   
   //rwLocks
   pthread_rwlock_destroy(&d->objectEntry.objRootLock);
index e7cb1d11ad5a3ac5d31db5c687f1af0b0c1f1bcc..8fa4607c9bebe989b3c94678b2259c780ca49980 100644 (file)
@@ -20,7 +20,9 @@
  */ 
 
 #include "orte.h"
-
+#ifdef __RTL__
+#include <rtl.h>
+#endif
 #ifdef CONFIG_ORTE_RT
 MODULE_LICENSE("GPL");
 #endif
similarity index 62%
rename from orte/include/config.h.undef
rename to orte/liborte/ORTEMisc.c
index 73d6cd3d08ee811a8cb9b9c626f9742de5c2bea5..2dd889dafc70f2b4778d2e24eca7692949ac2d91 100644 (file)
@@ -1,6 +1,7 @@
 /*
- *  $Id: config.h,v 0.0.0.1             2003/08/21 
+ *  $Id: ORTEMisc.c,v 0.0.0.1           2004/01/27 
  *
+ *  DEBUG:  section 34                  miscellaneous functions
  *  AUTHOR: Petr Smolik                 petr.smolik@wo.cz
  *
  *  ORTE - OCERA Real-Time Ethernet     http://www.ocera.org/
  *  GNU General Public License for more details.
  *  
  */ 
+#include "orte.h"
 
-#ifndef _ORTE_CONFIG_H
-#define _ORTE_CONFIG_H
-
-/* Define to the full name and version of this package. */
-#define ORTE_PACKAGE_STRING "ORTE 0.2.0" 
-
-#endif /* _ORTE_CONFIG_H */
+void 
+ORTESleepMs(unsigned int ms) {
+  #if defined(CONFIG_ORTE_UNIX) && defined (HAVE_UNISTD_H)
+    usleep(ms*1000);
+  #endif
+  #ifdef CONFIG_ORTE_RTL
+    usleep(ms*1000);
+  #endif
+  #ifdef CONFIG_ORTE_WIN
+    Sleep(ms);
+  #endif
+  #ifdef CONFIG_ORTE_RTAI
+    rt_sleep(nano2count(ms*1000000));
+  #endif
+}
index 577b48c1cfa62a1602d53ca4c57f4cae5e284177..ee27746e4fbb299c38e90def432460eb655c2811 100644 (file)
@@ -58,7 +58,7 @@ ORTEPublicationCreate(ORTEDomain *d,const char *topic,const char *typeName,
   guid.hid=d->guid.hid;guid.aid=d->guid.aid;
   guid.oid=(d->publications.counter<<8)|OID_PUBLICATION;
   pp=(ORTEPublProp*)MALLOC(sizeof(ORTEPublProp));
-  memcpy(pp,&d->publPropDefault,sizeof(ORTEPublProp));
+  memcpy(pp,&d->domainProp.publPropDefault,sizeof(ORTEPublProp));
   strcpy(pp->topic,topic);
   strcpy(pp->typeName,typeName);
   pp->persistence=*persistence;
@@ -117,7 +117,7 @@ int
 ORTEPublicationDestroy(ORTEPublication *cstWriter) {
   CSChange              *csChange;
 
-  if (!cstWriter) return -1;
+  if (!cstWriter) return ORTE_BAD_HANDLE;
   //generate csChange for writerPublisher
   pthread_rwlock_wrlock(&cstWriter->domain->objectEntry.objRootLock);
   pthread_rwlock_wrlock(&cstWriter->domain->objectEntry.htimRootLock);
@@ -139,19 +139,20 @@ ORTEPublicationDestroy(ORTEPublication *cstWriter) {
   pthread_rwlock_unlock(&cstWriter->domain->writerPublications.lock);
   pthread_rwlock_unlock(&cstWriter->domain->objectEntry.htimRootLock);
   pthread_rwlock_unlock(&cstWriter->domain->objectEntry.objRootLock);
-  return 0;
+  return ORTE_OK;
 }
 
 
 /*****************************************************************************/
 int
 ORTEPublicationPropertiesGet(ORTEPublication *cstWriter,ORTEPublProp *pp) {
+  if (!cstWriter) return ORTE_BAD_HANDLE;
   pthread_rwlock_rdlock(&cstWriter->domain->objectEntry.objRootLock);
   pthread_rwlock_rdlock(&cstWriter->lock);
   *pp=*(ORTEPublProp*)cstWriter->objectEntryOID->attributes;
   pthread_rwlock_unlock(&cstWriter->lock);
   pthread_rwlock_unlock(&cstWriter->domain->objectEntry.objRootLock);
-  return 0;
+  return ORTE_OK;
 }
 
 /*****************************************************************************/
@@ -159,6 +160,7 @@ int
 ORTEPublicationPropertiesSet(ORTEPublication *cstWriter,ORTEPublProp *pp) {
   CSChange              *csChange;
 
+  if (!cstWriter) return ORTE_BAD_HANDLE;
   pthread_rwlock_wrlock(&cstWriter->domain->objectEntry.objRootLock);
   pthread_rwlock_wrlock(&cstWriter->domain->objectEntry.htimRootLock);
   pthread_rwlock_wrlock(&cstWriter->domain->writerPublications.lock);
@@ -171,23 +173,50 @@ ORTEPublicationPropertiesSet(ORTEPublication *cstWriter,ORTEPublProp *pp) {
   CSTWriterAddCSChange(cstWriter->domain,
       &cstWriter->domain->writerPublications,csChange);
   pthread_rwlock_unlock(&cstWriter->lock);
-  pthread_rwlock_unlock(&cstWriter->domain->publications.lock);
+  pthread_rwlock_unlock(&cstWriter->domain->writerPublications.lock);
   pthread_rwlock_unlock(&cstWriter->domain->objectEntry.htimRootLock);
   pthread_rwlock_unlock(&cstWriter->domain->objectEntry.objRootLock);
-  return 0;
+  return ORTE_OK;
 }
 
 /*****************************************************************************/
 int
 ORTEPublicationWaitForSubscriptions(ORTEPublication *cstWriter,NtpTime wait,
     unsigned int retries,unsigned int noSubscriptions) {
-  return 0;
+  int rSubscriptions;
+  u_int32_t sec,ms;
+
+  if (!cstWriter) return ORTE_BAD_HANDLE;
+  NtpTimeDisAssembToMs(sec,ms,wait);
+  do {
+    pthread_rwlock_rdlock(&cstWriter->domain->objectEntry.objRootLock);
+    pthread_rwlock_rdlock(&cstWriter->lock);
+    rSubscriptions=cstWriter->cstRemoteReaderCounter;
+    pthread_rwlock_unlock(&cstWriter->lock);
+    pthread_rwlock_unlock(&cstWriter->domain->objectEntry.objRootLock);
+    if (rSubscriptions>=noSubscriptions)
+      return ORTE_OK;
+    ORTESleepMs(sec*1000+ms);
+  } while (retries--);
+  return ORTE_TIMEOUT;  
 }
 
 /*****************************************************************************/
 int
 ORTEPublicationGetStatus(ORTEPublication *cstWriter,ORTEPublStatus *status) {
-  return 0;
+  CSChange *csChange;
+
+  if (!cstWriter) return ORTE_BAD_HANDLE;
+  pthread_rwlock_rdlock(&cstWriter->domain->objectEntry.objRootLock);
+  pthread_rwlock_rdlock(&cstWriter->lock);
+  status->strict=cstWriter->strictReliableCounter;
+  status->bestEffort=cstWriter->bestEffortsCounter;
+  status->issues=0;
+  ul_list_for_each(CSTWriterCSChange,cstWriter,csChange)
+    status->issues++;
+  pthread_rwlock_unlock(&cstWriter->lock);
+  pthread_rwlock_unlock(&cstWriter->domain->objectEntry.objRootLock);
+  return ORTE_OK;
 }
 
 /*****************************************************************************/
@@ -195,7 +224,7 @@ int
 ORTEPublicationPrepareQueue(ORTEPublication *cstWriter) {
   ORTEPublProp          *pp;
   
-  if (!cstWriter) return -1;
+  if (!cstWriter) return ORTE_BAD_HANDLE;
   pthread_rwlock_wrlock(&cstWriter->lock);
   pp=(ORTEPublProp*)cstWriter->objectEntryOID->attributes;
   if (cstWriter->csChangesCounter>=pp->sendQueueSize) {
@@ -206,24 +235,22 @@ ORTEPublicationPrepareQueue(ORTEPublication *cstWriter) {
       NtpTimeAdd(expire,atime,cstWriter->domain->domainProp.baseProp.maxBlockTime);
       NtpTimeDisAssembToUs(wtime.tv_sec,wtime.tv_nsec,expire);
       wtime.tv_nsec*=1000;  //conver to nano seconds
-      pthread_mutex_lock(&cstWriter->mutexCSChangeDestroyed);
-      pthread_rwlock_unlock(&cstWriter->lock);
-      pthread_mutex_timedlock(
-          &cstWriter->mutexCSChangeDestroyed,
+      pthread_rwlock_unlock(&cstWriter->lock);    
+      sem_timedwait(
+          &cstWriter->semCSChangeDestroyed,
           &wtime);
-      pthread_mutex_unlock(&cstWriter->mutexCSChangeDestroyed);
       pthread_rwlock_wrlock(&cstWriter->lock);    
       pp=(ORTEPublProp*)cstWriter->objectEntryOID->attributes;
       if (cstWriter->csChangesCounter>=pp->sendQueueSize) {
         debug(31,5) ("Publication: queue level (%d), queue full!!!\n",
                       cstWriter->csChangesCounter);
         pthread_rwlock_unlock(&cstWriter->lock);
-        return -2;
+        return ORTE_QUEUE_FULL;
       }
     }
   }
   pthread_rwlock_unlock(&cstWriter->lock);
-  return 0;
+  return ORTE_OK;
 }
 
 /*****************************************************************************/
@@ -232,7 +259,7 @@ ORTEPublicationSendLocked(ORTEPublication *cstWriter) {
   CSChange              *csChange;
   SequenceNumber        snNext;
   
-  if (!cstWriter) return -1;
+  if (!cstWriter) return ORTE_BAD_HANDLE;
   pthread_rwlock_rdlock(&cstWriter->domain->typeEntry.lock);    
   pthread_rwlock_wrlock(&cstWriter->domain->writerPublications.lock);
   if (!CSTRemoteReader_is_empty(cstWriter)) {
@@ -271,7 +298,7 @@ ORTEPublicationSendLocked(ORTEPublication *cstWriter) {
   }
   pthread_rwlock_unlock(&cstWriter->domain->typeEntry.lock);    
   pthread_rwlock_unlock(&cstWriter->domain->writerPublications.lock);
-  return 0;
+  return ORTE_OK;
 }
 
 /*****************************************************************************/
@@ -279,8 +306,8 @@ int
 ORTEPublicationSend(ORTEPublication *cstWriter) {
   int             r;
 
-  if (!cstWriter) return -1;
-  //PrepareSendingQueue
+  if (!cstWriter) return ORTE_BAD_HANDLE;
+  //prepare sending queue
   if ((r=ORTEPublicationPrepareQueue(cstWriter))<0) return r;
   //send
   pthread_rwlock_wrlock(&cstWriter->domain->objectEntry.objRootLock);
index b373929aed42136a5b11d33d1529d191b862b2b7..d3616c669df003b5094f51ef4efcc444967b73b1 100644 (file)
@@ -41,22 +41,24 @@ ORTESubscriptionCreate(ORTEDomain *d,SubscriptionMode mode,SubscriptionType sTyp
   
   cstReader=(CSTReader*)MALLOC(sizeof(CSTReader));
   if (!cstReader) return NULL;
+  pthread_rwlock_wrlock(&d->objectEntry.objRootLock);
+  pthread_rwlock_wrlock(&d->objectEntry.htimRootLock);
   pthread_rwlock_rdlock(&d->typeEntry.lock);    
   if (!(typeNode=ORTEType_find(&d->typeEntry,&typeName))) {
     pthread_rwlock_unlock(&d->typeEntry.lock);    
+    pthread_rwlock_unlock(&d->objectEntry.objRootLock);
+    pthread_rwlock_unlock(&d->objectEntry.htimRootLock);
     printf("before call ORTESubscriptionCreateBestEffort is necessary to register \n\
             ser./deser. function for a given typeName!!!\n");
     return NULL;
   }  
-  pthread_rwlock_wrlock(&d->objectEntry.objRootLock);
-  pthread_rwlock_wrlock(&d->objectEntry.htimRootLock);
   pthread_rwlock_wrlock(&d->subscriptions.lock);
   //generate new guid of publisher
   d->subscriptions.counter++;
   guid.hid=d->guid.hid;guid.aid=d->guid.aid;
   guid.oid=(d->subscriptions.counter<<8)|OID_SUBSCRIPTION;
   sp=(ORTESubsProp*)MALLOC(sizeof(ORTESubsProp));
-  memcpy(sp,&d->subsPropDefault,sizeof(ORTESubsProp));
+  memcpy(sp,&d->domainProp.subsPropDefault,sizeof(ORTESubsProp));
   strcpy(sp->topic,topic);
   strcpy(sp->typeName,typeName);
   sp->deadline=*deadline;
@@ -107,6 +109,7 @@ int
 ORTESubscriptionDestroyLocked(ORTESubscription *cstReader) {
   CSChange              *csChange;
   
+  if (!cstReader) return ORTE_BAD_HANDLE;
   pthread_rwlock_wrlock(&cstReader->domain->writerSubscriptions.lock);
   csChange=(CSChange*)MALLOC(sizeof(CSChange));
   CSChangeAttributes_init_head(csChange);
@@ -117,18 +120,20 @@ ORTESubscriptionDestroyLocked(ORTESubscription *cstReader) {
                        &cstReader->domain->writerSubscriptions,
                        csChange);
   pthread_rwlock_unlock(&cstReader->domain->writerSubscriptions.lock);
-  return 0;
+  return ORTE_OK;
 }
 
 /*****************************************************************************/
 int
 ORTESubscriptionDestroy(ORTESubscription *cstReader) {
   int r;
-  if (!cstReader) return -1;
+  if (!cstReader) return ORTE_BAD_HANDLE;
   //generate csChange for writerSubscriptions
   pthread_rwlock_rdlock(&cstReader->domain->objectEntry.objRootLock);
   pthread_rwlock_wrlock(&cstReader->domain->objectEntry.htimRootLock);
+  pthread_rwlock_wrlock(&cstReader->lock);
   r=ORTESubscriptionDestroyLocked(cstReader);
+  pthread_rwlock_unlock(&cstReader->lock);
   pthread_rwlock_unlock(&cstReader->domain->objectEntry.htimRootLock);
   pthread_rwlock_unlock(&cstReader->domain->objectEntry.objRootLock);
   return r;
@@ -138,12 +143,13 @@ ORTESubscriptionDestroy(ORTESubscription *cstReader) {
 /*****************************************************************************/
 int
 ORTESubscriptionPropertiesGet(ORTESubscription *cstReader,ORTESubsProp *sp) {
+  if (!cstReader) return ORTE_BAD_HANDLE;
   pthread_rwlock_rdlock(&cstReader->domain->objectEntry.objRootLock);
   pthread_rwlock_rdlock(&cstReader->lock);
   *sp=*(ORTESubsProp*)cstReader->objectEntryOID->attributes;
   pthread_rwlock_unlock(&cstReader->lock);
   pthread_rwlock_unlock(&cstReader->domain->objectEntry.objRootLock);
-  return 0;
+  return ORTE_OK;
 }
 
 /*****************************************************************************/
@@ -151,6 +157,7 @@ int
 ORTESubscriptionPropertiesSet(ORTESubscription *cstReader,ORTESubsProp *sp) {
   CSChange              *csChange;
 
+  if (!cstReader) return ORTE_BAD_HANDLE;
   pthread_rwlock_rdlock(&cstReader->domain->objectEntry.objRootLock);
   pthread_rwlock_wrlock(&cstReader->domain->objectEntry.htimRootLock);
   pthread_rwlock_wrlock(&cstReader->domain->writerSubscriptions.lock);
@@ -163,23 +170,50 @@ ORTESubscriptionPropertiesSet(ORTESubscription *cstReader,ORTESubsProp *sp) {
   CSTWriterAddCSChange(cstReader->domain,
       &cstReader->domain->writerSubscriptions,csChange);
   pthread_rwlock_unlock(&cstReader->lock);
-  pthread_rwlock_unlock(&cstReader->domain->subscriptions.lock);
+  pthread_rwlock_unlock(&cstReader->domain->writerSubscriptions.lock);
   pthread_rwlock_unlock(&cstReader->domain->objectEntry.htimRootLock);
   pthread_rwlock_unlock(&cstReader->domain->objectEntry.objRootLock);
-  return 0;
+  return ORTE_OK;
 }
 
 /*****************************************************************************/
 int
 ORTESubscriptionWaitForPublications(ORTESubscription *cstReader,NtpTime wait,
-    u_int32_t retries,u_int32_t noPublications) {
-  return 0;
+    unsigned int retries,unsigned int noPublications) {
+  int wPublications;
+  u_int32_t sec,ms;
+
+  if (!cstReader) return ORTE_BAD_HANDLE;
+  NtpTimeDisAssembToMs(sec,ms,wait);
+  do {
+    pthread_rwlock_rdlock(&cstReader->domain->objectEntry.objRootLock);
+    pthread_rwlock_rdlock(&cstReader->lock);
+    wPublications=cstReader->cstRemoteWriterCounter;
+    pthread_rwlock_unlock(&cstReader->lock);
+    pthread_rwlock_unlock(&cstReader->domain->objectEntry.objRootLock);
+    if (wPublications>=noPublications)
+      return ORTE_OK;
+    ORTESleepMs(sec*1000+ms);
+  } while (retries--);
+  return ORTE_TIMEOUT;  
 }
 
 /*****************************************************************************/
 int
 ORTESubscriptionGetStatus(ORTESubscription *cstReader,ORTESubsStatus *status) {
-  return 0;
+  CSChange *csChange;
+
+  if (!cstReader) return ORTE_BAD_HANDLE;
+  pthread_rwlock_rdlock(&cstReader->domain->objectEntry.objRootLock);
+  pthread_rwlock_rdlock(&cstReader->lock);
+  status->strict=cstReader->strictReliableCounter;
+  status->bestEffort=cstReader->bestEffortsCounter;
+  status->issues=0;
+  ul_list_for_each(CSTReaderCSChange,cstReader,csChange)
+    status->issues++;
+  pthread_rwlock_unlock(&cstReader->lock);
+  pthread_rwlock_unlock(&cstReader->domain->objectEntry.objRootLock);
+  return ORTE_OK;
 }
 
 /*****************************************************************************/
@@ -189,7 +223,7 @@ ORTESubscriptionPull(ORTESubscription *cstReader) {
   ORTERecvInfo         info;
   NtpTime              timeNext;
   
-  if (!cstReader) return -1;
+  if (!cstReader) return ORTE_BAD_HANDLE;
   pthread_rwlock_rdlock(&cstReader->domain->objectEntry.objRootLock);
   pthread_rwlock_wrlock(&cstReader->domain->objectEntry.htimRootLock);
   pthread_rwlock_rdlock(&cstReader->domain->writerSubscriptions.lock);
@@ -217,5 +251,5 @@ ORTESubscriptionPull(ORTESubscription *cstReader) {
   pthread_rwlock_unlock(&cstReader->domain->writerSubscriptions.lock);
   pthread_rwlock_unlock(&cstReader->domain->objectEntry.htimRootLock);
   pthread_rwlock_unlock(&cstReader->domain->objectEntry.objRootLock);
-  return 0;
+  return ORTE_OK;
 }
index 218d6c693e3fce63987d8d4a0d4a137300f97487..5b708645060ab868b423e4d611de7e8395b33468 100644 (file)
@@ -50,8 +50,12 @@ ORTEDomainWakeUpReceivingThread(ORTEDomain *d,sock_t *sock,u_int16_t port) {
 /*****************************************************************************/
 void
 ORTEDomainWakeUpSendingThread(ObjectEntry *objectEntry) {
-  if (objectEntry->htimNeedWakeUp)
-    pthread_mutex_unlock(&objectEntry->htimSendMutex);
+  if (objectEntry->htimNeedWakeUp) {
+    int value;
+    sem_getvalue(&objectEntry->htimSendSem,&value);
+    if (!value)
+      sem_post(&objectEntry->htimSendSem);
+  }
 }
 
 
index 956551c1c5d9ca75a88d463d0d849fc15068d060..d851281fb1b9f63bb1edc966f89717fe8eb0490b 100644 (file)
@@ -44,7 +44,7 @@ ORTETypeRegisterAdd(ORTEDomain *d,const char *typeName,ORTETypeSerialize ts,
                     ORTETypeDeserialize ds,unsigned int gms) {
   TypeNode           *tn;
   
-  if (!d) return -1;       //bat handle
+  if (!d) return ORTE_BAD_HANDLE;       //bat handle
   if (gms>d->domainProp.wireProp.userMaxSerDeserSize) return -2;
   pthread_rwlock_wrlock(&d->typeEntry.lock);    
   tn=ORTEType_find(&d->typeEntry,&typeName);
@@ -59,7 +59,7 @@ ORTETypeRegisterAdd(ORTEDomain *d,const char *typeName,ORTETypeSerialize ts,
   tn->typeRegister.getMaxSize=gms;
   pthread_rwlock_unlock(&d->typeEntry.lock);    
   debug(26,3) ("ORTETypeRegisterAdd: registered type:%s\n",typeName);
-  return 0;
+  return ORTE_OK;
 }
 
 /*****************************************************************************/
@@ -67,14 +67,14 @@ int
 ORTETypeRegisterDestroyAll(ORTEDomain *d) {
   TypeNode           *tn;
   
-  if (!d) return -1;       //bat handle
+  if (!d) return ORTE_BAD_HANDLE;  //bat handle
   pthread_rwlock_wrlock(&d->typeEntry.lock);    
   while((tn=ORTEType_cut_first(&d->typeEntry))) {
     free((char*)tn->typeRegister.typeName);
     FREE(tn);
   }
   pthread_rwlock_unlock(&d->typeEntry.lock);    
-  return 0;
+  return ORTE_OK;
 }
 
 
index 2608f39c99be1a7e336f315584da10435b0962a9..12ce43e5d7d093d45e364f1760febb5e9244f0db 100644 (file)
@@ -54,7 +54,8 @@ RTPSAck(ORTEDomain *d,u_int8_t *rtps_msg,MessageInterpret *mi,IPAddress senderIP
   StateMachineSend   stateMachineSendNew;
   ObjectId              roid,woid;
   SequenceNumber     sn;   
-  int8_t             e_bit,f_bit;
+  char               e_bit,f_bit;
+  char               queue=1;
 
   e_bit=rtps_msg[1] & 0x01;
   f_bit=(rtps_msg[1] & 0x02)>>1;
@@ -108,24 +109,53 @@ RTPSAck(ORTEDomain *d,u_int8_t *rtps_msg,MessageInterpret *mi,IPAddress senderIP
         pthread_rwlock_wrlock(&d->writerSubscriptions.lock);
         cstWriter=&d->writerSubscriptions;
         break;
+      default:
+        if ((woid & 0x07) == OID_PUBLICATION) {
+          GUID_RTPS  guid=d->guid;
+          guid.oid=woid;
+          pthread_rwlock_rdlock(&d->publications.lock);
+          cstWriter=CSTWriter_find(&d->publications,&guid);
+          pthread_rwlock_wrlock(&cstWriter->lock);
+          queue=2;
+        }
+        break;
     }
   }
-  if (!cstWriter) return;
+  if (!cstWriter) {
+    if ((woid & 0x07) == OID_PUBLICATION) 
+      pthread_rwlock_unlock(&d->publications.lock);
+    return;
+  }
   cstRemoteReader=CSTRemoteReader_find(cstWriter,&readerGUID);
   if (!cstRemoteReader) {
     pthread_rwlock_unlock(&cstWriter->lock);
+    if ((woid & 0x07) == OID_PUBLICATION) 
+      pthread_rwlock_unlock(&d->publications.lock);
     return;
   }
   stateMachineSendNew=NOTHNIGTOSEND;
-  gavl_cust_for_each(CSChangeForReader,cstRemoteReader,csChangeForReader) {
+  csChangeForReader=CSChangeForReader_first(cstRemoteReader);
+  while(csChangeForReader) {
     if (SeqNumberCmp(csChangeForReader->csChange->sn,sn)<0)   {   //ACK
       if (csChangeForReader->commStateChFReader!=ACKNOWLEDGED) {
+        CSChangeForReader *csChangeForReaderDestroyed;
+        csChangeForReaderDestroyed=csChangeForReader;
         csChangeForReader->commStateChFReader=ACKNOWLEDGED;
-//        csChangeForReader->csChange->acknowledgedCounter++;
-      }    
+        csChangeForReader=
+          CSChangeForReader_next(cstRemoteReader,csChangeForReader);
+        if ((woid & 0x07) == OID_PUBLICATION) {
+          CSTWriterDestroyCSChangeForReader(cstRemoteReader,
+            csChangeForReaderDestroyed,ORTE_TRUE);
+        }
+      } else {
+        csChangeForReader=
+          CSChangeForReader_next(cstRemoteReader,csChangeForReader);
+      }
     } else {                                                      //NACK
       csChangeForReader->commStateChFReader=TOSEND;
       stateMachineSendNew=MUSTSENDDATA;
+      csChangeForReader=
+        CSChangeForReader_next(cstRemoteReader,csChangeForReader);
     }
   }
   if ((cstRemoteReader->commStateSend==NOTHNIGTOSEND) && 
@@ -134,41 +164,74 @@ RTPSAck(ORTEDomain *d,u_int8_t *rtps_msg,MessageInterpret *mi,IPAddress senderIP
     eventDetach(d,
         cstRemoteReader->objectEntryOID->objectEntryAID,
         &cstRemoteReader->delayResponceTimer,
-        1);
-    eventAdd(d,
-        cstRemoteReader->objectEntryOID->objectEntryAID,
-        &cstRemoteReader->delayResponceTimer,
-        1,   //metatraffic timer
-        "CSTWriterSendTimer",
-        CSTWriterSendTimer,
-        &cstRemoteReader->cstWriter->lock,
-        cstRemoteReader,
-        &cstRemoteReader->cstWriter->params.delayResponceTime);               
+        queue);
+    if (queue==1) {
+      eventAdd(d,
+          cstRemoteReader->objectEntryOID->objectEntryAID,
+          &cstRemoteReader->delayResponceTimer,
+          queue,   //metatraffic timer
+          "CSTWriterSendTimer",
+          CSTWriterSendTimer,
+          &cstRemoteReader->cstWriter->lock,
+          cstRemoteReader,
+          &cstRemoteReader->cstWriter->params.delayResponceTime);               
+    } else {
+      eventAdd(d,
+          cstRemoteReader->objectEntryOID->objectEntryAID,
+          &cstRemoteReader->delayResponceTimer,
+          queue,   //userdata timer
+          "CSTWriterSendStrictTimer",
+          CSTWriterSendStrictTimer,
+          &cstRemoteReader->cstWriter->lock,
+          cstRemoteReader,
+          &cstRemoteReader->cstWriter->params.delayResponceTime);               
+    }
   } 
-  if ((cstRemoteReader->commStateSend==MUSTSENDDATA) && 
-      (stateMachineSendNew==NOTHNIGTOSEND)) {
-    cstRemoteReader->commStateSend=stateMachineSendNew;
-    eventDetach(d,
-        cstRemoteReader->objectEntryOID->objectEntryAID,
-        &cstRemoteReader->delayResponceTimer,
-        1);
+  if (stateMachineSendNew==NOTHNIGTOSEND) {
+    cstRemoteReader->commStateSend=NOTHNIGTOSEND;
+    if (queue==1) {
+      eventDetach(d,
+          cstRemoteReader->objectEntryOID->objectEntryAID,
+          &cstRemoteReader->delayResponceTimer,
+          queue);
+    } else {
+      eventDetach(d,
+          cstRemoteReader->objectEntryOID->objectEntryAID,
+          &cstRemoteReader->repeatAnnounceTimer,
+          queue);
+    }
   }  
   if ((!f_bit) && (cstRemoteReader->commStateSend==NOTHNIGTOSEND)) {
+    cstRemoteReader->commStateHB=MUSTSENDHB;
     eventDetach(d,
         cstRemoteReader->objectEntryOID->objectEntryAID,
         &cstRemoteReader->delayResponceTimer,
-        1);
-    eventAdd(d,
-        cstRemoteReader->objectEntryOID->objectEntryAID,
-        &cstRemoteReader->delayResponceTimer,
-        1,   //metatraffic timer
-        "CSTWriterSendTimer",
-        CSTWriterSendTimer,
-        &cstRemoteReader->cstWriter->lock,
-        cstRemoteReader,
-        &cstRemoteReader->cstWriter->params.delayResponceTime);               
+        queue);
+    if (queue==1) {
+      eventAdd(d,
+          cstRemoteReader->objectEntryOID->objectEntryAID,
+          &cstRemoteReader->delayResponceTimer,
+          queue,   //metatraffic timer
+          "CSTWriterSendTimer",
+          CSTWriterSendTimer,
+          &cstRemoteReader->cstWriter->lock,
+          cstRemoteReader,
+          &cstRemoteReader->cstWriter->params.delayResponceTime);               
+    } else {
+      eventAdd(d,
+          cstRemoteReader->objectEntryOID->objectEntryAID,
+          &cstRemoteReader->delayResponceTimer,
+          queue,   //userdata timer
+          "CSTWriterSendStrictTimer",
+          CSTWriterSendStrictTimer,
+          &cstRemoteReader->cstWriter->lock,
+          cstRemoteReader,
+          &cstRemoteReader->cstWriter->params.delayResponceTime);               
+    }
   } 
   pthread_rwlock_unlock(&cstWriter->lock);
+  if ((woid & 0x07) == OID_PUBLICATION) 
+    pthread_rwlock_unlock(&d->publications.lock);
 } 
 
 
index 54767dbfa62290c5d2bca1145ca0a9a35348a9e5..6fe0895d73fef4865d321c7e7730c687efe351f2 100644 (file)
@@ -84,7 +84,7 @@ CSTReaderProcCSChangesApp(ORTEDomain *d,CSTRemoteWriter *cstRemoteWriter,
   ObjectEntryOID     *objectEntryOID;
     
   csChange=csChangeFromWriter->csChange;
-  objectEntryOID=objectEntryFind(d,&csChangeFromWriter->csChange->guid);
+  objectEntryOID=objectEntryFind(d,&csChange->guid);
   if (!objectEntryOID) return;
   if (!csChange->alive) {
     eventDetach(d,
@@ -102,12 +102,16 @@ CSTReaderProcCSChangesApp(ORTEDomain *d,CSTRemoteWriter *cstRemoteWriter,
             NULL);
     return;
   }
-  switch (csChangeFromWriter->csChange->guid.oid & 0x07) {
+  switch (csChange->guid.oid & 0x07) {
     case OID_APPLICATION:
       break;
     case OID_PUBLICATION:      
+      parameterUpdatePublication(csChange,
+          (ORTEPublProp*)objectEntryOID->attributes);
       break;
     case OID_SUBSCRIPTION: 
+      parameterUpdateSubscription(csChange,
+          (ORTESubsProp*)objectEntryOID->attributes);
       break;
   }
 }
@@ -157,18 +161,115 @@ CSTReaderProcCSChanges(ORTEDomain *d,CSTRemoteWriter *cstRemoteWriter) {
   debug(54,10) ("CSTReaderProcCSChanges: finished\n");
 }
 
+/*****************************************************************************/
+void
+CSTReaderNewData(CSTRemoteWriter *cstRemoteWriter,
+    CSChangeFromWriter *csChangeFromWriter) {
+  ORTERecvInfo         info;  
+  ORTESubsProp         *sp;
+  ObjectEntryOID       *objectEntryOID;
+        
+  if (cstRemoteWriter==NULL) return;
+  objectEntryOID=cstRemoteWriter->cstReader->objectEntryOID;
+  sp=(ORTESubsProp*)cstRemoteWriter->cstReader->objectEntryOID->attributes;
+  if (objectEntryOID->recvCallBack) {
+    //deserialization routine
+    if (cstRemoteWriter->cstReader->typeRegister->deserialize) {
+      cstRemoteWriter->cstReader->typeRegister->deserialize(
+          &csChangeFromWriter->csChange->cdrStream,
+          objectEntryOID->instance);
+    } else {
+      int length=csChangeFromWriter->csChange->cdrStream.length;
+      if (cstRemoteWriter->cstReader->typeRegister->getMaxSize<length)
+        length=cstRemoteWriter->cstReader->typeRegister->getMaxSize;
+      //no deserialization -> memcpy
+      memcpy(objectEntryOID->instance,
+            csChangeFromWriter->csChange->cdrStream.buffer,
+            length);
+    }
+    info.status=NEW_DATA;
+    info.topic=sp->topic;
+    info.type=sp->typeName;
+    info.senderGUID=csChangeFromWriter->csChange->guid;
+    info.localTimeReceived=csChangeFromWriter->csChange->localTimeReceived;
+    info.remoteTimePublished=csChangeFromWriter->csChange->remoteTimePublished;
+    info.sn=csChangeFromWriter->csChange->sn;
+    objectEntryOID->recvCallBack(&info,
+                            objectEntryOID->instance,
+                            objectEntryOID->callBackParam);
+    if (sp->mode==IMMEDIATE) {
+      //setup new time for deadline timer
+      eventDetach(cstRemoteWriter->cstReader->domain,
+          cstRemoteWriter->cstReader->objectEntryOID->objectEntryAID,
+          &cstRemoteWriter->cstReader->deadlineTimer,
+          0);
+      eventAdd(cstRemoteWriter->cstReader->domain,
+          cstRemoteWriter->cstReader->objectEntryOID->objectEntryAID,
+          &cstRemoteWriter->cstReader->deadlineTimer,
+          0,   //common timer
+          "CSTReaderDeadlineTimer",
+          CSTReaderDeadlineTimer,
+          &cstRemoteWriter->cstReader->lock,
+          cstRemoteWriter->cstReader,
+          &sp->deadline);
+    }
+    if (sp->mode==PULLED) {
+      NtpTime timeNext;
+      NtpTimeAdd(timeNext,
+                (getActualNtpTime()),
+                sp->deadline);
+      htimerUnicastCommon_set_expire(&cstRemoteWriter->
+                cstReader->deadlineTimer,timeNext);
+    }
+  }
+}
+
 /*****************************************************************************/
 void 
 CSTReaderProcCSChangesIssue(CSTRemoteWriter *cstRemoteWriter,Boolean pullCalled) {
   ORTESubsProp         *sp;
   CSChangeFromWriter   *csChangeFromWriter;
-  ORTERecvInfo         info;  
+  SequenceNumber       snNext;
  
   debug(54,10) ("CSTReaderProcIssue: start\n");
   if (cstRemoteWriter==NULL) return;
   sp=(ORTESubsProp*)cstRemoteWriter->cstReader->objectEntryOID->attributes;
-  //Strict
   if ((sp->reliabilityRequested & PID_VALUE_RELIABILITY_STRICT)!=0) {
+    //Strict
+    if ((sp->mode==PULLED) && (pullCalled==ORTE_FALSE)) return;
+    while (1) {
+      csChangeFromWriter=CSChangeFromWriter_first(cstRemoteWriter);
+      if (!csChangeFromWriter) break;
+      if (SeqNumberCmp(csChangeFromWriter->csChange->sn,
+                      cstRemoteWriter->firstSN)>=0) {
+        SeqNumberInc(snNext,cstRemoteWriter->sn);
+        debug(54,10) ("CSTReaderProcChangesIssue: processing sn:%u,Change sn:%u\n",snNext.low,
+                                              csChangeFromWriter->csChange->sn.low);
+        if ((SeqNumberCmp(csChangeFromWriter->csChange->sn,snNext)==0) &&
+            (csChangeFromWriter->commStateChFWriter==RECEIVED)) {
+          if (SeqNumberCmp(csChangeFromWriter->csChange->gapSN,noneSN)==0) {
+            if ((cstRemoteWriter==
+                 cstRemoteWriter->cstReader->cstRemoteWriterSubscribed) &&
+                (cstRemoteWriter->cstReader->cstRemoteWriterSubscribed!=NULL)) {
+              //NewData                
+              CSTReaderNewData(cstRemoteWriter,csChangeFromWriter);
+            } 
+            SeqNumberInc(cstRemoteWriter->sn,cstRemoteWriter->sn);
+          } else {
+            //GAP
+            SeqNumberAdd(cstRemoteWriter->sn,
+                        cstRemoteWriter->sn,
+                        csChangeFromWriter->csChange->gapSN);
+          }
+          CSTReaderDestroyCSChange(cstRemoteWriter,
+              &snNext,ORTE_FALSE);
+        } else
+          break;
+      } else {
+        CSTReaderDestroyCSChangeFromWriter(cstRemoteWriter,
+            csChangeFromWriter,ORTE_FALSE);
+      }
+    }
   } else {
     //Best Effort
     if ((sp->reliabilityRequested & PID_VALUE_RELIABILITY_BEST_EFFORTS)!=0) {
@@ -178,58 +279,8 @@ CSTReaderProcCSChangesIssue(CSTRemoteWriter *cstRemoteWriter,Boolean pullCalled)
         return;
       if ((sp->mode==PULLED) && (pullCalled==ORTE_FALSE)) return;
       while((csChangeFromWriter=CSChangeFromWriter_first(cstRemoteWriter))) {
-        ObjectEntryOID *objectEntryOID;
-        objectEntryOID=cstRemoteWriter->cstReader->objectEntryOID;
-        if (objectEntryOID->recvCallBack) {
-          //deserialization routine
-          if (cstRemoteWriter->cstReader->typeRegister->deserialize) {
-            cstRemoteWriter->cstReader->typeRegister->deserialize(
-                &csChangeFromWriter->csChange->cdrStream,
-                objectEntryOID->instance);
-          } else {
-            int length=csChangeFromWriter->csChange->cdrStream.length;
-            if (cstRemoteWriter->cstReader->typeRegister->getMaxSize<length)
-              length=cstRemoteWriter->cstReader->typeRegister->getMaxSize;
-            //no deserialization -> memcpy
-            memcpy(objectEntryOID->instance,
-                   csChangeFromWriter->csChange->cdrStream.buffer,
-                   length);
-          }
-          info.status=NEW_DATA;
-          info.topic=sp->topic;
-          info.type=sp->typeName;
-          info.senderGUID=csChangeFromWriter->csChange->guid;
-          info.localTimeReceived=csChangeFromWriter->csChange->localTimeReceived;
-          info.remoteTimePublished=csChangeFromWriter->csChange->remoteTimePublished;
-          info.sn=csChangeFromWriter->csChange->sn;
-          objectEntryOID->recvCallBack(&info,
-                                   objectEntryOID->instance,
-                                   objectEntryOID->callBackParam);
-          if (sp->mode==IMMEDIATE) {
-            //setup new time for deadline timer
-            eventDetach(cstRemoteWriter->cstReader->domain,
-                cstRemoteWriter->cstReader->objectEntryOID->objectEntryAID,
-                &cstRemoteWriter->cstReader->deadlineTimer,
-                0);
-            eventAdd(cstRemoteWriter->cstReader->domain,
-                cstRemoteWriter->cstReader->objectEntryOID->objectEntryAID,
-                &cstRemoteWriter->cstReader->deadlineTimer,
-                0,   //common timer
-                "CSTReaderDeadlineTimer",
-                CSTReaderDeadlineTimer,
-                &cstRemoteWriter->cstReader->lock,
-                cstRemoteWriter->cstReader,
-                &sp->deadline);
-          }
-          if (sp->mode==PULLED) {
-            NtpTime timeNext;
-            NtpTimeAdd(timeNext,
-                      (getActualNtpTime()),
-                      sp->deadline);
-            htimerUnicastCommon_set_expire(&cstRemoteWriter->
-                      cstReader->deadlineTimer,timeNext);
-          }
-        }
+        //NewData                
+        CSTReaderNewData(cstRemoteWriter,csChangeFromWriter);
         CSTReaderDestroyCSChangeFromWriter(
             cstRemoteWriter,
             csChangeFromWriter,
index 36de74075561c13b4c581054e07d0cc56585cf0b..5098065a2a134e12fd97fd0c215358f27015356a 100644 (file)
 int 
 CSTReaderResponceTimer(ORTEDomain *d,void *vcstRemoteWriter) {
   CSTRemoteWriter *cstRemoteWriter=(CSTRemoteWriter*)vcstRemoteWriter;
-  int32_t         len;
+  int             len;
+  char            queue=1;
   
+  if ((cstRemoteWriter->guid.oid & 0x07) == OID_PUBLICATION) 
+    queue=2;
   if (!d->mbSend.containsInfoReply) { 
-    len=RTPSInfoREPLYCreate(
-        d->mbSend.cdrStream.bufferPtr,
-        getMaxMessageLength(d),
-        IPADDRESS_INVALID,
-        ((AppParams*)cstRemoteWriter->cstReader->objectEntryOID->attributes)->metatrafficUnicastPort);
+    if (queue==1) {
+      len=RTPSInfoREPLYCreate(
+          d->mbSend.cdrStream.bufferPtr,
+          getMaxMessageLength(d),
+          IPADDRESS_INVALID,
+          ((AppParams*)cstRemoteWriter->cstReader->objectEntryOID->attributes)->metatrafficUnicastPort);
+    } else {
+      len=RTPSInfoREPLYCreate(
+          d->mbSend.cdrStream.bufferPtr,
+          getMaxMessageLength(d),
+          IPADDRESS_INVALID,
+          ((AppParams*)cstRemoteWriter->cstReader->objectEntryOID->attributes)->userdataUnicastPort);
+    }
     if (len<0) {
       d->mbSend.needSend=ORTE_TRUE;
       return 1;
@@ -67,14 +78,14 @@ CSTReaderResponceTimer(ORTEDomain *d,void *vcstRemoteWriter) {
     eventDetach(d,
         cstRemoteWriter->objectEntryOID->objectEntryAID,
         &cstRemoteWriter->delayResponceTimer,
-        1);  //metatraffic timer
+        queue); 
     if (cstRemoteWriter->ACKRetriesCounter<
         cstRemoteWriter->cstReader->params.ACKMaxRetries) {
       cstRemoteWriter->ACKRetriesCounter++;
       eventAdd(d,
           cstRemoteWriter->objectEntryOID->objectEntryAID,
           &cstRemoteWriter->delayResponceTimer,
-          1,   //metatraffic timer
+          queue,
           "CSTReaderResponceTimer",
           CSTReaderResponceTimer,
           &cstRemoteWriter->cstReader->lock,
@@ -90,13 +101,13 @@ CSTReaderResponceTimer(ORTEDomain *d,void *vcstRemoteWriter) {
     eventDetach(d,
         cstRemoteWriter->objectEntryOID->objectEntryAID,
         &cstRemoteWriter->repeatActiveQueryTimer,
-        1);   //metatraffic timer
+        queue); 
     if (NtpTimeCmp(cstRemoteWriter->cstReader->
                    params.repeatActiveQueryTime,iNtpTime)!=0) {
       eventAdd(d,
           cstRemoteWriter->objectEntryOID->objectEntryAID,
           &cstRemoteWriter->repeatActiveQueryTimer,
-          1,   //metatraffic timer
+          queue,
           "CSTReaderQueryTimer",
           CSTReaderQueryTimer,
           &cstRemoteWriter->cstReader->lock,
@@ -111,14 +122,25 @@ CSTReaderResponceTimer(ORTEDomain *d,void *vcstRemoteWriter) {
 int
 CSTReaderQueryTimer(ORTEDomain *d,void *vcstRemoteWriter) {
   CSTRemoteWriter *cstRemoteWriter=(CSTRemoteWriter*)vcstRemoteWriter;
-  int32_t         len;
+  int             len;
+  char            queue=1;
   
+  if ((cstRemoteWriter->guid.oid & 0x07) == OID_PUBLICATION) 
+    queue=2;  
   if (!d->mbSend.containsInfoReply) { 
-    len=RTPSInfoREPLYCreate(
-        d->mbSend.cdrStream.bufferPtr,
-        getMaxMessageLength(d),
-        IPADDRESS_INVALID,
-        ((AppParams*)cstRemoteWriter->cstReader->objectEntryOID->attributes)->metatrafficUnicastPort);
+    if (queue==1) {
+      len=RTPSInfoREPLYCreate(
+          d->mbSend.cdrStream.bufferPtr,
+          getMaxMessageLength(d),
+          IPADDRESS_INVALID,
+          ((AppParams*)cstRemoteWriter->cstReader->objectEntryOID->attributes)->metatrafficUnicastPort);
+    } else {
+      len=RTPSInfoREPLYCreate(
+          d->mbSend.cdrStream.bufferPtr,
+          getMaxMessageLength(d),
+          IPADDRESS_INVALID,
+          ((AppParams*)cstRemoteWriter->cstReader->objectEntryOID->attributes)->userdataUnicastPort);
+    }
     if (len<0) {
       d->mbSend.needSend=ORTE_TRUE;
       return 1;
@@ -139,7 +161,6 @@ CSTReaderQueryTimer(ORTEDomain *d,void *vcstRemoteWriter) {
       cstRemoteWriter->guid.oid,
       ORTE_FALSE);
   if (len<0) {
-    //not enought space in sending buffer
     d->mbSend.needSend=ORTE_TRUE;
     return 1;
   }
@@ -152,16 +173,19 @@ CSTReaderQueryTimer(ORTEDomain *d,void *vcstRemoteWriter) {
   eventDetach(d,
       cstRemoteWriter->objectEntryOID->objectEntryAID,
       &cstRemoteWriter->repeatActiveQueryTimer,
-      1);   //metatraffic timer
-  eventAdd(d,
-      cstRemoteWriter->objectEntryOID->objectEntryAID,
-      &cstRemoteWriter->repeatActiveQueryTimer,
-      1,   //metatraffic timer
-      "CSTReaderQueryTimer",
-      CSTReaderQueryTimer,
-      &cstRemoteWriter->cstReader->lock,
-      cstRemoteWriter,
-      &cstRemoteWriter->cstReader->params.repeatActiveQueryTime);
+      queue);   
+  if (NtpTimeCmp(cstRemoteWriter->cstReader->
+                 params.repeatActiveQueryTime,iNtpTime)!=0) {
+    eventAdd(d,
+        cstRemoteWriter->objectEntryOID->objectEntryAID,
+        &cstRemoteWriter->repeatActiveQueryTimer,
+        queue,
+        "CSTReaderQueryTimer",
+        CSTReaderQueryTimer,
+        &cstRemoteWriter->cstReader->lock,
+        cstRemoteWriter,
+        &cstRemoteWriter->cstReader->params.repeatActiveQueryTime);
+  }
   return 0; 
 }
 
index 3c9512ba4a15a224b6ee79581f617229bd85ae21..b7d6851f4233cf58209c6d75f95bdcdd65d402ac 100644 (file)
@@ -56,7 +56,7 @@ CSTWriterInit(ORTEDomain *d,CSTWriter *cstWriter,ObjectEntryOID *object,
   cstWriter->domain=d;
   cstWriter->typeRegister=typeRegister;
   if ((cstWriter->guid.oid & 0x07)==OID_PUBLICATION) {
-    pthread_mutex_init(&cstWriter->mutexCSChangeDestroyed,NULL);
+    sem_init(&cstWriter->semCSChangeDestroyed, 0, 0);
   }
   //add event for refresh
   if (NtpTimeCmp(cstWriter->params.refreshPeriod,iNtpTime)!=0) {
@@ -95,7 +95,7 @@ CSTWriterDelete(ORTEDomain *d,CSTWriter *cstWriter) {
       &cstWriter->refreshPeriodTimer,
       0);
   if ((cstWriter->guid.oid & 0x07)==OID_PUBLICATION) {
-    pthread_mutex_destroy(&cstWriter->mutexCSChangeDestroyed);
+    sem_destroy(&cstWriter->semCSChangeDestroyed);
   }
   pthread_rwlock_destroy(&cstWriter->lock);
   debug(51,10) ("CSTWriterDelete: finished\n");
@@ -253,6 +253,8 @@ CSTWriterAddCSChange(ORTEDomain *d,CSTWriter *cstWriter,CSChange *csChange) {
   CSTRemoteReader     *cstRemoteReader;
   CSChange            *csChangeFSN;
   
+  debug(51,5) ("CSTWriterAddCSChange: cstWriter:0x%x-0x%x-0x%x\n",
+               cstWriter->guid.hid,cstWriter->guid.aid,cstWriter->guid.oid);
   cstWriter->csChangesCounter++;
   //look for old cschange
   if ((cstWriter->guid.oid & 0x07)!=OID_PUBLICATION)
@@ -262,8 +264,8 @@ CSTWriterAddCSChange(ORTEDomain *d,CSTWriter *cstWriter,CSChange *csChange) {
   csChange->sn=cstWriter->lastSN;
   SEQUENCE_NUMBER_NONE(csChange->gapSN);
   csChange->remoteReaderCount=cstWriter->cstRemoteReaderCounter;  
-  csChange->remoteReaderProcBest=0;
-  csChange->remoteReaderProcStrict=0;
+  csChange->remoteReaderBest=0;
+  csChange->remoteReaderStrict=0;
   CSTWriterCSChange_insert(cstWriter,csChange);
   //update FirstSN
   csChangeFSN=CSTWriterCSChange_first(cstWriter);
@@ -282,6 +284,7 @@ CSTWriterAddCSChange(ORTEDomain *d,CSTWriter *cstWriter,CSChange *csChange) {
     ul_htim_queue_init_detached(&csChangeForReader->waitWhileDataUnderwayTimer.htim);
     CSChangeForReader_insert(cstRemoteReader,csChangeForReader);
     cstRemoteReader->csChangesCounter++;
+    cstRemoteReader->HBRetriesCounter=0;
     if (cstRemoteReader->commStateSend==NOTHNIGTOSEND) {
       cstRemoteReader->commStateSend=MUSTSENDDATA;
       if ((cstWriter->guid.oid & 0x07)!=OID_PUBLICATION) {
@@ -303,6 +306,7 @@ CSTWriterAddCSChange(ORTEDomain *d,CSTWriter *cstWriter,CSChange *csChange) {
         
         if ((sp->reliabilityRequested & PID_VALUE_RELIABILITY_STRICT)!=0) {
           //Strict reliable subscription
+          csChange->remoteReaderStrict++;
           eventDetach(d,
               cstRemoteReader->objectEntryOID->objectEntryAID,
               &cstRemoteReader->delayResponceTimer,
@@ -320,7 +324,8 @@ CSTWriterAddCSChange(ORTEDomain *d,CSTWriter *cstWriter,CSChange *csChange) {
           if ((sp->reliabilityRequested & PID_VALUE_RELIABILITY_BEST_EFFORTS)!=0) {
             //best efforts subscription
             NtpTime nextIssueTime,nextIssueDelay,actTime=getActualNtpTime();
-
+            
+            csChange->remoteReaderBest++;
             NtpTimeAdd(nextIssueTime,
                       cstRemoteReader->lastSentIssueTime,
                       sp->minimumSeparation);
@@ -352,12 +357,15 @@ CSTWriterAddCSChange(ORTEDomain *d,CSTWriter *cstWriter,CSChange *csChange) {
             //!Best_Effort & !Strict_Reliable
             CSTWriterDestroyCSChangeForReader(cstRemoteReader,csChangeForReader,
               ORTE_TRUE);
+            debug(51,5) ("CSTWriterAddCSChange: destryed\n");
+             
           }
         }
       }
     }
     debug(51,5) ("CSTWriterAddCSChange: scheduled Var | Gap | Issue | HB \n");
   }
+  debug(51,5) ("CSTWriterAddCSChange: finished\n");
 }
 
 /*****************************************************************************/
@@ -369,6 +377,19 @@ CSTWriterDestroyCSChangeForReader(CSTRemoteReader *cstRemoteReader,
   csChange=csChangeForReader->csChange;
   csChange->remoteReaderCount--;  
   cstRemoteReader->csChangesCounter--;
+  if (!cstRemoteReader->csChangesCounter) {
+    cstRemoteReader->commStateSend=NOTHNIGTOSEND;
+  }
+  if ((cstRemoteReader->cstWriter->guid.oid & 0x07)==OID_PUBLICATION) {
+    ORTESubsProp *sp=(ORTESubsProp*)cstRemoteReader->objectEntryOID->attributes;
+    if ((sp->reliabilityRequested & PID_VALUE_RELIABILITY_STRICT)!=0) {
+        csChange->remoteReaderStrict--;
+    } else {
+      if ((sp->reliabilityRequested & PID_VALUE_RELIABILITY_BEST_EFFORTS)!=0) {
+        csChange->remoteReaderBest--;
+      }
+    }
+  }  
   eventDetach(cstRemoteReader->cstWriter->domain,
       cstRemoteReader->objectEntryOID->objectEntryAID,
       &csChangeForReader->waitWhileDataUnderwayTimer,
@@ -376,13 +397,12 @@ CSTWriterDestroyCSChangeForReader(CSTRemoteReader *cstRemoteReader,
   CSChangeForReader_delete(cstRemoteReader,csChangeForReader);
   FREE(csChangeForReader);
   if ((cstRemoteReader->cstWriter->guid.oid & 0x07)==OID_PUBLICATION) {
-    if (csChange->remoteReaderCount<=
-        (csChange->remoteReaderProcBest+csChange->remoteReaderProcStrict)) {
+    if (!csChange->remoteReaderCount) {
       if (destroyCSChange) {
         CSTWriterDestroyCSChange(cstRemoteReader->cstWriter->domain,
             cstRemoteReader->cstWriter,csChange);
       }
-      pthread_mutex_unlock(&cstRemoteReader->cstWriter->mutexCSChangeDestroyed);
+      sem_post(&cstRemoteReader->cstWriter->semCSChangeDestroyed);
       debug(51,5) ("Publication: new queue level (%d)\n",
                   cstRemoteReader->cstWriter->csChangesCounter);
     }
@@ -394,6 +414,7 @@ void
 CSTWriterDestroyCSChange(ORTEDomain *d,CSTWriter *cstWriter,CSChange *csChange) {
   CSTRemoteReader     *cstRemoteReader;
   CSChangeForReader   *csChangeForReader;
+  CSChange            *csChangeFSN;
 
   if (!csChange) return;
   cstWriter->csChangesCounter--;
@@ -407,6 +428,12 @@ CSTWriterDestroyCSChange(ORTEDomain *d,CSTWriter *cstWriter,CSChange *csChange)
     FREE(csChange->cdrStream.buffer);
   parameterDelete(csChange);
   FREE(csChange);
+  //update first SN
+  csChangeFSN=CSTWriterCSChange_first(cstWriter);
+  if (csChangeFSN)
+    cstWriter->firstSN=csChangeFSN->sn;
+  else
+    cstWriter->firstSN=cstWriter->lastSN;
 }
 
 /*****************************************************************************/
@@ -414,7 +441,7 @@ Boolean
 CSTWriterTryDestroyBestEffortIssue(CSTWriter *cstWriter) {
   CSChange *csChange;
   ul_list_for_each(CSTWriterCSChange,cstWriter,csChange) {
-    if (!csChange->remoteReaderProcStrict) {
+    if (!csChange->remoteReaderStrict) {
       CSTWriterDestroyCSChange(cstWriter->domain,cstWriter,csChange);
       return ORTE_TRUE;
     }
@@ -431,22 +458,25 @@ CSTWriterRefreshAllCSChanges(ORTEDomain *d,CSTRemoteReader *cstRemoteReader) {
   if ((cstRemoteReader->cstWriter->guid.oid & 0x07)==OID_PUBLICATION)
     timerQueue=2; //userdata timer queue
   gavl_cust_for_each(CSChangeForReader,cstRemoteReader,csChangeForReader) {
-    csChangeForReader->commStateChFReader=TOSEND;
-    if (cstRemoteReader->commStateSend==NOTHNIGTOSEND) {
-      cstRemoteReader->commStateSend=MUSTSENDDATA;
-      eventDetach(d,
-          cstRemoteReader->objectEntryOID->objectEntryAID,
-          &cstRemoteReader->delayResponceTimer,
-          timerQueue);
-      eventAdd(d,
-          cstRemoteReader->objectEntryOID->objectEntryAID,
-          &cstRemoteReader->delayResponceTimer,
-          timerQueue,  
-          "CSTWriterSendTimer",
-          CSTWriterSendTimer,
-          &cstRemoteReader->cstWriter->lock,
-          cstRemoteReader,
-          &cstRemoteReader->cstWriter->params.delayResponceTime);               
+    //refresh only VAR's
+    if (SeqNumberCmp(csChangeForReader->csChange->gapSN,noneSN)==0) { 
+      csChangeForReader->commStateChFReader=TOSEND;
+      if (cstRemoteReader->commStateSend==NOTHNIGTOSEND) {
+        cstRemoteReader->commStateSend=MUSTSENDDATA;
+        eventDetach(d,
+            cstRemoteReader->objectEntryOID->objectEntryAID,
+            &cstRemoteReader->delayResponceTimer,
+            timerQueue);
+        eventAdd(d,
+            cstRemoteReader->objectEntryOID->objectEntryAID,
+            &cstRemoteReader->delayResponceTimer,
+            timerQueue,  
+            "CSTWriterSendTimer",
+            CSTWriterSendTimer,
+            &cstRemoteReader->cstWriter->lock,
+            cstRemoteReader,
+            &cstRemoteReader->cstWriter->params.delayResponceTime);               
+      }
     }
   }
 }
index 5d917b18631d474d322a2207a46b8598ce3621b1..941247e081c99ee23d87aef39cf77b11863f3649 100644 (file)
@@ -28,7 +28,7 @@ CSTWriterRefreshTimer(ORTEDomain *d,void *vcstWriter) {
   CSTRemoteReader *cstRemoteReader;
   
   debug(52,10) ("CSTWriterRefreshTimer: start\n");
-
+  
   gavl_cust_for_each(CSTRemoteReader,cstWriter,cstRemoteReader) {
     CSTWriterRefreshAllCSChanges(d,cstRemoteReader);
   }
@@ -59,7 +59,7 @@ CSTWriterAnnounceTimer(ORTEDomain *d,void *vcstRemoteReader) {
       ((!cstRemoteReader->cstWriter->params.fullAcknowledge))) {// ||
 //       (cstRemoteReader->unacknowledgedCounter))) {
     //create HB
-    int32_t len=RTPSHeardBeatCreate(
+    int len=RTPSHeardBeatCreate(
         d->mbSend.cdrStream.bufferPtr,
         getMaxMessageLength(d),
         &cstRemoteReader->cstWriter->firstSN,
@@ -96,6 +96,71 @@ CSTWriterAnnounceTimer(ORTEDomain *d,void *vcstRemoteReader) {
   return 0;
 }
 
+/*****************************************************************************/
+int 
+CSTWriterAnnounceIssueTimer(ORTEDomain *d,void *vcstRemoteReader) {
+  CSTRemoteReader *cstRemoteReader=(CSTRemoteReader*)vcstRemoteReader;
+  NtpTime         nextHB;
+  ORTEPublProp    *pp;
+
+  debug(52,10) ("CSTWriterAnnounceIssueTimer: start\n");
+  pp=(ORTEPublProp*)cstRemoteReader->cstWriter->objectEntryOID->attributes;
+  //create HB
+  d->mbSend.cdrStreamDirect=NULL;
+  int len=RTPSHeardBeatCreate(
+      d->mbSend.cdrStream.bufferPtr,
+      getMaxMessageLength(d),
+      &cstRemoteReader->cstWriter->firstSN,
+      &cstRemoteReader->cstWriter->lastSN,
+      cstRemoteReader->cstWriter->guid.oid,
+      OID_UNKNOWN,
+      ORTE_FALSE);
+  if (len<0) {
+    //not enought space in sending buffer
+    d->mbSend.needSend=ORTE_TRUE;
+    return 1;
+  }
+  d->mbSend.cdrStream.bufferPtr+=len;
+  d->mbSend.cdrStream.length+=len;
+  debug(52,3) ("sent: RTPS_HBF(0x%x) to 0x%x-0x%x\n",
+                cstRemoteReader->cstWriter->guid.oid,
+                cstRemoteReader->guid.hid,
+                cstRemoteReader->guid.aid);
+  //next HB
+  if (cstRemoteReader->cstWriter->csChangesCounter>=pp->criticalQueueLevel) {
+    nextHB=pp->HBCQLRate;
+  } else {
+    nextHB=pp->HBNornalRate;
+  }
+  cstRemoteReader->HBRetriesCounter++;
+  eventDetach(d,
+      cstRemoteReader->objectEntryOID->objectEntryAID,
+      &cstRemoteReader->repeatAnnounceTimer,
+      2);
+  if (cstRemoteReader->HBRetriesCounter<pp->HBMaxRetries) {              
+    eventAdd(d,
+        cstRemoteReader->objectEntryOID->objectEntryAID,
+        &cstRemoteReader->repeatAnnounceTimer,
+        2,   //metatraffic timer
+        "CSTWriterAnnounceIssueTimer",
+        CSTWriterAnnounceIssueTimer,
+        &cstRemoteReader->cstWriter->lock,
+        cstRemoteReader,
+        &nextHB);
+  } else {
+    //destroy all csChangesForReader
+    CSChangeForReader *csChangeForReader;
+    while ((csChangeForReader=CSChangeForReader_first(cstRemoteReader))) {
+      CSTWriterDestroyCSChangeForReader(cstRemoteReader,
+          csChangeForReader,ORTE_TRUE);
+    }
+    debug(52,3) ("CSTWriterAnnounceIssueTimer: HB RR(0x%x-0x%x) ritch MaxRetries\n",
+                  cstRemoteReader->guid.hid,cstRemoteReader->guid.aid);
+  }
+  debug(52,10) ("CSTWriterAnnounceIssueTimer: finished\n");
+  return 0;
+}
+
 /**********************************************************************************/
 int
 CSChangeForReaderUnderwayTimer(ORTEDomain *d,void *vcsChangeForReader) {
@@ -112,6 +177,7 @@ CSTWriterSendBestEffortTimer(ORTEDomain *d,void *vcstRemoteReader) {
   CSChangeForReader *csChangeForReader=NULL;
         
   debug(52,10) ("CSTWriterSendBestEffortTimer: start\n");
+  d->mbSend.cdrStreamDirect=NULL;
   if (cstRemoteReader->commStateSend!=NOTHNIGTOSEND) {
     gavl_cust_for_each(CSChangeForReader,cstRemoteReader,csChangeForReader) {
       if (csChangeForReader->commStateChFReader==TOSEND) {
@@ -120,6 +186,10 @@ CSTWriterSendBestEffortTimer(ORTEDomain *d,void *vcstRemoteReader) {
         cstRemoteReader->commStateSend=MUSTSENDDATA;
         cstRemoteReader->lastSentIssueTime=getActualNtpTime();
         d->mbSend.cdrStreamDirect=&csChange->cdrStream;
+        debug(52,3) ("sent: RTPS_ISSUE_BEST(0x%x) to 0x%x-0x%x\n",
+                    cstRemoteReader->cstWriter->guid.oid,
+                    cstRemoteReader->guid.hid,
+                    cstRemoteReader->guid.aid);
         ORTESendData(d,
             cstRemoteReader->objectEntryOID->objectEntryAID,
             ORTE_FALSE);
@@ -186,11 +256,18 @@ CSTWriterSendStrictTimer(ORTEDomain *d,void *vcstRemoteReader) {
                        cstRemoteReader->guid.hid,
                        cstRemoteReader->guid.aid);
         }
-        if (max_msg_len<20+cstRemoteReader->cstWriter->typeRegister->getMaxSize) {
+        len=20+cstRemoteReader->cstWriter->typeRegister->getMaxSize;
+        if (max_msg_len<len) {
           d->mbSend.needSend=ORTE_TRUE;
           return 1;
         }
-        debug(52,3) ("sent: RTPS_ISSUE(0x%x) to 0x%x-0x%x\n",
+        memcpy(d->mbSend.cdrStream.bufferPtr,     //dest
+               csChange->cdrStream.bufferPtr-len, //src
+               len);                              //length
+        d->mbSend.cdrStream.bufferPtr+=len;
+        d->mbSend.cdrStream.length+=len;
+        max_msg_len-=len;
+        debug(52,3) ("sent: RTPS_ISSUE_STRICT(0x%x) to 0x%x-0x%x\n",
                     cstRemoteReader->cstWriter->guid.oid,
                     cstRemoteReader->guid.hid,
                     cstRemoteReader->guid.aid);
@@ -199,7 +276,8 @@ CSTWriterSendStrictTimer(ORTEDomain *d,void *vcstRemoteReader) {
   }
   cstRemoteReader->commStateSend=NOTHNIGTOSEND;
   debug(52,10) ("CSTWriterSendStrictTimer: finished\n");
-  return 0;
+  //add HeardBeat  
+  return CSTWriterAnnounceIssueTimer(d,cstRemoteReader);
 }
 
 /**********************************************************************************/
index 31098016ffa889d494d444e2226e02b7e93cda1c..4e40e264a05a99d9320e1d03f3d27599c342ad35 100644 (file)
@@ -40,15 +40,63 @@ RTPSHeardBeatCreate(u_int8_t *rtps_msg,u_int32_t max_msg_len,
   return 28;
 }
 
+/**********************************************************************************/
+void 
+HeardBeatProc(CSTReader *cstReader,GUID_RTPS *writerGUID,
+    SequenceNumber *fsn,SequenceNumber *lsn,char f_bit) {
+  CSTRemoteWriter    *cstRemoteWriter;
+  
+  if (!cstReader) return;
+  cstRemoteWriter=CSTRemoteWriter_find(cstReader,writerGUID);
+  if (!cstRemoteWriter) return;
+  cstRemoteWriter->firstSN=*fsn;
+  cstRemoteWriter->lastSN=*lsn;
+  cstRemoteWriter->ACKRetriesCounter=0;
+  if (SeqNumberCmp(cstRemoteWriter->sn,*lsn)>0)
+    cstRemoteWriter->sn=*lsn;
+  if (SeqNumberCmp(cstRemoteWriter->sn,*fsn)<0) {
+    if (SeqNumberCmp(*fsn,noneSN)!=0) {
+      SeqNumberDec(cstRemoteWriter->sn,*fsn);
+    }
+  }
+  if ((writerGUID->oid & 0x07) == OID_PUBLICATION) {
+    CSTReaderProcCSChangesIssue(cstRemoteWriter,ORTE_FALSE);
+  } else {
+    CSTReaderProcCSChanges(cstReader->domain,cstRemoteWriter);
+  }
+  if ((!f_bit) && (cstRemoteWriter->commStateACK==WAITING)) {
+    char queue=1;
+    cstRemoteWriter->commStateACK=ACKPENDING;
+    if ((cstRemoteWriter->guid.oid & 0x07) == OID_PUBLICATION) 
+      queue=2;
+    eventDetach(cstReader->domain,
+        cstRemoteWriter->objectEntryOID->objectEntryAID,
+        &cstRemoteWriter->repeatActiveQueryTimer,
+        queue); 
+    eventDetach(cstReader->domain,
+        cstRemoteWriter->objectEntryOID->objectEntryAID,
+        &cstRemoteWriter->delayResponceTimer,
+        queue);   //metatraffic timer
+    eventAdd(cstReader->domain,
+        cstRemoteWriter->objectEntryOID->objectEntryAID,
+        &cstRemoteWriter->delayResponceTimer,
+        queue,    //metatraffic timer
+        "CSTReaderResponceTimer",
+        CSTReaderResponceTimer,
+        &cstRemoteWriter->cstReader->lock,
+        cstRemoteWriter,
+        &cstRemoteWriter->cstReader->params.delayResponceTimeMin);
+  }
+}
+
 /**********************************************************************************/
 void 
 RTPSHeardBeat(ORTEDomain *d,u_int8_t *rtps_msg,MessageInterpret *mi) {
   GUID_RTPS          writerGUID;
   ObjectId              roid,woid;
   SequenceNumber     fsn,lsn;
-  int8_t             e_bit,f_bit;
+  char               e_bit,f_bit;
   CSTReader          *cstReader=NULL;
-  CSTRemoteWriter    *cstRemoteWriter=NULL;
 
   e_bit=rtps_msg[1] & 0x01;
   f_bit=(rtps_msg[1] & 0x02)>>1;
@@ -101,43 +149,18 @@ RTPSHeardBeat(ORTEDomain *d,u_int8_t *rtps_msg,MessageInterpret *mi) {
         cstReader=&d->readerSubscriptions;
         break;
     }
+    if ((writerGUID.oid & 0x07) == OID_PUBLICATION) {
+      pthread_rwlock_rdlock(&d->subscriptions.lock);
+      gavl_cust_for_each(CSTReader,&d->subscriptions,cstReader) {
+        pthread_rwlock_wrlock(&cstReader->lock);
+        HeardBeatProc(cstReader,&writerGUID,&fsn,&lsn,f_bit);
+        pthread_rwlock_unlock(&cstReader->lock);    
+      }
+      pthread_rwlock_unlock(&d->subscriptions.lock);
+      cstReader=NULL;
+    }
   }  
-  if (!cstReader) return;
-  cstRemoteWriter=CSTRemoteWriter_find(cstReader,&writerGUID);
-  if (!cstRemoteWriter) {
+  HeardBeatProc(cstReader,&writerGUID,&fsn,&lsn,f_bit);
+  if (cstReader)
     pthread_rwlock_unlock(&cstReader->lock);
-    return;
-  }
-  cstRemoteWriter->firstSN=fsn;
-  cstRemoteWriter->lastSN=lsn;
-  cstRemoteWriter->ACKRetriesCounter=0;
-  if (SeqNumberCmp(cstRemoteWriter->sn,lsn)>0)
-    cstRemoteWriter->sn=lsn;
-  if (SeqNumberCmp(cstRemoteWriter->sn,fsn)<0) {
-    if (SeqNumberCmp(fsn,noneSN)!=0) {
-      SeqNumberDec(cstRemoteWriter->sn,fsn);
-    }
-  }
-  CSTReaderProcCSChanges(d,cstRemoteWriter);
-  if ((!f_bit) && (cstRemoteWriter->commStateACK==WAITING)) {
-    cstRemoteWriter->commStateACK=ACKPENDING;
-    eventDetach(d,
-        cstRemoteWriter->objectEntryOID->objectEntryAID,
-        &cstRemoteWriter->repeatActiveQueryTimer,
-        1); 
-    eventDetach(d,
-        cstRemoteWriter->objectEntryOID->objectEntryAID,
-        &cstRemoteWriter->delayResponceTimer,
-        1);   //metatraffic timer
-    eventAdd(d,
-        cstRemoteWriter->objectEntryOID->objectEntryAID,
-        &cstRemoteWriter->delayResponceTimer,
-        1,   //metatraffic timer
-        "CSTReaderResponceTimer",
-        CSTReaderResponceTimer,
-        &cstRemoteWriter->cstReader->lock,
-        cstRemoteWriter,
-        &cstRemoteWriter->cstReader->params.delayResponceTimeMin);
-  }
-  pthread_rwlock_unlock(&cstReader->lock);
 } 
index bd0968a427ac2ee633c4da1830ae9787a58a3f2c..252f4d46a01164ea4910ccb21c28bd0123cb46b0 100644 (file)
@@ -118,8 +118,9 @@ RTPSVar(ORTEDomain *d,u_int8_t *rtps_msg,MessageInterpret *mi,IPAddress senderIP
             //all applications from manager node set expiration timer
             gavl_cust_for_each(ObjectEntryAID,
                                objectEntryOID->objectEntryHID,objectEntryAID) {
-              objectEntryOID=ObjectEntryOID_find(objectEntryAID,&objectGUID.oid);
-              objectEntryRefreshApp(d,objectEntryOID);
+              ObjectEntryOID *objectEntryOID1;
+              objectEntryOID1=ObjectEntryOID_find(objectEntryAID,&objectGUID.oid);
+              objectEntryRefreshApp(d,objectEntryOID1);
             }
           } else {
             FREE(ap);
@@ -156,7 +157,7 @@ RTPSVar(ORTEDomain *d,u_int8_t *rtps_msg,MessageInterpret *mi,IPAddress senderIP
             SeqNumberInc(d->appParams->vargAppsSequenceNumber,
                          d->appParams->vargAppsSequenceNumber);
             //WAS & WM is locked inside next function
-            appSelfParamChanged(d,ORTE_TRUE,ORTE_FALSE,ORTE_TRUE);
+            appSelfParamChanged(d,ORTE_TRUE,ORTE_FALSE,ORTE_TRUE,ORTE_TRUE);
             CSTReaderAddRemoteWriter(d,cstReader,
                 objectEntryOID,writerGUID.oid);
             CSTWriterAddRemoteReader(d,&d->writerManagers,
@@ -214,8 +215,9 @@ RTPSVar(ORTEDomain *d,u_int8_t *rtps_msg,MessageInterpret *mi,IPAddress senderIP
             //all applications from manager node set expiration timer
             gavl_cust_for_each(ObjectEntryAID,
                                objectEntryOID->objectEntryHID,objectEntryAID) {
-              objectEntryOID=ObjectEntryOID_find(objectEntryAID,&objectGUID.oid);
-              objectEntryRefreshApp(d,objectEntryOID);
+              ObjectEntryOID *objectEntryOID1;
+              objectEntryOID1=ObjectEntryOID_find(objectEntryAID,&objectGUID.oid);
+              objectEntryRefreshApp(d,objectEntryOID1);
             }
           } else {
             FREE(ap);
@@ -329,7 +331,8 @@ RTPSVar(ORTEDomain *d,u_int8_t *rtps_msg,MessageInterpret *mi,IPAddress senderIP
             } else
               FREE(pp);
           } else {
-            if (!PublicationList_find(&d->psEntry,&objectGUID)) {
+            if ((!PublicationList_find(&d->psEntry,&objectGUID)) &&
+                csChange->alive) {
               pthread_rwlock_wrlock(&d->psEntry.publicationsLock);
               PublicationList_insert(&d->psEntry,objectEntryOID);
               pthread_rwlock_unlock(&d->psEntry.publicationsLock);
@@ -361,7 +364,8 @@ RTPSVar(ORTEDomain *d,u_int8_t *rtps_msg,MessageInterpret *mi,IPAddress senderIP
             } else
               FREE(sp);
           } else {
-            if (!SubscriptionList_find(&d->psEntry,&objectGUID)) {
+            if ((!SubscriptionList_find(&d->psEntry,&objectGUID)) && 
+                csChange->alive) {
               pthread_rwlock_wrlock(&d->psEntry.subscriptionsLock);
               SubscriptionList_insert(&d->psEntry,objectEntryOID);
               pthread_rwlock_unlock(&d->psEntry.subscriptionsLock);
@@ -423,7 +427,6 @@ NewPublisher(ORTEDomain *d,ObjectEntryOID *op) {
           (fnmatch(pnode->type,pp->typeName,0)==0)) {
         //pattern matched
         // free resources
-        pthread_rwlock_unlock(&d->patternEntry.lock);        
         pthread_rwlock_unlock(&d->readerPublications.lock);        
         pthread_rwlock_unlock(&d->objectEntry.htimRootLock);
         pthread_rwlock_unlock(&d->objectEntry.objRootLock);    
@@ -438,7 +441,6 @@ NewPublisher(ORTEDomain *d,ObjectEntryOID *op) {
         pthread_rwlock_wrlock(&d->objectEntry.objRootLock);    
         pthread_rwlock_wrlock(&d->objectEntry.htimRootLock);
         pthread_rwlock_wrlock(&d->readerPublications.lock);        
-        pthread_rwlock_rdlock(&d->patternEntry.lock);
       }  
     }
   }
index 0610001a04ff0c138a8dc8fd1d32f42af8ec4e07..a3ee80c4fa365b131eff96efcd210d4758d68e13 100644 (file)
@@ -74,6 +74,32 @@ void conv_ntp(NtpTime *ntp,char ef) {
   #endif
 }
 
+/**********************************************************************************/
+//get part of string, div. by semi.
+int
+getStringPart(char *string,char divChar,int iterator,char *buff) {
+  char *cp;
+  int len;
+  
+  if (!string || !buff) return -1;
+  len=strlen(string);
+  if (len<iterator) return -2;
+  cp=string+iterator;
+  while (cp[0]!=0) {  //till is length>0
+    char *dcp,tcp; 
+    dcp=strchr(cp,divChar);
+    if (!dcp) dcp=cp+strlen(cp);
+    tcp=*dcp;         //save ending value
+    *dcp=0;           //temporary end of string
+    strcpy(buff,cp);  
+    *dcp=tcp;         //restore value
+    if (dcp[0]!=0) iterator=dcp-cp+1;//next value
+    else iterator=dcp-cp;
+    return 1;
+  }
+  return 0;
+}
+
 /**********************************************************************************/
 char* 
 IPAddressToString(IPAddress ipAddress,char *buff) {
@@ -87,7 +113,20 @@ IPAddressToString(IPAddress ipAddress,char *buff) {
 /**********************************************************************************/
 IPAddress 
 StringToIPAddress(const char *string) {
-  return ntohl(inet_addr(string));
+  IPAddress ipAddress=IPADDRESS_INVALID;
+  
+  ipAddress=ntohl(inet_addr(string));
+#if defined HAVE_GETHOSTBYNAME
+  {
+    struct hostent *hostname; 
+    if (ipAddress==0) {
+      if ((hostname=gethostbyname(string))) {
+        ipAddress=ntohl(*((long*)(hostname->h_addr_list[0])));
+      }
+    }
+  }
+#endif
+  return ipAddress;
 }
 
 /**********************************************************************************/
index ec4f6db2c4bc9d81b824aba08c2b6b5cd7d66bde..d41e7b697cca6aebfa74c94023a2d59046193d4d 100644 (file)
@@ -47,7 +47,7 @@ eventAdd(ORTEDomain *d,
          NtpTime *when) { 
   NtpTime whenExpire,actualTime;
 
-  debug(10,10) ("eventAdd: start %p %s\n",objectEntryAID,name);
+  debug(10,10) ("eventAdd: AID 0x%x %s\n",objectEntryAID->aid,name);
   actualTime=getActualNtpTime();
   if (when!=NULL) {
     NtpTimeAdd(whenExpire,actualTime,*when);
@@ -101,7 +101,7 @@ eventDetach(ORTEDomain *d,
             ObjectEntryAID *objectEntryAID,
             HTimFncUserNode  *fncNode,
             int where) {
-  debug(10,10) ("eventDetach: start %p\n",objectEntryAID);
+  debug(10,10) ("eventDetach: AID 0x%x\n",objectEntryAID->aid);
   switch (where) {
     case 0:
       htimerUnicastCommon_detach(objectEntryAID,fncNode);
index a6a78d75616651fab4aebc07f39780221e9c1fc1..03b2def394e7af62d39d65b07c65892acd813d1b 100644 (file)
@@ -40,9 +40,12 @@ htimerRoot_run_expired(ORTEDomain *d,
       ul_htim_time_t *pact_time) {
   HTimFncRootNode *timer;
   
+  debug(2,10) ("htimerRoot: start\n");               
   while((timer=htimerRoot_cut_expired(&d->objectEntry, pact_time))){
+    debug(2,10) ("htimerRoot: AID-0x%x\n",timer->objectEntryAID->aid);               
     timer->func(d,timer->objectEntryAID,pact_time);
   }
+  debug(2,10) ("htimerRoot: finished\n");               
 } 
 
 /*****************************************************************************/
index ff3b23ebf6c4196954c43037bb6880c6f3d94fd1..82d0ad8e268828d0a20a90eec60f899e4ca88258 100644 (file)
@@ -70,7 +70,7 @@ objectEntryPurgeTimer(ORTEDomain *d,void *vobjectEntryOID) {
 
 /*****************************************************************************/
 void
-removePublications(ORTEDomain *d,ObjectEntryOID *robjectEntryOID) {
+removeSubscriptionsOnLocalPublications(ORTEDomain *d,ObjectEntryOID *robjectEntryOID) {
   CSTWriter       *cstWriter;
   CSTRemoteReader *cstRemoteReader;
   ObjectEntryOID  *objectEntryOID;
@@ -93,7 +93,7 @@ removePublications(ORTEDomain *d,ObjectEntryOID *robjectEntryOID) {
 
 /*****************************************************************************/
 void
-removeSubscriptions(ORTEDomain *d,ObjectEntryOID *robjectEntryOID) {
+removePublicationsOnLocalSubscriptions(ORTEDomain *d,ObjectEntryOID *robjectEntryOID) {
   CSTReader       *cstReader;
   CSTRemoteWriter *cstRemoteWriter;
   ObjectEntryOID  *objectEntryOID;
@@ -156,8 +156,8 @@ removeApplication(ORTEDomain *d,ObjectEntryOID *robjectEntryOID) {
   CSTReaderDestroyRemoteWriter(d,cstRemoteWriter);
   pthread_rwlock_unlock(&d->readerSubscriptions.lock);
   //destroy all services
-  removePublications(d,robjectEntryOID);
-  removeSubscriptions(d,robjectEntryOID);
+  removePublicationsOnLocalSubscriptions(d,robjectEntryOID);
+  removeSubscriptionsOnLocalPublications(d,robjectEntryOID);
   //destroy all object - the object will be disconneced in objectEntryDelete
   while((objectEntryOID=ObjectEntryOID_first(robjectEntryOID->objectEntryAID))) {
     switch (objectEntryOID->oid & 0x07) {
@@ -331,7 +331,7 @@ objectEntryExpirationTimer(ORTEDomain *d,void *vobjectEntryOID) {
         //increment vargAppsSequenceNumber and make csChange
         SeqNumberInc(d->appParams->vargAppsSequenceNumber,
                      d->appParams->vargAppsSequenceNumber);
-        appSelfParamChanged(d,ORTE_FALSE,ORTE_FALSE,ORTE_TRUE);
+        appSelfParamChanged(d,ORTE_FALSE,ORTE_FALSE,ORTE_TRUE,ORTE_TRUE);
      } else {
        objectEntryDelete(d,objectEntryOID);
        objectEntryOID=NULL;  
@@ -357,6 +357,7 @@ objectEntryExpirationTimer(ORTEDomain *d,void *vobjectEntryOID) {
       case OID_PUBLICATION:
         pthread_rwlock_wrlock(&d->subscriptions.lock);
         gavl_cust_for_each(CSTReader,&d->subscriptions,cstReader) {
+          pthread_rwlock_wrlock(&cstReader->lock);
           cstRemoteWriter=CSTRemoteWriter_find(cstReader,&guid);
           if (cstRemoteWriter) {
             CSTReaderDestroyRemoteWriter(d,cstRemoteWriter);
@@ -366,6 +367,7 @@ objectEntryExpirationTimer(ORTEDomain *d,void *vobjectEntryOID) {
               ORTESubscriptionDestroyLocked(cstReader);
             }
           }
+          pthread_rwlock_unlock(&cstReader->lock);
         }
         pthread_rwlock_unlock(&d->subscriptions.lock);
         pthread_rwlock_wrlock(&d->publications.lock);
@@ -423,9 +425,10 @@ objectEntryExpirationTimer(ORTEDomain *d,void *vobjectEntryOID) {
             NULL,
             objectEntryOID,
             &d->domainProp.baseProp.purgeTime);
-    debug(12,3) ("expired: 0x%x-0x%x marked for remove\n",
+    debug(12,3) ("expired: 0x%x-0x%x-0x%x marked for remove\n",
                  objectEntryOID->objectEntryHID->hid,
-                 objectEntryOID->objectEntryAID->aid);
+                 objectEntryOID->objectEntryAID->aid,
+                objectEntryOID->oid);
   }
   objectEntryDump(&d->objectEntry);
   if (!objectEntryOID) return 2;
index 2135f8762e67c2db172cb42c39f1171ba3715f98..fdd886978e59d4c4da1a23702898fa66de707201 100644 (file)
@@ -220,11 +220,12 @@ getTypeApp(ORTEDomain *d,AppParams *ap,IPAddress senderIPAddress) {
  * @d: pointer to an domain
  * @lock: lock CSTWriters at the start of function
  * @unlock: unlock CSTWriters at the end of function
+ * @alive:
  *
  */
 void 
 appSelfParamChanged(ORTEDomain *d,
-    Boolean lock,Boolean unlock,Boolean forWM) {
+    Boolean lock,Boolean unlock,Boolean forWM,Boolean alive) {
   CSChange     *csChange;
      
   if (lock) {
@@ -234,14 +235,14 @@ appSelfParamChanged(ORTEDomain *d,
   csChange=(CSChange*)MALLOC(sizeof(CSChange));
   parameterUpdateCSChange(csChange,d->appParams,ORTE_TRUE);
   csChange->guid=d->guid;
-  csChange->alive=ORTE_TRUE;
+  csChange->alive=alive;
   csChange->cdrStream.buffer=NULL;
   CSTWriterAddCSChange(d,&d->writerApplicationSelf,csChange);
   if (forWM) {
     csChange=(CSChange*)MALLOC(sizeof(CSChange));
     parameterUpdateCSChange(csChange,d->appParams,ORTE_TRUE);
     csChange->guid=d->guid;
-    csChange->alive=ORTE_TRUE;
+    csChange->alive=alive;
     csChange->cdrStream.buffer=NULL;
     CSTWriterAddCSChange(d,&d->writerManagers,csChange);
   }
index b2b3bddf3d4489d76a6484f0b6c1b3bb307fcb75..8ea0caad1b19b5b94f66d7689002d7d8516a0f5c 100644 (file)
@@ -23,7 +23,7 @@ pthread_rwlock_trywrlock.c
 
 if USE_RTLINUX
 module_PROGRAMS = rtl_pthread_rwlock.ko
-rtl_pthread_rwlock_ko_CFLAGS = $(ORTE_CFLAGS) $(LINUX_CFLAGS) $(RTAI_CFLAGS) $(RTLINUX_CFLAGS)
+#rtl_pthread_rwlock_ko_CFLAGS = $(ORTE_CFLAGS) 
 rtl_pthread_rwlock_ko_SOURCES = $(PTHREAD_RWLOCK_SOURCES)
 rtl_pthread_rwlock_ko_LINK = $(top_builddir)/modtool --link -o $@
 endif
index 35771366a9bd60a387412c30fcdb44ea477d06e9..f35983b738bdd5bc269467fa7cf76593935340e9 100644 (file)
@@ -74,6 +74,7 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 AMTAR = @AMTAR@
 AWK = @AWK@
 CC = @CC@
+CONFIG_ORTE_KERNEL = @CONFIG_ORTE_KERNEL@
 CONFIG_ORTE_RT = @CONFIG_ORTE_RT@
 DEPDIR = @DEPDIR@
 INCLUDES = @INCLUDES@
@@ -126,7 +127,7 @@ pthread_rwlock_trywrlock.c
 
 
 @USE_RTLINUX_TRUE@module_PROGRAMS = rtl_pthread_rwlock.ko
-@USE_RTLINUX_TRUE@rtl_pthread_rwlock_ko_CFLAGS = $(ORTE_CFLAGS) $(LINUX_CFLAGS) $(RTAI_CFLAGS) $(RTLINUX_CFLAGS)
+#rtl_pthread_rwlock_ko_CFLAGS = $(ORTE_CFLAGS) 
 @USE_RTLINUX_TRUE@rtl_pthread_rwlock_ko_SOURCES = $(PTHREAD_RWLOCK_SOURCES)
 @USE_RTLINUX_TRUE@rtl_pthread_rwlock_ko_LINK = $(top_builddir)/modtool --link -o $@
 subdir = orte/liborte/rtl
@@ -137,22 +138,20 @@ CONFIG_CLEAN_FILES =
 @USE_RTLINUX_FALSE@module_PROGRAMS =
 PROGRAMS = $(module_PROGRAMS)
 
-am__objects_1 = \
-       rtl_pthread_rwlock_ko-ptw32_rwlock_check_need_init.$(OBJEXT) \
-       rtl_pthread_rwlock_ko-ptw32_rwlock_cancelwrwait.$(OBJEXT) \
-       rtl_pthread_rwlock_ko-pthread_rwlock_init.$(OBJEXT) \
-       rtl_pthread_rwlock_ko-pthread_rwlock_destroy.$(OBJEXT) \
-       rtl_pthread_rwlock_ko-pthread_rwlockattr_init.$(OBJEXT) \
-       rtl_pthread_rwlock_ko-pthread_rwlockattr_destroy.$(OBJEXT) \
-       rtl_pthread_rwlock_ko-pthread_rwlockattr_getpshared.$(OBJEXT) \
-       rtl_pthread_rwlock_ko-pthread_rwlockattr_setpshared.$(OBJEXT) \
-       rtl_pthread_rwlock_ko-pthread_rwlock_rdlock.$(OBJEXT) \
-       rtl_pthread_rwlock_ko-pthread_rwlock_timedrdlock.$(OBJEXT) \
-       rtl_pthread_rwlock_ko-pthread_rwlock_wrlock.$(OBJEXT) \
-       rtl_pthread_rwlock_ko-pthread_rwlock_timedwrlock.$(OBJEXT) \
-       rtl_pthread_rwlock_ko-pthread_rwlock_unlock.$(OBJEXT) \
-       rtl_pthread_rwlock_ko-pthread_rwlock_tryrdlock.$(OBJEXT) \
-       rtl_pthread_rwlock_ko-pthread_rwlock_trywrlock.$(OBJEXT)
+am__objects_1 = ptw32_rwlock_check_need_init.$(OBJEXT) \
+       ptw32_rwlock_cancelwrwait.$(OBJEXT) \
+       pthread_rwlock_init.$(OBJEXT) pthread_rwlock_destroy.$(OBJEXT) \
+       pthread_rwlockattr_init.$(OBJEXT) \
+       pthread_rwlockattr_destroy.$(OBJEXT) \
+       pthread_rwlockattr_getpshared.$(OBJEXT) \
+       pthread_rwlockattr_setpshared.$(OBJEXT) \
+       pthread_rwlock_rdlock.$(OBJEXT) \
+       pthread_rwlock_timedrdlock.$(OBJEXT) \
+       pthread_rwlock_wrlock.$(OBJEXT) \
+       pthread_rwlock_timedwrlock.$(OBJEXT) \
+       pthread_rwlock_unlock.$(OBJEXT) \
+       pthread_rwlock_tryrdlock.$(OBJEXT) \
+       pthread_rwlock_trywrlock.$(OBJEXT)
 @USE_RTLINUX_TRUE@am_rtl_pthread_rwlock_ko_OBJECTS = $(am__objects_1)
 rtl_pthread_rwlock_ko_OBJECTS = $(am_rtl_pthread_rwlock_ko_OBJECTS)
 rtl_pthread_rwlock_ko_LDADD = $(LDADD)
@@ -166,22 +165,21 @@ LDFLAGS = @LDFLAGS@
 LIBS = @LIBS@
 depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
 am__depfiles_maybe = depfiles
-@AMDEP_TRUE@DEP_FILES = \
-@AMDEP_TRUE@   ./$(DEPDIR)/rtl_pthread_rwlock_ko-pthread_rwlock_destroy.Po \
-@AMDEP_TRUE@   ./$(DEPDIR)/rtl_pthread_rwlock_ko-pthread_rwlock_init.Po \
-@AMDEP_TRUE@   ./$(DEPDIR)/rtl_pthread_rwlock_ko-pthread_rwlock_rdlock.Po \
-@AMDEP_TRUE@   ./$(DEPDIR)/rtl_pthread_rwlock_ko-pthread_rwlock_timedrdlock.Po \
-@AMDEP_TRUE@   ./$(DEPDIR)/rtl_pthread_rwlock_ko-pthread_rwlock_timedwrlock.Po \
-@AMDEP_TRUE@   ./$(DEPDIR)/rtl_pthread_rwlock_ko-pthread_rwlock_tryrdlock.Po \
-@AMDEP_TRUE@   ./$(DEPDIR)/rtl_pthread_rwlock_ko-pthread_rwlock_trywrlock.Po \
-@AMDEP_TRUE@   ./$(DEPDIR)/rtl_pthread_rwlock_ko-pthread_rwlock_unlock.Po \
-@AMDEP_TRUE@   ./$(DEPDIR)/rtl_pthread_rwlock_ko-pthread_rwlock_wrlock.Po \
-@AMDEP_TRUE@   ./$(DEPDIR)/rtl_pthread_rwlock_ko-pthread_rwlockattr_destroy.Po \
-@AMDEP_TRUE@   ./$(DEPDIR)/rtl_pthread_rwlock_ko-pthread_rwlockattr_getpshared.Po \
-@AMDEP_TRUE@   ./$(DEPDIR)/rtl_pthread_rwlock_ko-pthread_rwlockattr_init.Po \
-@AMDEP_TRUE@   ./$(DEPDIR)/rtl_pthread_rwlock_ko-pthread_rwlockattr_setpshared.Po \
-@AMDEP_TRUE@   ./$(DEPDIR)/rtl_pthread_rwlock_ko-ptw32_rwlock_cancelwrwait.Po \
-@AMDEP_TRUE@   ./$(DEPDIR)/rtl_pthread_rwlock_ko-ptw32_rwlock_check_need_init.Po
+@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/pthread_rwlock_destroy.Po \
+@AMDEP_TRUE@   ./$(DEPDIR)/pthread_rwlock_init.Po \
+@AMDEP_TRUE@   ./$(DEPDIR)/pthread_rwlock_rdlock.Po \
+@AMDEP_TRUE@   ./$(DEPDIR)/pthread_rwlock_timedrdlock.Po \
+@AMDEP_TRUE@   ./$(DEPDIR)/pthread_rwlock_timedwrlock.Po \
+@AMDEP_TRUE@   ./$(DEPDIR)/pthread_rwlock_tryrdlock.Po \
+@AMDEP_TRUE@   ./$(DEPDIR)/pthread_rwlock_trywrlock.Po \
+@AMDEP_TRUE@   ./$(DEPDIR)/pthread_rwlock_unlock.Po \
+@AMDEP_TRUE@   ./$(DEPDIR)/pthread_rwlock_wrlock.Po \
+@AMDEP_TRUE@   ./$(DEPDIR)/pthread_rwlockattr_destroy.Po \
+@AMDEP_TRUE@   ./$(DEPDIR)/pthread_rwlockattr_getpshared.Po \
+@AMDEP_TRUE@   ./$(DEPDIR)/pthread_rwlockattr_init.Po \
+@AMDEP_TRUE@   ./$(DEPDIR)/pthread_rwlockattr_setpshared.Po \
+@AMDEP_TRUE@   ./$(DEPDIR)/ptw32_rwlock_cancelwrwait.Po \
+@AMDEP_TRUE@   ./$(DEPDIR)/ptw32_rwlock_check_need_init.Po
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
        $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 CCLD = $(CC)
@@ -223,36 +221,6 @@ uninstall-modulePROGRAMS:
 
 clean-modulePROGRAMS:
        -test -z "$(module_PROGRAMS)" || rm -f $(module_PROGRAMS)
-rtl_pthread_rwlock_ko-ptw32_rwlock_check_need_init.$(OBJEXT): \
-       ptw32_rwlock_check_need_init.c
-rtl_pthread_rwlock_ko-ptw32_rwlock_cancelwrwait.$(OBJEXT): \
-       ptw32_rwlock_cancelwrwait.c
-rtl_pthread_rwlock_ko-pthread_rwlock_init.$(OBJEXT): \
-       pthread_rwlock_init.c
-rtl_pthread_rwlock_ko-pthread_rwlock_destroy.$(OBJEXT): \
-       pthread_rwlock_destroy.c
-rtl_pthread_rwlock_ko-pthread_rwlockattr_init.$(OBJEXT): \
-       pthread_rwlockattr_init.c
-rtl_pthread_rwlock_ko-pthread_rwlockattr_destroy.$(OBJEXT): \
-       pthread_rwlockattr_destroy.c
-rtl_pthread_rwlock_ko-pthread_rwlockattr_getpshared.$(OBJEXT): \
-       pthread_rwlockattr_getpshared.c
-rtl_pthread_rwlock_ko-pthread_rwlockattr_setpshared.$(OBJEXT): \
-       pthread_rwlockattr_setpshared.c
-rtl_pthread_rwlock_ko-pthread_rwlock_rdlock.$(OBJEXT): \
-       pthread_rwlock_rdlock.c
-rtl_pthread_rwlock_ko-pthread_rwlock_timedrdlock.$(OBJEXT): \
-       pthread_rwlock_timedrdlock.c
-rtl_pthread_rwlock_ko-pthread_rwlock_wrlock.$(OBJEXT): \
-       pthread_rwlock_wrlock.c
-rtl_pthread_rwlock_ko-pthread_rwlock_timedwrlock.$(OBJEXT): \
-       pthread_rwlock_timedwrlock.c
-rtl_pthread_rwlock_ko-pthread_rwlock_unlock.$(OBJEXT): \
-       pthread_rwlock_unlock.c
-rtl_pthread_rwlock_ko-pthread_rwlock_tryrdlock.$(OBJEXT): \
-       pthread_rwlock_tryrdlock.c
-rtl_pthread_rwlock_ko-pthread_rwlock_trywrlock.$(OBJEXT): \
-       pthread_rwlock_trywrlock.c
 rtl_pthread_rwlock.ko$(EXEEXT): $(rtl_pthread_rwlock_ko_OBJECTS) $(rtl_pthread_rwlock_ko_DEPENDENCIES) 
        @rm -f rtl_pthread_rwlock.ko$(EXEEXT)
        $(rtl_pthread_rwlock_ko_LINK) $(rtl_pthread_rwlock_ko_LDFLAGS) $(rtl_pthread_rwlock_ko_OBJECTS) $(rtl_pthread_rwlock_ko_LDADD) $(LIBS)
@@ -263,21 +231,21 @@ mostlyclean-compile:
 distclean-compile:
        -rm -f *.tab.c
 
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rtl_pthread_rwlock_ko-pthread_rwlock_destroy.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rtl_pthread_rwlock_ko-pthread_rwlock_init.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rtl_pthread_rwlock_ko-pthread_rwlock_rdlock.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rtl_pthread_rwlock_ko-pthread_rwlock_timedrdlock.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rtl_pthread_rwlock_ko-pthread_rwlock_timedwrlock.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rtl_pthread_rwlock_ko-pthread_rwlock_tryrdlock.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rtl_pthread_rwlock_ko-pthread_rwlock_trywrlock.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rtl_pthread_rwlock_ko-pthread_rwlock_unlock.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rtl_pthread_rwlock_ko-pthread_rwlock_wrlock.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rtl_pthread_rwlock_ko-pthread_rwlockattr_destroy.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rtl_pthread_rwlock_ko-pthread_rwlockattr_getpshared.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rtl_pthread_rwlock_ko-pthread_rwlockattr_init.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rtl_pthread_rwlock_ko-pthread_rwlockattr_setpshared.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rtl_pthread_rwlock_ko-ptw32_rwlock_cancelwrwait.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rtl_pthread_rwlock_ko-ptw32_rwlock_check_need_init.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pthread_rwlock_destroy.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pthread_rwlock_init.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pthread_rwlock_rdlock.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pthread_rwlock_timedrdlock.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pthread_rwlock_timedwrlock.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pthread_rwlock_tryrdlock.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pthread_rwlock_trywrlock.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pthread_rwlock_unlock.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pthread_rwlock_wrlock.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pthread_rwlockattr_destroy.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pthread_rwlockattr_getpshared.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pthread_rwlockattr_init.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pthread_rwlockattr_setpshared.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ptw32_rwlock_cancelwrwait.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ptw32_rwlock_check_need_init.Po@am__quote@
 
 distclean-depend:
        -rm -rf ./$(DEPDIR)
@@ -293,186 +261,6 @@ distclean-depend:
 @AMDEP_TRUE@   depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
 @AMDEP_TRUE@   $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
        $(COMPILE) -c `cygpath -w $<`
-
-rtl_pthread_rwlock_ko-ptw32_rwlock_check_need_init.o: ptw32_rwlock_check_need_init.c
-@AMDEP_TRUE@   source='ptw32_rwlock_check_need_init.c' object='rtl_pthread_rwlock_ko-ptw32_rwlock_check_need_init.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@   depfile='$(DEPDIR)/rtl_pthread_rwlock_ko-ptw32_rwlock_check_need_init.Po' tmpdepfile='$(DEPDIR)/rtl_pthread_rwlock_ko-ptw32_rwlock_check_need_init.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@   $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-       $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(rtl_pthread_rwlock_ko_CFLAGS) $(CFLAGS) -c -o rtl_pthread_rwlock_ko-ptw32_rwlock_check_need_init.o `test -f 'ptw32_rwlock_check_need_init.c' || echo '$(srcdir)/'`ptw32_rwlock_check_need_init.c
-
-rtl_pthread_rwlock_ko-ptw32_rwlock_check_need_init.obj: ptw32_rwlock_check_need_init.c
-@AMDEP_TRUE@   source='ptw32_rwlock_check_need_init.c' object='rtl_pthread_rwlock_ko-ptw32_rwlock_check_need_init.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@   depfile='$(DEPDIR)/rtl_pthread_rwlock_ko-ptw32_rwlock_check_need_init.Po' tmpdepfile='$(DEPDIR)/rtl_pthread_rwlock_ko-ptw32_rwlock_check_need_init.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@   $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-       $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(rtl_pthread_rwlock_ko_CFLAGS) $(CFLAGS) -c -o rtl_pthread_rwlock_ko-ptw32_rwlock_check_need_init.obj `cygpath -w ptw32_rwlock_check_need_init.c`
-
-rtl_pthread_rwlock_ko-ptw32_rwlock_cancelwrwait.o: ptw32_rwlock_cancelwrwait.c
-@AMDEP_TRUE@   source='ptw32_rwlock_cancelwrwait.c' object='rtl_pthread_rwlock_ko-ptw32_rwlock_cancelwrwait.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@   depfile='$(DEPDIR)/rtl_pthread_rwlock_ko-ptw32_rwlock_cancelwrwait.Po' tmpdepfile='$(DEPDIR)/rtl_pthread_rwlock_ko-ptw32_rwlock_cancelwrwait.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@   $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-       $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(rtl_pthread_rwlock_ko_CFLAGS) $(CFLAGS) -c -o rtl_pthread_rwlock_ko-ptw32_rwlock_cancelwrwait.o `test -f 'ptw32_rwlock_cancelwrwait.c' || echo '$(srcdir)/'`ptw32_rwlock_cancelwrwait.c
-
-rtl_pthread_rwlock_ko-ptw32_rwlock_cancelwrwait.obj: ptw32_rwlock_cancelwrwait.c
-@AMDEP_TRUE@   source='ptw32_rwlock_cancelwrwait.c' object='rtl_pthread_rwlock_ko-ptw32_rwlock_cancelwrwait.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@   depfile='$(DEPDIR)/rtl_pthread_rwlock_ko-ptw32_rwlock_cancelwrwait.Po' tmpdepfile='$(DEPDIR)/rtl_pthread_rwlock_ko-ptw32_rwlock_cancelwrwait.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@   $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-       $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(rtl_pthread_rwlock_ko_CFLAGS) $(CFLAGS) -c -o rtl_pthread_rwlock_ko-ptw32_rwlock_cancelwrwait.obj `cygpath -w ptw32_rwlock_cancelwrwait.c`
-
-rtl_pthread_rwlock_ko-pthread_rwlock_init.o: pthread_rwlock_init.c
-@AMDEP_TRUE@   source='pthread_rwlock_init.c' object='rtl_pthread_rwlock_ko-pthread_rwlock_init.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@   depfile='$(DEPDIR)/rtl_pthread_rwlock_ko-pthread_rwlock_init.Po' tmpdepfile='$(DEPDIR)/rtl_pthread_rwlock_ko-pthread_rwlock_init.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@   $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-       $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(rtl_pthread_rwlock_ko_CFLAGS) $(CFLAGS) -c -o rtl_pthread_rwlock_ko-pthread_rwlock_init.o `test -f 'pthread_rwlock_init.c' || echo '$(srcdir)/'`pthread_rwlock_init.c
-
-rtl_pthread_rwlock_ko-pthread_rwlock_init.obj: pthread_rwlock_init.c
-@AMDEP_TRUE@   source='pthread_rwlock_init.c' object='rtl_pthread_rwlock_ko-pthread_rwlock_init.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@   depfile='$(DEPDIR)/rtl_pthread_rwlock_ko-pthread_rwlock_init.Po' tmpdepfile='$(DEPDIR)/rtl_pthread_rwlock_ko-pthread_rwlock_init.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@   $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-       $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(rtl_pthread_rwlock_ko_CFLAGS) $(CFLAGS) -c -o rtl_pthread_rwlock_ko-pthread_rwlock_init.obj `cygpath -w pthread_rwlock_init.c`
-
-rtl_pthread_rwlock_ko-pthread_rwlock_destroy.o: pthread_rwlock_destroy.c
-@AMDEP_TRUE@   source='pthread_rwlock_destroy.c' object='rtl_pthread_rwlock_ko-pthread_rwlock_destroy.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@   depfile='$(DEPDIR)/rtl_pthread_rwlock_ko-pthread_rwlock_destroy.Po' tmpdepfile='$(DEPDIR)/rtl_pthread_rwlock_ko-pthread_rwlock_destroy.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@   $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-       $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(rtl_pthread_rwlock_ko_CFLAGS) $(CFLAGS) -c -o rtl_pthread_rwlock_ko-pthread_rwlock_destroy.o `test -f 'pthread_rwlock_destroy.c' || echo '$(srcdir)/'`pthread_rwlock_destroy.c
-
-rtl_pthread_rwlock_ko-pthread_rwlock_destroy.obj: pthread_rwlock_destroy.c
-@AMDEP_TRUE@   source='pthread_rwlock_destroy.c' object='rtl_pthread_rwlock_ko-pthread_rwlock_destroy.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@   depfile='$(DEPDIR)/rtl_pthread_rwlock_ko-pthread_rwlock_destroy.Po' tmpdepfile='$(DEPDIR)/rtl_pthread_rwlock_ko-pthread_rwlock_destroy.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@   $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-       $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(rtl_pthread_rwlock_ko_CFLAGS) $(CFLAGS) -c -o rtl_pthread_rwlock_ko-pthread_rwlock_destroy.obj `cygpath -w pthread_rwlock_destroy.c`
-
-rtl_pthread_rwlock_ko-pthread_rwlockattr_init.o: pthread_rwlockattr_init.c
-@AMDEP_TRUE@   source='pthread_rwlockattr_init.c' object='rtl_pthread_rwlock_ko-pthread_rwlockattr_init.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@   depfile='$(DEPDIR)/rtl_pthread_rwlock_ko-pthread_rwlockattr_init.Po' tmpdepfile='$(DEPDIR)/rtl_pthread_rwlock_ko-pthread_rwlockattr_init.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@   $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-       $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(rtl_pthread_rwlock_ko_CFLAGS) $(CFLAGS) -c -o rtl_pthread_rwlock_ko-pthread_rwlockattr_init.o `test -f 'pthread_rwlockattr_init.c' || echo '$(srcdir)/'`pthread_rwlockattr_init.c
-
-rtl_pthread_rwlock_ko-pthread_rwlockattr_init.obj: pthread_rwlockattr_init.c
-@AMDEP_TRUE@   source='pthread_rwlockattr_init.c' object='rtl_pthread_rwlock_ko-pthread_rwlockattr_init.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@   depfile='$(DEPDIR)/rtl_pthread_rwlock_ko-pthread_rwlockattr_init.Po' tmpdepfile='$(DEPDIR)/rtl_pthread_rwlock_ko-pthread_rwlockattr_init.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@   $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-       $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(rtl_pthread_rwlock_ko_CFLAGS) $(CFLAGS) -c -o rtl_pthread_rwlock_ko-pthread_rwlockattr_init.obj `cygpath -w pthread_rwlockattr_init.c`
-
-rtl_pthread_rwlock_ko-pthread_rwlockattr_destroy.o: pthread_rwlockattr_destroy.c
-@AMDEP_TRUE@   source='pthread_rwlockattr_destroy.c' object='rtl_pthread_rwlock_ko-pthread_rwlockattr_destroy.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@   depfile='$(DEPDIR)/rtl_pthread_rwlock_ko-pthread_rwlockattr_destroy.Po' tmpdepfile='$(DEPDIR)/rtl_pthread_rwlock_ko-pthread_rwlockattr_destroy.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@   $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-       $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(rtl_pthread_rwlock_ko_CFLAGS) $(CFLAGS) -c -o rtl_pthread_rwlock_ko-pthread_rwlockattr_destroy.o `test -f 'pthread_rwlockattr_destroy.c' || echo '$(srcdir)/'`pthread_rwlockattr_destroy.c
-
-rtl_pthread_rwlock_ko-pthread_rwlockattr_destroy.obj: pthread_rwlockattr_destroy.c
-@AMDEP_TRUE@   source='pthread_rwlockattr_destroy.c' object='rtl_pthread_rwlock_ko-pthread_rwlockattr_destroy.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@   depfile='$(DEPDIR)/rtl_pthread_rwlock_ko-pthread_rwlockattr_destroy.Po' tmpdepfile='$(DEPDIR)/rtl_pthread_rwlock_ko-pthread_rwlockattr_destroy.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@   $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-       $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(rtl_pthread_rwlock_ko_CFLAGS) $(CFLAGS) -c -o rtl_pthread_rwlock_ko-pthread_rwlockattr_destroy.obj `cygpath -w pthread_rwlockattr_destroy.c`
-
-rtl_pthread_rwlock_ko-pthread_rwlockattr_getpshared.o: pthread_rwlockattr_getpshared.c
-@AMDEP_TRUE@   source='pthread_rwlockattr_getpshared.c' object='rtl_pthread_rwlock_ko-pthread_rwlockattr_getpshared.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@   depfile='$(DEPDIR)/rtl_pthread_rwlock_ko-pthread_rwlockattr_getpshared.Po' tmpdepfile='$(DEPDIR)/rtl_pthread_rwlock_ko-pthread_rwlockattr_getpshared.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@   $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-       $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(rtl_pthread_rwlock_ko_CFLAGS) $(CFLAGS) -c -o rtl_pthread_rwlock_ko-pthread_rwlockattr_getpshared.o `test -f 'pthread_rwlockattr_getpshared.c' || echo '$(srcdir)/'`pthread_rwlockattr_getpshared.c
-
-rtl_pthread_rwlock_ko-pthread_rwlockattr_getpshared.obj: pthread_rwlockattr_getpshared.c
-@AMDEP_TRUE@   source='pthread_rwlockattr_getpshared.c' object='rtl_pthread_rwlock_ko-pthread_rwlockattr_getpshared.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@   depfile='$(DEPDIR)/rtl_pthread_rwlock_ko-pthread_rwlockattr_getpshared.Po' tmpdepfile='$(DEPDIR)/rtl_pthread_rwlock_ko-pthread_rwlockattr_getpshared.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@   $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-       $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(rtl_pthread_rwlock_ko_CFLAGS) $(CFLAGS) -c -o rtl_pthread_rwlock_ko-pthread_rwlockattr_getpshared.obj `cygpath -w pthread_rwlockattr_getpshared.c`
-
-rtl_pthread_rwlock_ko-pthread_rwlockattr_setpshared.o: pthread_rwlockattr_setpshared.c
-@AMDEP_TRUE@   source='pthread_rwlockattr_setpshared.c' object='rtl_pthread_rwlock_ko-pthread_rwlockattr_setpshared.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@   depfile='$(DEPDIR)/rtl_pthread_rwlock_ko-pthread_rwlockattr_setpshared.Po' tmpdepfile='$(DEPDIR)/rtl_pthread_rwlock_ko-pthread_rwlockattr_setpshared.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@   $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-       $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(rtl_pthread_rwlock_ko_CFLAGS) $(CFLAGS) -c -o rtl_pthread_rwlock_ko-pthread_rwlockattr_setpshared.o `test -f 'pthread_rwlockattr_setpshared.c' || echo '$(srcdir)/'`pthread_rwlockattr_setpshared.c
-
-rtl_pthread_rwlock_ko-pthread_rwlockattr_setpshared.obj: pthread_rwlockattr_setpshared.c
-@AMDEP_TRUE@   source='pthread_rwlockattr_setpshared.c' object='rtl_pthread_rwlock_ko-pthread_rwlockattr_setpshared.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@   depfile='$(DEPDIR)/rtl_pthread_rwlock_ko-pthread_rwlockattr_setpshared.Po' tmpdepfile='$(DEPDIR)/rtl_pthread_rwlock_ko-pthread_rwlockattr_setpshared.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@   $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-       $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(rtl_pthread_rwlock_ko_CFLAGS) $(CFLAGS) -c -o rtl_pthread_rwlock_ko-pthread_rwlockattr_setpshared.obj `cygpath -w pthread_rwlockattr_setpshared.c`
-
-rtl_pthread_rwlock_ko-pthread_rwlock_rdlock.o: pthread_rwlock_rdlock.c
-@AMDEP_TRUE@   source='pthread_rwlock_rdlock.c' object='rtl_pthread_rwlock_ko-pthread_rwlock_rdlock.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@   depfile='$(DEPDIR)/rtl_pthread_rwlock_ko-pthread_rwlock_rdlock.Po' tmpdepfile='$(DEPDIR)/rtl_pthread_rwlock_ko-pthread_rwlock_rdlock.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@   $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-       $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(rtl_pthread_rwlock_ko_CFLAGS) $(CFLAGS) -c -o rtl_pthread_rwlock_ko-pthread_rwlock_rdlock.o `test -f 'pthread_rwlock_rdlock.c' || echo '$(srcdir)/'`pthread_rwlock_rdlock.c
-
-rtl_pthread_rwlock_ko-pthread_rwlock_rdlock.obj: pthread_rwlock_rdlock.c
-@AMDEP_TRUE@   source='pthread_rwlock_rdlock.c' object='rtl_pthread_rwlock_ko-pthread_rwlock_rdlock.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@   depfile='$(DEPDIR)/rtl_pthread_rwlock_ko-pthread_rwlock_rdlock.Po' tmpdepfile='$(DEPDIR)/rtl_pthread_rwlock_ko-pthread_rwlock_rdlock.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@   $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-       $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(rtl_pthread_rwlock_ko_CFLAGS) $(CFLAGS) -c -o rtl_pthread_rwlock_ko-pthread_rwlock_rdlock.obj `cygpath -w pthread_rwlock_rdlock.c`
-
-rtl_pthread_rwlock_ko-pthread_rwlock_timedrdlock.o: pthread_rwlock_timedrdlock.c
-@AMDEP_TRUE@   source='pthread_rwlock_timedrdlock.c' object='rtl_pthread_rwlock_ko-pthread_rwlock_timedrdlock.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@   depfile='$(DEPDIR)/rtl_pthread_rwlock_ko-pthread_rwlock_timedrdlock.Po' tmpdepfile='$(DEPDIR)/rtl_pthread_rwlock_ko-pthread_rwlock_timedrdlock.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@   $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-       $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(rtl_pthread_rwlock_ko_CFLAGS) $(CFLAGS) -c -o rtl_pthread_rwlock_ko-pthread_rwlock_timedrdlock.o `test -f 'pthread_rwlock_timedrdlock.c' || echo '$(srcdir)/'`pthread_rwlock_timedrdlock.c
-
-rtl_pthread_rwlock_ko-pthread_rwlock_timedrdlock.obj: pthread_rwlock_timedrdlock.c
-@AMDEP_TRUE@   source='pthread_rwlock_timedrdlock.c' object='rtl_pthread_rwlock_ko-pthread_rwlock_timedrdlock.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@   depfile='$(DEPDIR)/rtl_pthread_rwlock_ko-pthread_rwlock_timedrdlock.Po' tmpdepfile='$(DEPDIR)/rtl_pthread_rwlock_ko-pthread_rwlock_timedrdlock.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@   $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-       $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(rtl_pthread_rwlock_ko_CFLAGS) $(CFLAGS) -c -o rtl_pthread_rwlock_ko-pthread_rwlock_timedrdlock.obj `cygpath -w pthread_rwlock_timedrdlock.c`
-
-rtl_pthread_rwlock_ko-pthread_rwlock_wrlock.o: pthread_rwlock_wrlock.c
-@AMDEP_TRUE@   source='pthread_rwlock_wrlock.c' object='rtl_pthread_rwlock_ko-pthread_rwlock_wrlock.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@   depfile='$(DEPDIR)/rtl_pthread_rwlock_ko-pthread_rwlock_wrlock.Po' tmpdepfile='$(DEPDIR)/rtl_pthread_rwlock_ko-pthread_rwlock_wrlock.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@   $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-       $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(rtl_pthread_rwlock_ko_CFLAGS) $(CFLAGS) -c -o rtl_pthread_rwlock_ko-pthread_rwlock_wrlock.o `test -f 'pthread_rwlock_wrlock.c' || echo '$(srcdir)/'`pthread_rwlock_wrlock.c
-
-rtl_pthread_rwlock_ko-pthread_rwlock_wrlock.obj: pthread_rwlock_wrlock.c
-@AMDEP_TRUE@   source='pthread_rwlock_wrlock.c' object='rtl_pthread_rwlock_ko-pthread_rwlock_wrlock.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@   depfile='$(DEPDIR)/rtl_pthread_rwlock_ko-pthread_rwlock_wrlock.Po' tmpdepfile='$(DEPDIR)/rtl_pthread_rwlock_ko-pthread_rwlock_wrlock.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@   $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-       $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(rtl_pthread_rwlock_ko_CFLAGS) $(CFLAGS) -c -o rtl_pthread_rwlock_ko-pthread_rwlock_wrlock.obj `cygpath -w pthread_rwlock_wrlock.c`
-
-rtl_pthread_rwlock_ko-pthread_rwlock_timedwrlock.o: pthread_rwlock_timedwrlock.c
-@AMDEP_TRUE@   source='pthread_rwlock_timedwrlock.c' object='rtl_pthread_rwlock_ko-pthread_rwlock_timedwrlock.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@   depfile='$(DEPDIR)/rtl_pthread_rwlock_ko-pthread_rwlock_timedwrlock.Po' tmpdepfile='$(DEPDIR)/rtl_pthread_rwlock_ko-pthread_rwlock_timedwrlock.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@   $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-       $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(rtl_pthread_rwlock_ko_CFLAGS) $(CFLAGS) -c -o rtl_pthread_rwlock_ko-pthread_rwlock_timedwrlock.o `test -f 'pthread_rwlock_timedwrlock.c' || echo '$(srcdir)/'`pthread_rwlock_timedwrlock.c
-
-rtl_pthread_rwlock_ko-pthread_rwlock_timedwrlock.obj: pthread_rwlock_timedwrlock.c
-@AMDEP_TRUE@   source='pthread_rwlock_timedwrlock.c' object='rtl_pthread_rwlock_ko-pthread_rwlock_timedwrlock.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@   depfile='$(DEPDIR)/rtl_pthread_rwlock_ko-pthread_rwlock_timedwrlock.Po' tmpdepfile='$(DEPDIR)/rtl_pthread_rwlock_ko-pthread_rwlock_timedwrlock.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@   $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-       $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(rtl_pthread_rwlock_ko_CFLAGS) $(CFLAGS) -c -o rtl_pthread_rwlock_ko-pthread_rwlock_timedwrlock.obj `cygpath -w pthread_rwlock_timedwrlock.c`
-
-rtl_pthread_rwlock_ko-pthread_rwlock_unlock.o: pthread_rwlock_unlock.c
-@AMDEP_TRUE@   source='pthread_rwlock_unlock.c' object='rtl_pthread_rwlock_ko-pthread_rwlock_unlock.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@   depfile='$(DEPDIR)/rtl_pthread_rwlock_ko-pthread_rwlock_unlock.Po' tmpdepfile='$(DEPDIR)/rtl_pthread_rwlock_ko-pthread_rwlock_unlock.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@   $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-       $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(rtl_pthread_rwlock_ko_CFLAGS) $(CFLAGS) -c -o rtl_pthread_rwlock_ko-pthread_rwlock_unlock.o `test -f 'pthread_rwlock_unlock.c' || echo '$(srcdir)/'`pthread_rwlock_unlock.c
-
-rtl_pthread_rwlock_ko-pthread_rwlock_unlock.obj: pthread_rwlock_unlock.c
-@AMDEP_TRUE@   source='pthread_rwlock_unlock.c' object='rtl_pthread_rwlock_ko-pthread_rwlock_unlock.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@   depfile='$(DEPDIR)/rtl_pthread_rwlock_ko-pthread_rwlock_unlock.Po' tmpdepfile='$(DEPDIR)/rtl_pthread_rwlock_ko-pthread_rwlock_unlock.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@   $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-       $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(rtl_pthread_rwlock_ko_CFLAGS) $(CFLAGS) -c -o rtl_pthread_rwlock_ko-pthread_rwlock_unlock.obj `cygpath -w pthread_rwlock_unlock.c`
-
-rtl_pthread_rwlock_ko-pthread_rwlock_tryrdlock.o: pthread_rwlock_tryrdlock.c
-@AMDEP_TRUE@   source='pthread_rwlock_tryrdlock.c' object='rtl_pthread_rwlock_ko-pthread_rwlock_tryrdlock.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@   depfile='$(DEPDIR)/rtl_pthread_rwlock_ko-pthread_rwlock_tryrdlock.Po' tmpdepfile='$(DEPDIR)/rtl_pthread_rwlock_ko-pthread_rwlock_tryrdlock.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@   $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-       $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(rtl_pthread_rwlock_ko_CFLAGS) $(CFLAGS) -c -o rtl_pthread_rwlock_ko-pthread_rwlock_tryrdlock.o `test -f 'pthread_rwlock_tryrdlock.c' || echo '$(srcdir)/'`pthread_rwlock_tryrdlock.c
-
-rtl_pthread_rwlock_ko-pthread_rwlock_tryrdlock.obj: pthread_rwlock_tryrdlock.c
-@AMDEP_TRUE@   source='pthread_rwlock_tryrdlock.c' object='rtl_pthread_rwlock_ko-pthread_rwlock_tryrdlock.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@   depfile='$(DEPDIR)/rtl_pthread_rwlock_ko-pthread_rwlock_tryrdlock.Po' tmpdepfile='$(DEPDIR)/rtl_pthread_rwlock_ko-pthread_rwlock_tryrdlock.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@   $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-       $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(rtl_pthread_rwlock_ko_CFLAGS) $(CFLAGS) -c -o rtl_pthread_rwlock_ko-pthread_rwlock_tryrdlock.obj `cygpath -w pthread_rwlock_tryrdlock.c`
-
-rtl_pthread_rwlock_ko-pthread_rwlock_trywrlock.o: pthread_rwlock_trywrlock.c
-@AMDEP_TRUE@   source='pthread_rwlock_trywrlock.c' object='rtl_pthread_rwlock_ko-pthread_rwlock_trywrlock.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@   depfile='$(DEPDIR)/rtl_pthread_rwlock_ko-pthread_rwlock_trywrlock.Po' tmpdepfile='$(DEPDIR)/rtl_pthread_rwlock_ko-pthread_rwlock_trywrlock.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@   $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-       $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(rtl_pthread_rwlock_ko_CFLAGS) $(CFLAGS) -c -o rtl_pthread_rwlock_ko-pthread_rwlock_trywrlock.o `test -f 'pthread_rwlock_trywrlock.c' || echo '$(srcdir)/'`pthread_rwlock_trywrlock.c
-
-rtl_pthread_rwlock_ko-pthread_rwlock_trywrlock.obj: pthread_rwlock_trywrlock.c
-@AMDEP_TRUE@   source='pthread_rwlock_trywrlock.c' object='rtl_pthread_rwlock_ko-pthread_rwlock_trywrlock.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@   depfile='$(DEPDIR)/rtl_pthread_rwlock_ko-pthread_rwlock_trywrlock.Po' tmpdepfile='$(DEPDIR)/rtl_pthread_rwlock_ko-pthread_rwlock_trywrlock.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@   $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-       $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(rtl_pthread_rwlock_ko_CFLAGS) $(CFLAGS) -c -o rtl_pthread_rwlock_ko-pthread_rwlock_trywrlock.obj `cygpath -w pthread_rwlock_trywrlock.c`
 CCDEPMODE = @CCDEPMODE@
 uninstall-info-am:
 
index 7dcaa18bb0fecaf8406d3e5c0463f95e2981132f..08f475692a5b7eae0808b7ea4ca40ebd1e57c776 100644 (file)
@@ -3,7 +3,7 @@
 
 rtlinux_LIBRARIES = pthread_rwlock
 
-rtlinux_INCLUDES = -I $(srcdir)/../../include 
+rtlinux_INCLUDES = -I $(srcdir)/../../include -DORTE_OMK_RTL
 
 pthread_rwlock_SOURCES = \
 ptw32_rwlock_check_need_init.c \
index a481d1c609a0b6ad75a474c75bc93320e0effece..998aa10cba876a3e25bd2eed6c70150158679f8f 100644 (file)
@@ -167,12 +167,6 @@ sock_get_local_interfaces(sock_t *sock,ORTEIFProp *IFProp,char *IFCount) {
     }
   }
   return 0;
-#elif defined(SOCK_RTAI)
-
-
-//insert code !!!
-
-
 #elif defined(SOCK_WIN)
   INTERFACE_INFO      InterfaceList[MAX_INTERFACES];
   struct sockaddr_in* pAddress;
index b1abf1b7164cca420fcf6184b2abcb3168a2a5c0..655e950bd59ddf9de09aaa5a34738bf3f837de9f 100644 (file)
@@ -14,7 +14,8 @@
   and only GNU license will apply.
  *******************************************************************/
 
-#include <string.h>
+//#include <string.h>
+#include <orte.h>
 #include "ul_gavl.h"
 
 int 
index 4ae099883ce8b0e8c914b7907ae266bdc9d0a9a3..8244e700c3507455c492009ed032b913d52f4cd8 100644 (file)
@@ -31,7 +31,7 @@
 31 - ORTEPublication.c
 32 - ORTEPublicationTimer.c
 33 - ORTESubscription.c
-34 -
+34 - ORTEMisc.c
 35 -
 36 -
 37 -
index bef98f388359a27e96a7e653688c09f98fffd870..dfdf469ca7ef179a974468f7852d3b3b7e0f4293 100644 (file)
@@ -1,13 +1,13 @@
 if CONFIG_ORTE_RT
-  module_PROGRAMS = rt_ORTEManager.ko 
-  rt_ORTEManager_ko_CFLAGS = $(ORTE_CFLAGS) $(LINUX_CFLAGS) $(RTAI_CFLAGS) $(RTLINUX_CFLAGS)
-  rt_ORTEManager_ko_SOURCES = ORTEManager.c  
-  rt_ORTEManager_ko_LINK = $(top_builddir)/modtool --link -o $@
+  module_PROGRAMS = rt_ortemanager.ko 
+  rt_ortemanager_ko_CFLAGS = $(ORTE_CFLAGS) 
+  rt_ortemanager_ko_SOURCES = ortemanager.c  
+  rt_ortemanager_ko_LINK = $(top_builddir)/modtool --link -o $@
 else
-bin_PROGRAMS = ORTEManager
-ORTEManager_SOURCES = ORTEManager.c
+bin_PROGRAMS = ortemanager
+ortemanager_SOURCES = ortemanager.c
 if CONFIG_ORTE_WIN
   win_libs= $(top_srcdir)/orte/contrib/win_pthread/libpthreadGC.a 
 endif
-ORTEManager_LDADD   = ../liborte/liborte.a $(win_libs)
+ortemanager_LDADD   = ../liborte/liborte.a $(win_libs)
 endif
index 22138bf5ee90f09d0f6b4503758cf11d05d8ef7c..38f95950f80fba3de01619af3769a848e570bdda 100644 (file)
@@ -68,6 +68,7 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 AMTAR = @AMTAR@
 AWK = @AWK@
 CC = @CC@
+CONFIG_ORTE_KERNEL = @CONFIG_ORTE_KERNEL@
 CONFIG_ORTE_RT = @CONFIG_ORTE_RT@
 DEPDIR = @DEPDIR@
 INCLUDES = @INCLUDES@
@@ -100,40 +101,40 @@ am__quote = @am__quote@
 install_sh = @install_sh@
 modulePROGRAMS_INSTALL = @modulePROGRAMS_INSTALL@
 moduledir = @moduledir@
-@CONFIG_ORTE_RT_TRUE@module_PROGRAMS = rt_ORTEManager.ko 
-@CONFIG_ORTE_RT_TRUE@rt_ORTEManager_ko_CFLAGS = $(ORTE_CFLAGS) $(LINUX_CFLAGS) $(RTAI_CFLAGS) $(RTLINUX_CFLAGS)
-@CONFIG_ORTE_RT_TRUE@rt_ORTEManager_ko_SOURCES = ORTEManager.c  
-@CONFIG_ORTE_RT_TRUE@rt_ORTEManager_ko_LINK = $(top_builddir)/modtool --link -o $@
-@CONFIG_ORTE_RT_FALSE@bin_PROGRAMS = ORTEManager
-@CONFIG_ORTE_RT_FALSE@ORTEManager_SOURCES = ORTEManager.c
+@CONFIG_ORTE_RT_TRUE@module_PROGRAMS = rt_ortemanager.ko 
+@CONFIG_ORTE_RT_TRUE@rt_ortemanager_ko_CFLAGS = $(ORTE_CFLAGS) 
+@CONFIG_ORTE_RT_TRUE@rt_ortemanager_ko_SOURCES = ortemanager.c  
+@CONFIG_ORTE_RT_TRUE@rt_ortemanager_ko_LINK = $(top_builddir)/modtool --link -o $@
+@CONFIG_ORTE_RT_FALSE@bin_PROGRAMS = ortemanager
+@CONFIG_ORTE_RT_FALSE@ortemanager_SOURCES = ortemanager.c
 @CONFIG_ORTE_RT_FALSE@@CONFIG_ORTE_WIN_TRUE@win_libs = $(top_srcdir)/orte/contrib/win_pthread/libpthreadGC.a 
-@CONFIG_ORTE_RT_FALSE@ORTEManager_LDADD = ../liborte/liborte.a $(win_libs)
+@CONFIG_ORTE_RT_FALSE@ortemanager_LDADD = ../liborte/liborte.a $(win_libs)
 subdir = orte/manager
 mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
 CONFIG_HEADER = $(top_builddir)/orte/include/config.h
 CONFIG_CLEAN_FILES =
 @CONFIG_ORTE_RT_TRUE@bin_PROGRAMS =
-@CONFIG_ORTE_RT_FALSE@bin_PROGRAMS = ORTEManager$(EXEEXT)
-@CONFIG_ORTE_RT_TRUE@module_PROGRAMS = rt_ORTEManager.ko$(EXEEXT)
+@CONFIG_ORTE_RT_FALSE@bin_PROGRAMS = ortemanager$(EXEEXT)
+@CONFIG_ORTE_RT_TRUE@module_PROGRAMS = rt_ortemanager.ko$(EXEEXT)
 @CONFIG_ORTE_RT_FALSE@module_PROGRAMS =
 PROGRAMS = $(bin_PROGRAMS) $(module_PROGRAMS)
 
-@CONFIG_ORTE_RT_FALSE@am_ORTEManager_OBJECTS = ORTEManager.$(OBJEXT)
-ORTEManager_OBJECTS = $(am_ORTEManager_OBJECTS)
-@CONFIG_ORTE_RT_FALSE@@CONFIG_ORTE_WIN_TRUE@ORTEManager_DEPENDENCIES = \
+@CONFIG_ORTE_RT_FALSE@am_ortemanager_OBJECTS = ortemanager.$(OBJEXT)
+ortemanager_OBJECTS = $(am_ortemanager_OBJECTS)
+@CONFIG_ORTE_RT_FALSE@@CONFIG_ORTE_WIN_TRUE@ortemanager_DEPENDENCIES = \
 @CONFIG_ORTE_RT_FALSE@@CONFIG_ORTE_WIN_TRUE@   ../liborte/liborte.a \
 @CONFIG_ORTE_RT_FALSE@@CONFIG_ORTE_WIN_TRUE@   $(top_srcdir)/orte/contrib/win_pthread/libpthreadGC.a
-@CONFIG_ORTE_RT_FALSE@@CONFIG_ORTE_WIN_FALSE@ORTEManager_DEPENDENCIES = \
+@CONFIG_ORTE_RT_FALSE@@CONFIG_ORTE_WIN_FALSE@ortemanager_DEPENDENCIES = \
 @CONFIG_ORTE_RT_FALSE@@CONFIG_ORTE_WIN_FALSE@  ../liborte/liborte.a
-@CONFIG_ORTE_RT_TRUE@@CONFIG_ORTE_WIN_TRUE@ORTEManager_DEPENDENCIES =
-@CONFIG_ORTE_RT_TRUE@@CONFIG_ORTE_WIN_FALSE@ORTEManager_DEPENDENCIES =
-ORTEManager_LDFLAGS =
-@CONFIG_ORTE_RT_TRUE@am_rt_ORTEManager_ko_OBJECTS = \
-@CONFIG_ORTE_RT_TRUE@  rt_ORTEManager_ko-ORTEManager.$(OBJEXT)
-rt_ORTEManager_ko_OBJECTS = $(am_rt_ORTEManager_ko_OBJECTS)
-rt_ORTEManager_ko_LDADD = $(LDADD)
-rt_ORTEManager_ko_DEPENDENCIES =
-rt_ORTEManager_ko_LDFLAGS =
+@CONFIG_ORTE_RT_TRUE@@CONFIG_ORTE_WIN_TRUE@ortemanager_DEPENDENCIES =
+@CONFIG_ORTE_RT_TRUE@@CONFIG_ORTE_WIN_FALSE@ortemanager_DEPENDENCIES =
+ortemanager_LDFLAGS =
+@CONFIG_ORTE_RT_TRUE@am_rt_ortemanager_ko_OBJECTS = \
+@CONFIG_ORTE_RT_TRUE@  rt_ortemanager_ko-ortemanager.$(OBJEXT)
+rt_ortemanager_ko_OBJECTS = $(am_rt_ortemanager_ko_OBJECTS)
+rt_ortemanager_ko_LDADD = $(LDADD)
+rt_ortemanager_ko_DEPENDENCIES =
+rt_ortemanager_ko_LDFLAGS =
 
 DEFS = @DEFS@
 DEFAULT_INCLUDES =  -I. -I$(srcdir) -I$(top_builddir)/orte/include
@@ -142,16 +143,16 @@ LDFLAGS = @LDFLAGS@
 LIBS = @LIBS@
 depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
 am__depfiles_maybe = depfiles
-@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/ORTEManager.Po \
-@AMDEP_TRUE@   ./$(DEPDIR)/rt_ORTEManager_ko-ORTEManager.Po
+@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/ortemanager.Po \
+@AMDEP_TRUE@   ./$(DEPDIR)/rt_ortemanager_ko-ortemanager.Po
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
        $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 CCLD = $(CC)
 LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
 CFLAGS = @CFLAGS@
-DIST_SOURCES = $(ORTEManager_SOURCES) $(rt_ORTEManager_ko_SOURCES)
+DIST_SOURCES = $(ortemanager_SOURCES) $(rt_ortemanager_ko_SOURCES)
 DIST_COMMON = Makefile.am Makefile.in
-SOURCES = $(ORTEManager_SOURCES) $(rt_ORTEManager_ko_SOURCES)
+SOURCES = $(ortemanager_SOURCES) $(rt_ortemanager_ko_SOURCES)
 
 all: all-am
 
@@ -209,13 +210,13 @@ uninstall-modulePROGRAMS:
 
 clean-modulePROGRAMS:
        -test -z "$(module_PROGRAMS)" || rm -f $(module_PROGRAMS)
-ORTEManager$(EXEEXT): $(ORTEManager_OBJECTS) $(ORTEManager_DEPENDENCIES) 
-       @rm -f ORTEManager$(EXEEXT)
-       $(LINK) $(ORTEManager_LDFLAGS) $(ORTEManager_OBJECTS) $(ORTEManager_LDADD) $(LIBS)
-rt_ORTEManager_ko-ORTEManager.$(OBJEXT): ORTEManager.c
-rt_ORTEManager.ko$(EXEEXT): $(rt_ORTEManager_ko_OBJECTS) $(rt_ORTEManager_ko_DEPENDENCIES) 
-       @rm -f rt_ORTEManager.ko$(EXEEXT)
-       $(rt_ORTEManager_ko_LINK) $(rt_ORTEManager_ko_LDFLAGS) $(rt_ORTEManager_ko_OBJECTS) $(rt_ORTEManager_ko_LDADD) $(LIBS)
+ortemanager$(EXEEXT): $(ortemanager_OBJECTS) $(ortemanager_DEPENDENCIES) 
+       @rm -f ortemanager$(EXEEXT)
+       $(LINK) $(ortemanager_LDFLAGS) $(ortemanager_OBJECTS) $(ortemanager_LDADD) $(LIBS)
+rt_ortemanager_ko-ortemanager.$(OBJEXT): ortemanager.c
+rt_ortemanager.ko$(EXEEXT): $(rt_ortemanager_ko_OBJECTS) $(rt_ortemanager_ko_DEPENDENCIES) 
+       @rm -f rt_ortemanager.ko$(EXEEXT)
+       $(rt_ortemanager_ko_LINK) $(rt_ortemanager_ko_LDFLAGS) $(rt_ortemanager_ko_OBJECTS) $(rt_ortemanager_ko_LDADD) $(LIBS)
 
 mostlyclean-compile:
        -rm -f *.$(OBJEXT) core *.core
@@ -223,8 +224,8 @@ mostlyclean-compile:
 distclean-compile:
        -rm -f *.tab.c
 
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ORTEManager.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rt_ORTEManager_ko-ORTEManager.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ortemanager.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rt_ortemanager_ko-ortemanager.Po@am__quote@
 
 distclean-depend:
        -rm -rf ./$(DEPDIR)
@@ -241,17 +242,17 @@ distclean-depend:
 @AMDEP_TRUE@   $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
        $(COMPILE) -c `cygpath -w $<`
 
-rt_ORTEManager_ko-ORTEManager.o: ORTEManager.c
-@AMDEP_TRUE@   source='ORTEManager.c' object='rt_ORTEManager_ko-ORTEManager.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@   depfile='$(DEPDIR)/rt_ORTEManager_ko-ORTEManager.Po' tmpdepfile='$(DEPDIR)/rt_ORTEManager_ko-ORTEManager.TPo' @AMDEPBACKSLASH@
+rt_ortemanager_ko-ortemanager.o: ortemanager.c
+@AMDEP_TRUE@   source='ortemanager.c' object='rt_ortemanager_ko-ortemanager.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@   depfile='$(DEPDIR)/rt_ortemanager_ko-ortemanager.Po' tmpdepfile='$(DEPDIR)/rt_ortemanager_ko-ortemanager.TPo' @AMDEPBACKSLASH@
 @AMDEP_TRUE@   $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-       $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(rt_ORTEManager_ko_CFLAGS) $(CFLAGS) -c -o rt_ORTEManager_ko-ORTEManager.o `test -f 'ORTEManager.c' || echo '$(srcdir)/'`ORTEManager.c
+       $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(rt_ortemanager_ko_CFLAGS) $(CFLAGS) -c -o rt_ortemanager_ko-ortemanager.o `test -f 'ortemanager.c' || echo '$(srcdir)/'`ortemanager.c
 
-rt_ORTEManager_ko-ORTEManager.obj: ORTEManager.c
-@AMDEP_TRUE@   source='ORTEManager.c' object='rt_ORTEManager_ko-ORTEManager.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@   depfile='$(DEPDIR)/rt_ORTEManager_ko-ORTEManager.Po' tmpdepfile='$(DEPDIR)/rt_ORTEManager_ko-ORTEManager.TPo' @AMDEPBACKSLASH@
+rt_ortemanager_ko-ortemanager.obj: ortemanager.c
+@AMDEP_TRUE@   source='ortemanager.c' object='rt_ortemanager_ko-ortemanager.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@   depfile='$(DEPDIR)/rt_ortemanager_ko-ortemanager.Po' tmpdepfile='$(DEPDIR)/rt_ortemanager_ko-ortemanager.TPo' @AMDEPBACKSLASH@
 @AMDEP_TRUE@   $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-       $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(rt_ORTEManager_ko_CFLAGS) $(CFLAGS) -c -o rt_ORTEManager_ko-ORTEManager.obj `cygpath -w ORTEManager.c`
+       $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(rt_ortemanager_ko_CFLAGS) $(CFLAGS) -c -o rt_ortemanager_ko-ortemanager.obj `cygpath -w ortemanager.c`
 CCDEPMODE = @CCDEPMODE@
 uninstall-info-am:
 
index a8d567ab49ea24e28633d44ed1c99d2a85b38d32..ec0f47b85eb6b8c2723cefc356180bcde901387c 100644 (file)
@@ -1,7 +1,18 @@
-INCLUDES = -D_OMK_UNIX
+bin_PROGRAMS = ortemanager
 
-bin_PROGRAMS = ORTEManager
+INCLUDES = -I $(srcdir)/../include -DORTE_OMK_UNIX
 
-ORTEManager_SOURCES = ORTEManager.c
+ortemanager_SOURCES = ortemanager.c
 
 lib_LOADLIBES =  orte pthread
+
+#############################################################################
+# RT-Linux version of build
+
+rtlinux_MODULES = rt_ortemanager
+               
+rtlinux_INCLUDES = -I $(srcdir)/../include -DORTE_OMK_RTL
+
+rt_ortemanager_SOURCES = ortemanager.c
+
+rtlinux_LOADLIBES =  orte_rt pthread_rwlock
diff --git a/orte/manager/make_with_ccmalloc b/orte/manager/make_with_ccmalloc
deleted file mode 100755 (executable)
index 149b2c4..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-rm -f FILE.log
-rm -f ORTEManager
-gcc  -O0 -g3   -o ORTEManager  ORTEManager.o ../liborte/liborte.a  -lpthread -lccmalloc -ldl
\ No newline at end of file
similarity index 82%
rename from orte/manager/ORTEManager.c
rename to orte/manager/ortemanager.c
index 98e344daa0b082b10a9c6fe59136f1d8df93b533..1334480ea4de834060524e0a1121654133dd037b 100644 (file)
  *  GNU General Public License for more details.
  *
  */
-#ifdef HAVE_CONFIG_H
-  #include <orte_config.h>
-#endif
-
-#ifdef CONFIG_ORTE_RTAI
-  #include <linux/module.h>
-  #include <rtai.h>
-  #include <rtai_sched.h>
-  #include <rtai_sem.h>
-#else
-  #include <stdio.h>
-  #include <stdlib.h>
-  #include <string.h>
-  #ifdef _WIN32
-    #include <getopt.h>
-  #elif defined __RTL__
-  #else
-    #include <sys/types.h>
-    #include <sys/stat.h>
-    #include <pthread.h>
-    #include <getopt.h>
-    #include <signal.h>
-    #define _UNIX
-  #endif
-#endif
-
-#include "orte_api.h"
+#include "orte.h"
 
 #ifndef CONFIG_ORTE_RT
 Boolean
@@ -62,7 +37,7 @@ onMgrAppDelete(const struct ORTEAppInfo *appInfo, void *param) {
          appInfo->hostId,appInfo->appId);
 }
 
-#ifdef _UNIX
+#ifdef CONFIG_ORTE_UNIX
 pthread_mutex_t     mutex;
 void sig_usr(int signo) {
   if ((signo==SIGTERM) || (signo==SIGINT)) {
@@ -98,14 +73,14 @@ static int daemon_init(void) {
 static void usage(void) {
   printf("usage: ORTEManager <parameters> \n");
   printf("  -p, --peer <IPAdd:IPAdd:...>  possible locations of fellow managers\n");
-  printf("  -k, --key  <IPAdd>            manager's additional key\n");
+  printf("  -k, --key  <IPAdd:IPAdd:...>  manualy assigned manager's keys\n");
   printf("  -d, --domain <domain>         working manager domain\n");
   printf("  -v, --verbosity <level>       set verbosity level SECTION, up to LEVEL:...\n");
   printf("      examples: ORTEManager -v 51,7:32,5 sections 51 and 32\n");
   printf("                ORTEManager -v ALL,7     all sections up to level 7\n");
   printf("  -R, --refresh <s>             refresh period in second(s)\n");
   printf("  -P, --purge <s>               purge time in second(s)\n");
-#ifdef _UNIX
+#ifdef CONFIG_ORTE_UNIX
   printf("  -D, --daemon                  start program like daemon\n");
 #endif
   printf("  -E, --expiration <s>          expiration time of manager in second(s)\n");
@@ -123,7 +98,7 @@ int main(int argc,char *argv[]) {
     { "verbosity",1,0, 'v' },
     { "refresh",1,0, 'R' },
     { "purge",1,0, 'P' },
-#ifdef _UNIX
+#ifdef CONFIG_ORTE_UNIX
     { "daemon",1,0, 'D' },
 #endif
     { "expiration",1,0, 'E' },
@@ -133,16 +108,12 @@ int main(int argc,char *argv[]) {
     { "help",  0, 0, 'h' },
     { 0, 0, 0, 0}
   };
-  ORTEDomain                 *d;
-  ORTEDomainProp           dp;
+  ORTEDomain         *d;
+  ORTEDomainProp      dp;
   int32_t             opt,domain=ORTE_DEFAULT_DOMAIN;
-  Boolean                        daemon=ORTE_FALSE,start_sending_thread=ORTE_FALSE;
+  Boolean            daemon=ORTE_FALSE;
   ORTEDomainAppEvents *events=NULL;
 
-  #ifdef _UNIX
-  start_sending_thread=ORTE_TRUE;
-  #endif
-
   ORTEInit();
   ORTEDomainPropDefaultGet(&dp);
 
@@ -152,7 +123,7 @@ int main(int argc,char *argv[]) {
         dp.mgrs=strdup(optarg);
         break;
       case 'k':
-        dp.mgrAddKey=StringToIPAddress(strdup(optarg));
+        dp.keys=strdup(optarg);
         break;
       case 'd':
         domain=strtol(optarg,NULL,0);
@@ -198,45 +169,65 @@ int main(int argc,char *argv[]) {
   if (!d)
     exit(1);
 
-  #ifdef _UNIX
+  #ifdef CONFIG_ORTE_UNIX
   if (daemon)
     daemon_init();
   #endif
 
   ORTEDomainStart(d,ORTE_TRUE,ORTE_FALSE,ORTE_FALSE);
-  if (!start_sending_thread) {
+  #ifndef CONFIG_ORTE_UNIX
+    d->taskSend.terminate=ORTE_FALSE;
     ORTEAppSendThread(d);
-  }
+  #endif
   ORTEDomainStart(d,ORTE_FALSE,ORTE_FALSE,ORTE_TRUE);
 
-  #ifdef _UNIX
+  #ifdef CONFIG_ORTE_UNIX
   waitForEndingCommand();
   ORTEDomainMgrDestroy(d);
-  if (events)
+  if (dp.mgrs) 
+    free(dp.mgrs);
+  if (dp.keys) 
+    free(dp.keys);
+  if (events) 
     free(events);
   #endif
 
   exit(0);
 }
 #else
+char *verbosity="";
+MODULE_PARM(verbosity,"1s");
+MODULE_PARM_DESC(verbosity,"set verbosity level SECTION, up to LEVEL:...");
+char *peer="";
+MODULE_PARM(peer,"1s");
+MODULE_PARM_DESC(peer,"possible locations of fellow managers");
 MODULE_LICENSE("GPL");
-ORTEDomain          *d;
+ORTEDomain *d=NULL;
+pthread_t  thread;
 
-void
-createManager(void) {
-  ORTEInit();
-  ORTEVerbositySetOptions("ALL,2");
-  d=ORTEDomainMgrCreate(ORTE_DEFAULT_DOMAIN,NULL,NULL,ORTE_FALSE);
+void *
+domainDestroy(void *arg) {
+  if (!d) return NULL;
+  ORTEDomainMgrDestroy(d);
+  return arg;
 }
 
+
 int
 init_module(void) {
-  createManager();
+  ORTEDomainProp      dp;
+
+  ORTEInit();
+  ORTEDomainPropDefaultGet(&dp);
+  ORTEVerbositySetOptions(verbosity);
+  dp.mgrs=peer;
+  d=ORTEDomainMgrCreate(ORTE_DEFAULT_DOMAIN,&dp,NULL,ORTE_FALSE);
   return 0;
 }
 void
 cleanup_module(void) {
-  if (d)
-    ORTEDomainMgrDestroy(d);
+  if (!d) return;
+  pthread_create(&thread,NULL,&domainDestroy,NULL);
+  pthread_join(thread,NULL);
 }
 #endif
similarity index 79%
rename from orte/manager/rc/ORTEManagerd
rename to orte/manager/rc/ortemanagerd
index f0f993ec81d2be46d870b53603aad757dc25ab92..864bb0c047a8d64651a0c2fbb7dfe4252ff8bd6d 100755 (executable)
 # See how we were called.
 case "$1" in
   start)
-       echo -n "Starting ORTEManager: "
+       echo -n "Starting ortemanager: "
 
        daemon ORTEManager -D
        RETVAL=$?
        ;;
   stop)
-       echo -n "Stopping ORTEManager: "
+       echo -n "Stopping ortemanager: "
        killproc ORTEManager
        RETVAL=$?
        echo
@@ -34,7 +34,7 @@ case "$1" in
        RETVAL=$?
        ;;
   *)
-       echo "Usage: ORTEManager {start|stop|status|restart|reload}"
+       echo "Usage: ortemanagerd {start|stop|status|restart|reload}"
        exit 1
 esac
 
diff --git a/readme b/readme
index 8360fe131a8d1e1ac042fed95a358e97f40c9d93..bec79b1cacb11c0ba63c37eeb8cc22caa8462b16 100644 (file)
--- a/readme
+++ b/readme
@@ -1,42 +1,60 @@
-                ORTE - OCERA Real-Time Ethernet
+                   ORTE - OCERA Real-Time Ethernet
 
+What is it?
+-----------
 The ORTE is open source implementation of RTPS communication protocol 
 defined by Real Time Innovations (http://www.rti.com). 
 RTPS is new application layer protocol targeted to real-time communication 
 area, which is build on top of standard UDP stack.
 
-Supported targets:
+Which targets are supported by ORTE?
+--------------------------
 Linux
 Windows - MinGW, MSVC
-RTLinux - need to fix UDP (Miquele or Ismael Ripoll), call function bind 
-with port 0, doesn't give any free port.
+RTLinux
+RTAI
 
-To build: 
+How to install it?
+------------------
 simply untar instalation package into desired directory, enter this 
 directory and issue following commands.
 
+UserSpace compilation:
 ./configure
 make 
 make install
 
-after this procedure ORTEManager and ORTEPing are placed in /usr/local/bin.
+after this procedure ortemanager and orteping are placed in /usr/local/bin.
 
-To start:
-run :ORTEManager &
-see :ORTEManager -h for usaged
-note:ORTEManager have to run during all communication. For future work can 
-be added into /etc/init.d/... script for starting ORTEManager during boot
+RTLinux compilation:
+./configure --with-rtlinuxdir=/rtlinux dir/ --with-linuxdir=/patched linux dir/
+make 
+make install
+
+RTAI compilation:
+./configure --with-rtaidir=/rtai dir/ --with-linuxdir=/patched linux dir/
+make 
+make install
+
+
+How to start?
+-------------
+run :ortemanager &
+see :ortemanager -h for usaged
+note:ortemanager have to run during all communication. For future work can 
+be added into /etc/init.d/... script for starting ortemanager during boot
 of machine. This script (redhat and mandrake) is placed in 
-"orte/manager/rc/ORTEManagerd"
-For developping a RT application, ORTEManager can be running in userspace.
+"orte/manager/rc/ortemanagerd"
+For developping a RT application, ortemnager can be running in userspace.
 Start it with parameter "-k 192.168.4.2". This address is IP address of 
 RT application.
 
-To test communication:
-in a shell try to type "ORTEPing -p -s". So, now will be created one publisher
+How to test communication?
+-------------------------
+in a shell try to type "orteping -p -s". So, now will be created one publisher
 and one subscriber with same topic and type. If you see messages like
 
-[root@localhost ORTEPing]# ./ORTEPing -p -s
+[root@localhost ORTEPing]# ./orteping -p -s
 sent issue 1
 received fresh issue 1
 sent issue 2
@@ -44,12 +62,16 @@ received fresh issue 2
 sent issue 3
 received fresh issue 3
 
-communication works. If you see only sending messsages, it's sign that ORTEManager 
+communication works. If you see only sending messsages, it's sign that ortemanager 
 is not probably running.
-See "ORTEPing -h" for usaged.
+See "orteping -h" for usaged.
 
 Now, you can develop self applications (see documentation).
 
+
+
+
+
 Feedback is welcome - send bug reports, enhancements, checks, money
 orders, etc. to the address below.