Download
Getting Started
Members
Projects
Community
Marketplace
Events
Planet Eclipse
Newsletter
Videos
Participate
Report a Bug
Forums
Mailing Lists
Wiki
IRC
How to Contribute
Working Groups
Automotive
Internet of Things
LocationTech
Long-Term Support
PolarSys
Science
OpenMDM
More
Community
Marketplace
Events
Planet Eclipse
Newsletter
Videos
Participate
Report a Bug
Forums
Mailing Lists
Wiki
IRC
How to Contribute
Working Groups
Automotive
Internet of Things
LocationTech
Long-Term Support
PolarSys
Science
OpenMDM
Toggle navigation
Bugzilla – Attachment 117488 Details for
Bug 68111
Porting Agent Controller to MAC OS
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Requests
|
Help
|
Log In
[x]
|
Terms of Use
|
Copyright Agent
Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read
this important communication.
Patch for Agent Controller 4.5
ac-patch-4.5.0.txt (text/plain), 213.18 KB, created by
Paul Klicnik
on 2008-11-10 16:45:20 EST
(
hide
)
Description:
Patch for Agent Controller 4.5
Filename:
MIME Type:
Creator:
Paul Klicnik
Created:
2008-11-10 16:45:20 EST
Size:
213.18 KB
patch
obsolete
>### Eclipse Workspace Patch 1.0 >#P org.eclipse.tptp.platform.agentcontroller >Index: src-native-new/src/transport/socketTL/SocketTL.make >=================================================================== >RCS file: /cvsroot/tptp/platform/org.eclipse.tptp.platform.agentcontroller/src-native-new/src/transport/socketTL/SocketTL.make,v >retrieving revision 1.8 >diff -u -r1.8 SocketTL.make >--- src-native-new/src/transport/socketTL/SocketTL.make 31 Oct 2007 15:43:07 -0000 1.8 >+++ src-native-new/src/transport/socketTL/SocketTL.make 10 Nov 2008 20:34:26 -0000 >@@ -3,7 +3,7 @@ > # > # makefile: socketTL project > # >-# $Id: SocketTL.make,v 1.8 2007/10/31 15:43:07 samwai Exp $ >+# $Id: SocketTL.make,v 1.1.6.4 2008/11/10 19:15:29 pklicnik Exp $ > ################################################################################ > > >@@ -27,8 +27,11 @@ > if [ x$VERSIONNUM = x ]; then export VERSIONNUM=0; fi > if [ x$MINORNUM = x ]; then export MINORNUM=0; fi > if [ x$RELEASENUM = x ]; then export RELEASENUM=0; fi >+export VERSIONNUM=5 >+export MINORNUM=0 >+export RELEASENUM=0 > >-TARGETLIB := $(TARGET).so >+TARGETLIB := $(TARGET).dylib > TARGETSONAME := $(TARGETLIB).$(VERSIONNUM) > TARGETREALNAME := $(TARGETSONAME).$(MINORNUM).$(RELEASENUM) > >@@ -72,11 +75,11 @@ > # > #----------------------------------- > >-CFLAGS := $(C_FLAGS) $(DEBUGABLE) -Wall $(OPTIMIZABLE) -fPIC $(addprefix -I,$(INCLUDEDIRS)) -D_LINUX_X86 >+CFLAGS := $(C_FLAGS) $(DEBUGABLE) -Wall $(OPTIMIZABLE) -fPIC $(addprefix -I,$(INCLUDEDIRS)) > > CXXFLAGS := $(CFLAGS) > >-LINKOPTS := $(L_FLAGS) $(DEBUGABLE) -shared -Wl,-soname,$(TARGETSONAME) -o $(TARGETDIR)/$(TARGETREALNAME) $(addprefix -L,$(LIBDIRS)) >+LINKOPTS := $(L_FLAGS) $(DEBUGABLE) -undefined dynamic_lookup -dynamiclib -o $(TARGETDIR)/$(TARGETREALNAME) $(addprefix -L,$(LIBDIRS)) > > > #----------------------------------- >@@ -124,4 +127,4 @@ > $(CC) $(LINKOPTS) $(OBJS) $(addprefix -l,$(LIBS)) > $(CREATELINK) $(TARGETREALNAME) $(TARGETDIR)/$(TARGETSONAME) > $(CREATELINK) $(TARGETSONAME) $(TARGETDIR)/$(TARGETLIB) >- >+ $(CREATELINK) $(TARGETREALNAME) $(TARGETDIR)/$(TARGET).jnilib >Index: src-native-new/src/transport/TptpJSSE/tptpJSSE.make >=================================================================== >RCS file: /cvsroot/tptp/platform/org.eclipse.tptp.platform.agentcontroller/src-native-new/src/transport/TptpJSSE/tptpJSSE.make,v >retrieving revision 1.3 >diff -u -r1.3 tptpJSSE.make >--- src-native-new/src/transport/TptpJSSE/tptpJSSE.make 1 Feb 2008 21:12:23 -0000 1.3 >+++ src-native-new/src/transport/TptpJSSE/tptpJSSE.make 10 Nov 2008 20:34:26 -0000 >@@ -3,7 +3,7 @@ > # > # makefile: TptpJSSE project > # >-# $Id: tptpJSSE.make,v 1.3 2008/02/01 21:12:23 jkubasta Exp $ >+# $Id: tptpJSSE.make,v 1.1.6.4 2008/11/10 19:15:30 pklicnik Exp $ > ################################################################################ > > >@@ -27,6 +27,9 @@ > if [ x$VERSIONNUM = x ]; then export VERSIONNUM=0; fi > if [ x$MINORNUM = x ]; then export MINORNUM=0; fi > if [ x$RELEASENUM = x ]; then export RELEASENUM=0; fi >+export VERSIONNUM=5 >+export MINORNUM=0 >+export RELEASENUM=0 > > TARGETLIB := $(TARGET).so > TARGETSONAME := $(TARGETLIB).$(VERSIONNUM) >@@ -37,20 +40,20 @@ > # list of additional INCLUDE directories to search headers from > # (separated by blanks) > #----------------------------------- >-INCLUDEDIRS := . ../../../include $(JAVA_HOME)/include $(JAVA_HOME)/include/linux >+INCLUDEDIRS := . ../../../include /System/Library/Frameworks/JavaVM.framework/Versions/CurrentJDK/Headers/ > > > #----------------------------------- > # list of additional libraries to be linked with > # (separated by blanks) > #----------------------------------- >-LIBS := tptpJava >+LIBS := tptpJava stdc++ > > #----------------------------------- > # list of additional library directories to search from > # (separated by blanks) > #----------------------------------- >-LIBDIRS := ../../../lib $(JAVA_HOME)/lib >+LIBDIRS := ../../../lib /System/Library/Frameworks/JavaVM.framework/Versions/CurrentJDK/Libraries/ > > > #----------------------------------- >@@ -72,11 +75,11 @@ > # > #----------------------------------- > >-CFLAGS := $(C_FLAGS) $(DEBUGABLE) -Wall $(OPTIMIZABLE) -fPIC $(addprefix -I,$(INCLUDEDIRS)) -D_LINUX_X86 >+CFLAGS := $(C_FLAGS) $(DEBUGABLE) -Wall $(OPTIMIZABLE) -fPIC $(addprefix -I,$(INCLUDEDIRS)) > > CXXFLAGS := $(CFLAGS) > >-LINKOPTS := $(L_FLAGS) $(DEBUGABLE) -shared -Wl,-soname,$(TARGETSONAME) -o $(TARGETDIR)/$(TARGETREALNAME) $(addprefix -L,$(LIBDIRS)) >+LINKOPTS := $(L_FLAGS) $(DEBUGABLE) -undefined dynamic_lookup -dynamiclib -o $(TARGETDIR)/$(TARGETREALNAME) $(addprefix -L,$(LIBDIRS)) > > > #----------------------------------- >@@ -124,4 +127,4 @@ > $(CC) $(LINKOPTS) $(OBJS) $(addprefix -l,$(LIBS)) > $(CREATELINK) $(TARGETREALNAME) $(TARGETDIR)/$(TARGETSONAME) > $(CREATELINK) $(TARGETSONAME) $(TARGETDIR)/$(TARGETLIB) >- >+ $(CREATELINK) $(TARGETREALNAME) $(TARGETDIR)/$(TARGET).jnilib >Index: src-native-new/src/transport/TptpJSSE/tptpConfig.h >=================================================================== >RCS file: /cvsroot/tptp/platform/org.eclipse.tptp.platform.agentcontroller/src-native-new/src/transport/TptpJSSE/tptpConfig.h,v >retrieving revision 1.3 >diff -u -r1.3 tptpConfig.h >--- src-native-new/src/transport/TptpJSSE/tptpConfig.h 6 Feb 2008 12:40:59 -0000 1.3 >+++ src-native-new/src/transport/TptpJSSE/tptpConfig.h 10 Nov 2008 20:34:26 -0000 >@@ -4,14 +4,18 @@ > * are made available under the terms of the Eclipse Public License v1.0 > * which accompanies this distribution, and is available at > * http://www.eclipse.org/legal/epl-v10.html >- * $Id: tptpConfig.h,v 1.3 2008/02/06 12:40:59 ialelekov Exp $ >+ * $Id: tptpConfig.h,v 1.1.6.1 2008/10/02 13:43:08 pklicnik Exp $ > * > * Contributors: > * IBM - Initial API and implementation > **********************************************************************/ > > #include "stdio.h" >-#include "malloc.h" >+#ifdef __APPLE__ >+ #include <stdlib.h> >+#else >+ #include <malloc.h> >+#endif > > #define KEYSTORE_FILENAME "KeystoreFilename" > #define KEYSTORE_PASSWORD "KeystorePassword" >Index: src-native-new/build/build_tptp_ac.script64 >=================================================================== >RCS file: /cvsroot/tptp/platform/org.eclipse.tptp.platform.agentcontroller/src-native-new/build/build_tptp_ac.script64,v >retrieving revision 1.18 >diff -u -r1.18 build_tptp_ac.script64 >--- src-native-new/build/build_tptp_ac.script64 14 May 2008 18:12:51 -0000 1.18 >+++ src-native-new/build/build_tptp_ac.script64 10 Nov 2008 20:34:23 -0000 >@@ -12,7 +12,7 @@ > # or > # $ bash buil_tptp_ac.script "-n veryclean" > # >-# $Id: build_tptp_ac.script64,v 1.18 2008/05/14 18:12:51 jkubasta Exp $ >+# $Id: build_tptp_ac.script64,v 1.1 2008/06/17 16:11:25 jcayne Exp $ > #-------------------------------------------------- > > >Index: src-native-new/build/build_tptp_ac.script >=================================================================== >RCS file: /cvsroot/tptp/platform/org.eclipse.tptp.platform.agentcontroller/src-native-new/build/build_tptp_ac.script,v >retrieving revision 1.33 >diff -u -r1.33 build_tptp_ac.script >--- src-native-new/build/build_tptp_ac.script 14 May 2008 18:12:51 -0000 1.33 >+++ src-native-new/build/build_tptp_ac.script 10 Nov 2008 20:34:23 -0000 >@@ -12,7 +12,7 @@ > # or > # $ bash buil_tptp_ac.script "-n veryclean" > # >-# $Id: build_tptp_ac.script,v 1.33 2008/05/14 18:12:51 jkubasta Exp $ >+# $Id: build_tptp_ac.script,v 1.1.6.2 2008/10/06 12:58:01 pklicnik Exp $ > #-------------------------------------------------- > > >@@ -23,8 +23,8 @@ > if [ x$XERCESC_HOME = x ]; then export XERCESC_HOME=`pwd`/../../../depends/xerces-c-src_2_6_0; fi > if [ x$JAVA_HOME = x ]; then export JAVA_HOME=`pwd`/../../../depends/java; fi > if [ x$CBE_SDK_HOME = x ]; then export CBE_SDK_HOME=`pwd`/../../../depends/CBE_SDK_HOME; fi >-if [ x$OPTIMIZABLE = x ]; then export OPTIMIZABLE=-O3; fi >-#if [ x$DEBUGABLE = x ]; then export DEBUGABLE=-g; fi >+#if [ x$OPTIMIZABLE = x ]; then export OPTIMIZABLE=-O3; fi >+if [ x$DEBUGABLE = x ]; then export DEBUGABLE=-g; fi > > export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:../bin:$XERCESC_HOME/lib: > NUM_FAILURES=0 >@@ -86,10 +86,6 @@ > > echo "----------------------------------------------" > >-make -C ../src/transport/TptpJSSE -f tptpJSSE.make $1 || NUM_FAILURES=`expr $NUM_FAILURES + 1` FAILURES="$FAILURES\nTptpJSSE" >- >-echo "----------------------------------------------" >- > make -C ../src/transport/socketTL -f SocketTL.make $1 || NUM_FAILURES=`expr $NUM_FAILURES + 1` FAILURES="$FAILURES\nsocketTL" > > echo "----------------------------------------------" >Index: src-native-new/build/build_tptp_samples.script >=================================================================== >RCS file: /cvsroot/tptp/platform/org.eclipse.tptp.platform.agentcontroller/src-native-new/build/build_tptp_samples.script,v >retrieving revision 1.15 >diff -u -r1.15 build_tptp_samples.script >--- src-native-new/build/build_tptp_samples.script 19 Mar 2007 03:14:38 -0000 1.15 >+++ src-native-new/build/build_tptp_samples.script 10 Nov 2008 20:34:23 -0000 >@@ -13,7 +13,7 @@ > # or > # $ bash build_tptp_samples.script "-n veryclean" > # >-# $Id: build_tptp_samples.script,v 1.15 2007/03/19 03:14:38 rsmith Exp $ >+# $Id: build_tptp_samples.script,v 1.1 2008/06/17 16:11:25 jcayne Exp $ > #-------------------------------------------------- > > >Index: src-native-new/build/build_tptp_stress_tests.script >=================================================================== >RCS file: /cvsroot/tptp/platform/org.eclipse.tptp.platform.agentcontroller/src-native-new/build/build_tptp_stress_tests.script,v >retrieving revision 1.1 >diff -u -r1.1 build_tptp_stress_tests.script >--- src-native-new/build/build_tptp_stress_tests.script 7 Nov 2005 20:51:59 -0000 1.1 >+++ src-native-new/build/build_tptp_stress_tests.script 10 Nov 2008 20:34:23 -0000 >@@ -13,7 +13,7 @@ > # or > # $ bash build_tptp_samples.script "-n veryclean" > # >-# $Id$ >+# $Id: build_tptp_stress_tests.script,v 1.1 2008/06/17 16:11:25 jcayne Exp $ > #-------------------------------------------------- > > >Index: src-native-new/src/agents/perfmon/rac/rac.make >=================================================================== >RCS file: /cvsroot/tptp/platform/org.eclipse.tptp.platform.agentcontroller/src-native-new/src/agents/perfmon/rac/rac.make,v >retrieving revision 1.1 >diff -u -r1.1 rac.make >--- src-native-new/src/agents/perfmon/rac/rac.make 2 Apr 2007 18:05:36 -0000 1.1 >+++ src-native-new/src/agents/perfmon/rac/rac.make 10 Nov 2008 20:34:24 -0000 >@@ -74,7 +74,7 @@ > > DEFINES := -DLINUX > >-CFLAGS := $(C_FLAGS) $(DEBUGABLE) -Wall $(OPTIMIZABLE) -fPIC $(addprefix -I,$(INCLUDEDIRS)) -D_LINUX_X86 $(DEFINES) >+CFLAGS := $(C_FLAGS) $(DEBUGABLE) -Wall $(OPTIMIZABLE) -fPIC $(addprefix -I,$(INCLUDEDIRS)) $(DEFINES) > > CXXFLAGS := $(CFLAGS) > >Index: src-native-new/src/HCLauncher/hclaunch.make >=================================================================== >RCS file: /cvsroot/tptp/platform/org.eclipse.tptp.platform.agentcontroller/src-native-new/src/HCLauncher/hclaunch.make,v >retrieving revision 1.1 >diff -u -r1.1 hclaunch.make >--- src-native-new/src/HCLauncher/hclaunch.make 2 Apr 2007 18:05:31 -0000 1.1 >+++ src-native-new/src/HCLauncher/hclaunch.make 10 Nov 2008 20:34:23 -0000 >@@ -27,8 +27,11 @@ > if [ x$VERSIONNUM = x ]; then export VERSIONNUM=0; fi > if [ x$MINORNUM = x ]; then export MINORNUM=0; fi > if [ x$RELEASENUM = x ]; then export RELEASENUM=0; fi >+export VERSIONNUM=5 >+export MINORNUM=0 >+export RELEASENUM=0 > >-TARGETLIB := $(TARGET).so >+TARGETLIB := $(TARGET).dylib > TARGETSONAME := $(TARGETLIB).$(VERSIONNUM) > TARGETREALNAME := $(TARGETSONAME).$(MINORNUM).$(RELEASENUM) > >@@ -37,7 +40,7 @@ > # list of additional INCLUDE directories to search headers from > # (separated by blanks) > #----------------------------------- >-INCLUDEDIRS := . ../../include ../transport/RACommon $(JAVA_HOME)/include $(JAVA_HOME)/include/linux >+INCLUDEDIRS := . ../../include ../transport/RACommon /System/Library/Frameworks/JavaVM.framework/Versions/CurrentJDK/Headers/ > > > #----------------------------------- >@@ -74,11 +77,11 @@ > > DEFINES := -DSQLUNIX -DSQLLinux -DENW -DREENTRANT -D_REENTRANT -DCONFIG_X86_CMPXCHG > >-CFLAGS := $(C_FLAGS) $(DEBUGABLE) -Wall $(OPTIMIZABLE) -fPIC $(addprefix -I,$(INCLUDEDIRS)) -D_LINUX_X86 $(DEFINES) >+CFLAGS := $(C_FLAGS) $(DEBUGABLE) -Wall $(OPTIMIZABLE) -fPIC $(addprefix -I,$(INCLUDEDIRS)) $(DEFINES) > > CXXFLAGS := $(CFLAGS) > >-LINKOPTS := $(L_FLAGS) $(DEBUGABLE) -shared -Wl,-soname,$(TARGETSONAME) -o $(TARGETDIR)/$(TARGETREALNAME) $(addprefix -L,$(LIBDIRS)) >+LINKOPTS := $(L_FLAGS) $(DEBUGABLE) -undefined dynamic_lookup -dynamiclib -single_module -o $(TARGETDIR)/$(TARGETREALNAME) $(addprefix -L,$(LIBDIRS)) > > > #----------------------------------- >@@ -126,4 +129,4 @@ > $(CC) $(LINKOPTS) $(OBJS) $(addprefix -l,$(LIBS)) > $(CREATELINK) $(TARGETREALNAME) $(TARGETDIR)/$(TARGETSONAME) > $(CREATELINK) $(TARGETSONAME) $(TARGETDIR)/$(TARGETLIB) >- >+ $(CREATELINK) $(TARGETREALNAME) $(TARGETDIR)/$(TARGET).jnilib >Index: src-native-new/bin/ACStart.sh >=================================================================== >RCS file: /cvsroot/tptp/platform/org.eclipse.tptp.platform.agentcontroller/src-native-new/bin/ACStart.sh,v >retrieving revision 1.7 >diff -u -r1.7 ACStart.sh >--- src-native-new/bin/ACStart.sh 28 Feb 2008 15:12:18 -0000 1.7 >+++ src-native-new/bin/ACStart.sh 10 Nov 2008 20:34:22 -0000 >@@ -55,7 +55,7 @@ > # Start the ACServer > # > RUNNING=`ps -ae | grep "ACServer" | wc -l` >-if [ $RUNNING -ne 0 ];then >+if [ $RUNNING -ne 1 ];then > ps -ae | grep "ACServer" | awk '{ > print "The server is already running on pid " $1 > }' >Index: src-native-new/bin/readme.txt >=================================================================== >RCS file: /cvsroot/tptp/platform/org.eclipse.tptp.platform.agentcontroller/src-native-new/bin/readme.txt,v >retrieving revision 1.18 >diff -u -r1.18 readme.txt >--- src-native-new/bin/readme.txt 20 Mar 2007 13:30:14 -0000 1.18 >+++ src-native-new/bin/readme.txt 10 Nov 2008 20:34:23 -0000 >@@ -4,7 +4,7 @@ > * are made available under the terms of the Eclipse Public License v1.0 > * which accompanies this distribution, and is available at > * http://www.eclipse.org/legal/epl-v10.html >- * $Id: readme.txt,v 1.18 2007/03/20 13:30:14 jkubasta Exp $ >+ * $Id: readme.txt,v 1.1 2008/06/17 16:11:26 jcayne Exp $ > ****************************************************************************/ > > Contributors: >Index: src-native-new/samples/SampleClient/TimeDataProcessor.cpp >=================================================================== >RCS file: /cvsroot/tptp/platform/org.eclipse.tptp.platform.agentcontroller/src-native-new/samples/SampleClient/TimeDataProcessor.cpp,v >retrieving revision 1.7 >diff -u -r1.7 TimeDataProcessor.cpp >--- src-native-new/samples/SampleClient/TimeDataProcessor.cpp 31 Oct 2005 05:21:35 -0000 1.7 >+++ src-native-new/samples/SampleClient/TimeDataProcessor.cpp 10 Nov 2008 20:34:23 -0000 >@@ -9,13 +9,15 @@ > * Vishnu K Naikawadi, Intel - Sample implementation of IDataProcessor for > * handling data coming from TimeCollector agent. > * >- * $Id: TimeDataProcessor.cpp,v 1.7 2005/10/31 05:21:35 rsmith Exp $ >+ * $Id: TimeDataProcessor.cpp,v 1.1.6.1 2008/10/16 20:56:18 pklicnik Exp $ > * > *******************************************************************************/ > > #include <iostream> > #include <memory.h> >-#include <malloc.h> >+#ifndef __APPLE__ >+ #include <malloc.h> >+#endif > #include "TimeDataProcessor.h" > > using namespace std; >Index: src-native-new/samples/SampleClient/SampleClient.make >=================================================================== >RCS file: /cvsroot/tptp/platform/org.eclipse.tptp.platform.agentcontroller/src-native-new/samples/SampleClient/SampleClient.make,v >retrieving revision 1.8 >diff -u -r1.8 SampleClient.make >--- src-native-new/samples/SampleClient/SampleClient.make 15 Jan 2008 11:58:49 -0000 1.8 >+++ src-native-new/samples/SampleClient/SampleClient.make 10 Nov 2008 20:34:23 -0000 >@@ -3,7 +3,7 @@ > # > # makefile: client project > # >-# $Id: SampleClient.make,v 1.8 2008/01/15 11:58:49 ialelekov Exp $ >+# $Id: SampleClient.make,v 1.1.6.2 2008/11/10 19:15:30 pklicnik Exp $ > ################################################################################ > > >@@ -27,7 +27,7 @@ > # list of additional libraries to be linked with > # (separated by blanks) > #----------------------------------- >-LIBS := uuid dl tptpClient xerces-c transportSupport tptpUtils tptpConfig processControlUtil hcclco hcclsm hccls >+LIBS := dl tptpClient xerces-c transportSupport tptpUtils tptpConfig processControlUtil hcclco hcclsm hccls > > #----------------------------------- > # list of additional library directories to search from >@@ -55,7 +55,7 @@ > # > #----------------------------------- > >-CFLAGS := $(C_FLAGS) $(DEBUGABLE) -Wall $(OPTIMIZABLE) -fPIC $(addprefix -I,$(INCLUDEDIRS)) -D_LINUX_X86 >+CFLAGS := $(C_FLAGS) $(DEBUGABLE) -Wall $(OPTIMIZABLE) -fPIC $(addprefix -I,$(INCLUDEDIRS)) > > CXXFLAGS := $(CFLAGS) > >Index: src-native-new/src/shared/TPTPUtil/TPTPList.c >=================================================================== >RCS file: /cvsroot/tptp/platform/org.eclipse.tptp.platform.agentcontroller/src-native-new/src/shared/TPTPUtil/TPTPList.c,v >retrieving revision 1.5 >diff -u -r1.5 TPTPList.c >--- src-native-new/src/shared/TPTPUtil/TPTPList.c 23 Sep 2005 23:30:57 -0000 1.5 >+++ src-native-new/src/shared/TPTPUtil/TPTPList.c 10 Nov 2008 20:34:25 -0000 >@@ -7,11 +7,15 @@ > * > * Contributors: > * Andy Kaylor, Intel - Initial API and Implementation >- * $Id: TPTPList.c,v 1.5 2005/09/23 23:30:57 kcallaghan Exp $ >+ * $Id: TPTPList.c,v 1.1.6.1 2008/10/02 13:43:08 pklicnik Exp $ > *******************************************************************************/ > > #include "tptp/TPTPUtils.h" >-#include <malloc.h> >+#ifdef __APPLE__ >+ #include <stdlib.h> >+#else >+ #include <malloc.h> >+#endif > > void tptp_list_init( tptp_list_t* list ) > { >Index: src-native-new/src/shared/TPTPUtil/TPTPUtil.cpp >=================================================================== >RCS file: /cvsroot/tptp/platform/org.eclipse.tptp.platform.agentcontroller/src-native-new/src/shared/TPTPUtil/TPTPUtil.cpp,v >retrieving revision 1.41 >diff -u -r1.41 TPTPUtil.cpp >--- src-native-new/src/shared/TPTPUtil/TPTPUtil.cpp 13 May 2008 15:51:46 -0000 1.41 >+++ src-native-new/src/shared/TPTPUtil/TPTPUtil.cpp 10 Nov 2008 20:34:25 -0000 >@@ -7,7 +7,7 @@ > * > * Contributors: > * Guru Nagarajan, Intel - - Initial API and Implementation >- * $Id: TPTPUtil.cpp,v 1.41 2008/05/13 15:51:46 jcayne Exp $ >+ * $Id: TPTPUtil.cpp,v 1.1.6.1 2008/10/02 13:43:08 pklicnik Exp $ > *******************************************************************************/ > > #include <xercesc/util/PlatformUtils.hpp> >@@ -26,7 +26,11 @@ > > #include <stdlib.h> > #include <stdio.h> >-#include <malloc.h> >+#ifdef __APPLE__ >+ #include <stdlib.h> >+#else >+ #include <malloc.h> >+#endif > > #include "tptp/TPTPUtils.h" > #include "tptp/TPTPConfig.h" >@@ -45,7 +49,9 @@ > #include <errno.h> > #include <sys/stat.h> > #include <sys/types.h> >- #include <linux/stat.h> //for mode S_IXUSR >+ #ifndef __APPLE__ >+ #include <linux/stat.h> //for mode S_IXUSR >+ #endif > #define STAT stat > #include <signal.h> > #include <sys/wait.h> >Index: src-native-new/src/shared/TPTPUtil/TPTPMem.c >=================================================================== >RCS file: /cvsroot/tptp/platform/org.eclipse.tptp.platform.agentcontroller/src-native-new/src/shared/TPTPUtil/TPTPMem.c,v >retrieving revision 1.4 >diff -u -r1.4 TPTPMem.c >--- src-native-new/src/shared/TPTPUtil/TPTPMem.c 5 Aug 2005 00:40:55 -0000 1.4 >+++ src-native-new/src/shared/TPTPUtil/TPTPMem.c 10 Nov 2008 20:34:25 -0000 >@@ -7,12 +7,16 @@ > * > * Contributors: > * Andy Kaylor, Intel - Initial API and Implementation >- * $Id: TPTPMem.c,v 1.4 2005/08/05 00:40:55 kcallaghan Exp $ >+ * $Id: TPTPMem.c,v 1.1.6.1 2008/10/02 13:43:08 pklicnik Exp $ > *******************************************************************************/ > > > #include "tptp/TPTPUtils.h" >-#include <malloc.h> >+#ifdef __APPLE__ >+ #include <stdlib.h> >+#else >+ #include <malloc.h> >+#endif > > void* tptp_malloc( unsigned int size ) > { >Index: src-native-new/src/shared/TPTPUtil/TPTPCmdUtil.c >=================================================================== >RCS file: /cvsroot/tptp/platform/org.eclipse.tptp.platform.agentcontroller/src-native-new/src/shared/TPTPUtil/TPTPCmdUtil.c,v >retrieving revision 1.5 >diff -u -r1.5 TPTPCmdUtil.c >--- src-native-new/src/shared/TPTPUtil/TPTPCmdUtil.c 7 Dec 2007 04:04:04 -0000 1.5 >+++ src-native-new/src/shared/TPTPUtil/TPTPCmdUtil.c 10 Nov 2008 20:34:25 -0000 >@@ -8,10 +8,14 @@ > * Contributors: > * Karla Callaghan, Intel - Initial implementation. > * >- * $Id: TPTPCmdUtil.c,v 1.5 2007/12/07 04:04:04 jkubasta Exp $ >+ * $Id: TPTPCmdUtil.c,v 1.1.6.1 2008/10/02 13:43:08 pklicnik Exp $ > *******************************************************************************/ > #include <stdio.h> >-#include <malloc.h> >+#if defined __APPLE__ >+ #include <stdlib.h> >+#else >+ #include <malloc.h> >+#endif > > #ifndef _WIN32 > #include <string.h> >Index: src-native-new/src/shared/TPTPUtil/TPTPSemaphore.c >=================================================================== >RCS file: /cvsroot/tptp/platform/org.eclipse.tptp.platform.agentcontroller/src-native-new/src/shared/TPTPUtil/TPTPSemaphore.c,v >retrieving revision 1.5 >diff -u -r1.5 TPTPSemaphore.c >--- src-native-new/src/shared/TPTPUtil/TPTPSemaphore.c 20 May 2008 16:52:06 -0000 1.5 >+++ src-native-new/src/shared/TPTPUtil/TPTPSemaphore.c 10 Nov 2008 20:34:25 -0000 >@@ -7,8 +7,8 @@ > * > * Contributors: > * Karla Callaghan, Intel - Initial version. >- * $Id: TPTPSemaphore.c,v 1.5 2008/05/20 16:52:06 jkubasta Exp $ >- *******************************************************************************/ >+ * $Id: TPTPSemaphore.c,v 1.1.6.3 2008/10/06 16:43:15 pklicnik Exp $ >+ *******************************************************************************/ > > > #include <stddef.h> >@@ -20,33 +20,64 @@ > #include <errno.h> > #endif > >+#ifdef __APPLE__ >+ #include <semaphore.h> >+#endif >+ >+static volatile counter = 0; >+ > /* >-#ifndef _WIN32 >+#ifndef _WIN32 > #include <semaphore.h> >- #include <time.h> >+ #include <time.h> > #endif > */ > /* Semaphore utilities */ > >-/* >+/* > * Create a semaphore with initial count of 0 (unsignaled). > */ >-int tptp_initializeSemaphore(Semaphore_t *pSem ) >+int tptp_initializeSemaphore(Semaphore_t *pSem) > { > >-#ifdef _WIN32 >+#if defined(_WIN32) > /* Create un-named semaphore, with unlimited max count, > * that is unsignaled (intial count = 0). > */ > pSem->hSem = CreateSemaphore(NULL, 0, INT_MAX, NULL); > if(pSem->hSem == NULL) > return -1; >+#elif defined(__APPLE__) >+ //apparently, no need to initalize semaphore on mac (no API) >+ sem_t * paul; >+ // create semaphore with 755 permission and 0 initial value >+ char name[100]; >+ sprintf( name, "tptpSemaphoreNum%d", ++counter ); >+ >+ paul = sem_open( name, O_CREAT, 0777, 0 ); >+ >+ if ( paul == SEM_FAILED ) { >+ printf( "SEMAPHORE CREATION FAILED!!!!!!!!\nError is: %s\n", strerror(errno) ); >+ >+ if ( errno == EACCES ) { >+ printf( "EACCES return code!!!\n" ); >+ } >+ >+ return -1; >+ } else { >+ printf( "sem created!!\n" ); >+ } >+ >+ pSem->sem = paul; >+ > #else > /* Create semaphore with initial value 0 */ > int rc; > rc = sem_init(&(pSem->sem), 0, 0); >- if (rc != 0) >+ if (rc != 0) { >+ printf( "init error is: %s\n", strerror( errno ) ); > return -1; >+ } > #endif > > return 0; >@@ -58,9 +89,17 @@ > int tptp_deleteSemaphore(Semaphore_t *pSem) > { > >-#ifdef _WIN32 >+#if defined(_WIN32) > if (pSem->hSem) > CloseHandle(pSem->hSem); >+#elif defined(__APPLE__) >+ int rc; >+ rc = sem_close(pSem->sem); >+ >+ if ( rc != 0 ) { >+ printf( "sem_close FAILED with error: ", strerror( errno ) ); >+ return -1; >+ } > #else > int rc; > rc = sem_destroy(&(pSem->sem)); >@@ -85,9 +124,16 @@ > ReleaseSemaphore(pSem->hSem, 1, NULL); > #else > int rc=0; >+ >+#if defined (__APPLE__) >+ rc = sem_post(pSem->sem); >+#else > rc = sem_post(&(pSem->sem)); >- if (rc != 0) >+#endif >+ if (rc != 0) { >+ printf( "postSemaphore failed!! %s\n", strerror(errno) ); > return -1; >+ } > #endif > > return 0; >@@ -111,10 +157,18 @@ > > #else > while (1) { >- int rc = sem_wait(&(pSem->sem)); >+ int rc; >+#if defined (__APPLE__) >+ rc = sem_wait(pSem->sem); >+#else >+ rc = sem_wait(&(pSem->sem)); >+#endif > if (rc == 0) break; >- >- if (errno != EINTR) return -1; >+ >+ if (errno != EINTR) { >+ printf( "waitSemaphore failed!! %s\n", strerror(errno) ); >+ return -1; >+ } > } > #endif > >@@ -122,7 +176,7 @@ > } > /* > int tptp_waitSemaphoreTimeout(Semaphore_t *pSem, int timeoutInSecs) { >- // Note this code is a placeholder that hasn't been tested. >+ // Note this code is a placeholder that hasn't been tested. > // Keep this in mind when using it. - jwest > #ifdef _WIN32 > unsigned long rc; >@@ -142,7 +196,7 @@ > return -1; > } > waitTime.tv_sec += timeoutInSecs; >- >+ > while (1) { > int rc = sem_timedwait(&(pSem->sem), &waitTime); > if (rc == 0) break; >@@ -154,7 +208,7 @@ > } > #endif > >- return 0; >+ return 0; > } > */ > >Index: src-native-new/src/shared/TPTPUtil/TPTPUtils.make >=================================================================== >RCS file: /cvsroot/tptp/platform/org.eclipse.tptp.platform.agentcontroller/src-native-new/src/shared/TPTPUtil/TPTPUtils.make,v >retrieving revision 1.10 >diff -u -r1.10 TPTPUtils.make >--- src-native-new/src/shared/TPTPUtil/TPTPUtils.make 19 Mar 2007 03:14:40 -0000 1.10 >+++ src-native-new/src/shared/TPTPUtil/TPTPUtils.make 10 Nov 2008 20:34:25 -0000 >@@ -3,7 +3,7 @@ > # > # makefile: tptpUtils project > # >-# $Id: TPTPUtils.make,v 1.10 2007/03/19 03:14:40 rsmith Exp $ >+# $Id: TPTPUtils.make,v 1.1.6.4 2008/11/10 19:15:30 pklicnik Exp $ > ################################################################################ > > >@@ -27,8 +27,11 @@ > if [ x$VERSIONNUM = x ]; then export VERSIONNUM=0; fi > if [ x$MINORNUM = x ]; then export MINORNUM=0; fi > if [ x$RELEASENUM = x ]; then export RELEASENUM=0; fi >+export VERSIONNUM=5 >+export MINORNUM=0 >+export RELEASENUM=0 > >-TARGETLIB := $(TARGET).so >+TARGETLIB := $(TARGET).dylib > TARGETSONAME := $(TARGETLIB).$(VERSIONNUM) > TARGETREALNAME := $(TARGETSONAME).$(MINORNUM).$(RELEASENUM) > >@@ -44,7 +47,7 @@ > # list of additional libraries to be linked with > # (separated by blanks) > #----------------------------------- >-LIBS := uuid dl xerces-c pthread >+LIBS := dl xerces-c pthread iconv stdc++ > > #----------------------------------- > # list of additional library directories to search from >@@ -72,11 +75,11 @@ > # > #----------------------------------- > >-CFLAGS := $(C_FLAGS) $(DEBUGABLE) -Wall $(OPTIMIZABLE) -fPIC $(addprefix -I,$(INCLUDEDIRS)) -D_LINUX_X86 >+CFLAGS := $(C_FLAGS) $(DEBUGABLE) -Wall $(OPTIMIZABLE) -fPIC $(addprefix -I,$(INCLUDEDIRS)) > > CXXFLAGS := $(CFLAGS) > >-LINKOPTS := $(L_FLAGS) $(DEBUGABLE) -shared -Wl,-soname,$(TARGETSONAME) -o $(TARGETDIR)/$(TARGETREALNAME) $(addprefix -L,$(LIBDIRS)) >+LINKOPTS := $(L_FLAGS) $(DEBUGABLE) -undefined dynamic_lookup -dynamiclib -o $(TARGETDIR)/$(TARGETREALNAME) $(addprefix -L,$(LIBDIRS)) > > > #----------------------------------- >@@ -84,7 +87,7 @@ > #----------------------------------- > > CC := gcc >-CXX := $(CC) >+CXX := g++ > > SOURCE := $(wildcard *.c) $(wildcard *.cpp) > >@@ -124,4 +127,4 @@ > $(CC) $(LINKOPTS) $(OBJS) $(addprefix -l,$(LIBS)) > $(CREATELINK) $(TARGETREALNAME) $(TARGETDIR)/$(TARGETSONAME) > $(CREATELINK) $(TARGETSONAME) $(TARGETDIR)/$(TARGETLIB) >- >+ $(CREATELINK) $(TARGETREALNAME) $(TARGETDIR)/$(TARGET).jnilib >Index: src-native-new/src/shared/TPTPUtil/Base64.c >=================================================================== >RCS file: /cvsroot/tptp/platform/org.eclipse.tptp.platform.agentcontroller/src-native-new/src/shared/TPTPUtil/Base64.c,v >retrieving revision 1.8 >diff -u -r1.8 Base64.c >--- src-native-new/src/shared/TPTPUtil/Base64.c 22 May 2007 16:21:05 -0000 1.8 >+++ src-native-new/src/shared/TPTPUtil/Base64.c 10 Nov 2008 20:34:25 -0000 >@@ -7,11 +7,15 @@ > * > * Contributors: > * Kevin O'Leary, Intel - Initial API and implementation >- * $Id: Base64.c,v 1.8 2007/05/22 16:21:05 samwai Exp $ >+ * $Id: Base64.c,v 1.1.6.1 2008/10/02 13:43:08 pklicnik Exp $ > * > *******************************************************************************/ > #include <stdio.h> >-#include <malloc.h> >+#if defined __APPLE__ >+ #include <stdlib.h> >+#else >+ #include <malloc.h> >+#endif > #include <string.h> > #include "tptp/TPTPUtils.h" > >Index: src-native-new/test/Stress/StressAgent/StressAgent.make >=================================================================== >RCS file: /cvsroot/tptp/platform/org.eclipse.tptp.platform.agentcontroller/src-native-new/test/Stress/StressAgent/StressAgent.make,v >retrieving revision 1.1 >diff -u -r1.1 StressAgent.make >--- src-native-new/test/Stress/StressAgent/StressAgent.make 7 Nov 2005 20:51:59 -0000 1.1 >+++ src-native-new/test/Stress/StressAgent/StressAgent.make 10 Nov 2008 20:34:26 -0000 >@@ -3,7 +3,7 @@ > # > # makefile: StressAgent project > # >-# $Id$ >+# $Id: StressAgent.make,v 1.1 2008/06/17 16:11:26 jcayne Exp $ > ################################################################################ > > >Index: src-native-new/test/testAgentController/SocketTLTest/socktlTest.make >=================================================================== >RCS file: /cvsroot/tptp/platform/org.eclipse.tptp.platform.agentcontroller/src-native-new/test/testAgentController/SocketTLTest/socktlTest.make,v >retrieving revision 1.1 >diff -u -r1.1 socktlTest.make >--- src-native-new/test/testAgentController/SocketTLTest/socktlTest.make 27 May 2005 00:40:53 -0000 1.1 >+++ src-native-new/test/testAgentController/SocketTLTest/socktlTest.make 10 Nov 2008 20:34:26 -0000 >@@ -3,7 +3,7 @@ > # > # makefile: SocketTLTestUtils project > # >-# $Id: socktlTest.make,v 1.1 2005/05/27 00:40:53 akaylor Exp $ >+# $Id: socktlTest.make,v 1.1 2008/06/17 16:11:26 jcayne Exp $ > ################################################################################ > > >Index: src-native-new/src/ChkPass/ChkPass.make >=================================================================== >RCS file: /cvsroot/tptp/platform/org.eclipse.tptp.platform.agentcontroller/src-native-new/src/ChkPass/ChkPass.make,v >retrieving revision 1.2 >diff -u -r1.2 ChkPass.make >--- src-native-new/src/ChkPass/ChkPass.make 19 Mar 2007 03:14:40 -0000 1.2 >+++ src-native-new/src/ChkPass/ChkPass.make 10 Nov 2008 20:34:23 -0000 >@@ -3,7 +3,7 @@ > # > # makefile: ChkPass project > # >-# $Id: ChkPass.make,v 1.2 2007/03/19 03:14:40 rsmith Exp $ >+# $Id: ChkPass.make,v 1.1.6.3 2008/11/10 19:15:29 pklicnik Exp $ > ################################################################################ > > >@@ -27,7 +27,7 @@ > # list of additional libraries to be linked with > # (separated by blanks) > #----------------------------------- >-LIBS := crypt >+LIBS := > > > #----------------------------------- >@@ -56,11 +56,11 @@ > # > #----------------------------------- > >-CFLAGS := $(C_FLAGS) $(DEBUGABLE) -Wall $(OPTIMIZABLE) -fPIC $(addprefix -I,$(INCLUDEDIRS)) -D_LINUX_X86 -D_TPTP_DIAGNOSTIC_ >+CFLAGS := $(C_FLAGS) $(DEBUGABLE) -Wall $(OPTIMIZABLE) -fPIC $(addprefix -I,$(INCLUDEDIRS)) -D_TPTP_DIAGNOSTIC_ > > CXXFLAGS := $(CFLAGS) > >-LINKOPTS := $(L_FLAGS) $(DEBUGABLE) -o $(TARGETDIR)/$(TARGET) $(addprefix -L,$(LIBDIRS)) >+LINKOPTS := $(L_FLAGS) $(DEBUGABLE) $(addprefix -L,$(LIBDIRS)) -o $(TARGETDIR)/$(TARGET) > > > #----------------------------------- >Index: src-native-new/src/ChkPass/ChkPass.c >=================================================================== >RCS file: /cvsroot/tptp/platform/org.eclipse.tptp.platform.agentcontroller/src-native-new/src/ChkPass/ChkPass.c,v >retrieving revision 1.4 >diff -u -r1.4 ChkPass.c >--- src-native-new/src/ChkPass/ChkPass.c 28 Feb 2008 02:10:35 -0000 1.4 >+++ src-native-new/src/ChkPass/ChkPass.c 10 Nov 2008 20:34:23 -0000 >@@ -4,7 +4,7 @@ > * are made available under the terms of the Eclipse Public License v1.0 > * which accompanies this distribution, and is available at > * http://www.eclipse.org/legal/epl-v10.html >- * $Id: ChkPass.c,v 1.4 2008/02/28 02:10:35 jkubasta Exp $ >+ * $Id: ChkPass.c,v 1.1.6.1 2008/10/02 15:50:38 pklicnik Exp $ > * > * Contributors: > * IBM - Initial API and implementation >@@ -24,6 +24,11 @@ > #include <crypt.h> > #include <unistd.h> > #include <string.h> >+#elif defined(__APPLE__) >+ #include <stdlib.h> >+ #include <pwd.h> >+ #include <unistd.h> >+ #include <string.h> > #endif > > #define RC_SUCCESS 100 /* Authentication succeeded */ >@@ -75,7 +80,7 @@ > /* > * AIX and HP-UX section > */ >-#if defined(_AIX) || defined(__hpux) >+#if defined(_AIX) || defined(__hpux) || defined(__APPLE__) > int verifyPassword(char *userid, char *password) { > struct passwd *pw; /* the unshadowed but encrypted password structure */ > >Index: src-native-new/src/transport/transportSupport/TransportSupportSocket.c >=================================================================== >RCS file: /cvsroot/tptp/platform/org.eclipse.tptp.platform.agentcontroller/src-native-new/src/transport/transportSupport/TransportSupportSocket.c,v >retrieving revision 1.30 >diff -u -r1.30 TransportSupportSocket.c >--- src-native-new/src/transport/transportSupport/TransportSupportSocket.c 2 Jun 2008 13:04:42 -0000 1.30 >+++ src-native-new/src/transport/transportSupport/TransportSupportSocket.c 10 Nov 2008 20:34:26 -0000 >@@ -9,7 +9,7 @@ > * Hoang M Nguyen, Intel - Initial API and Implementation > * IBM - Portions of old RAC code (brought over by Hoang M Nguyen) > * >- * $Id: TransportSupportSocket.c,v 1.30 2008/06/02 13:04:42 jkubasta Exp $ >+ * $Id: TransportSupportSocket.c,v 1.1.6.1 2008/10/16 19:14:07 pklicnik Exp $ > * > *******************************************************************************/ > >@@ -1095,7 +1095,7 @@ > int socketsWaiting = 0; > > listenOnSocket_parameters_t *params; >- >+ printf( "socket list length: %d\n", numSockets ); > // Given the list of sockets, scan through and see if we are being asked to listen on any new ones > for(i = 0; i < numSockets; i++) { > s = &(sockets[i]); >@@ -1104,6 +1104,7 @@ > // Scan through the list of sockets that we're already monitoring: check if there are any new additions > node = socketsMonitored->head; > while(node != NULL) { >+ printf( "node: %x\n", node->data ); > if(node->data == s) { > matchFound = 1; > break; >Index: src-native-new/src/transport/transportSupport/TransportSupport.make >=================================================================== >RCS file: /cvsroot/tptp/platform/org.eclipse.tptp.platform.agentcontroller/src-native-new/src/transport/transportSupport/TransportSupport.make,v >retrieving revision 1.9 >diff -u -r1.9 TransportSupport.make >--- src-native-new/src/transport/transportSupport/TransportSupport.make 19 Mar 2007 03:14:38 -0000 1.9 >+++ src-native-new/src/transport/transportSupport/TransportSupport.make 10 Nov 2008 20:34:26 -0000 >@@ -3,7 +3,7 @@ > # > # makefile: transportSupport project > # >-# $Id: TransportSupport.make,v 1.9 2007/03/19 03:14:38 rsmith Exp $ >+# $Id: TransportSupport.make,v 1.1.6.4 2008/11/10 19:15:30 pklicnik Exp $ > ################################################################################ > > >@@ -27,8 +27,11 @@ > if [ x$VERSIONNUM = x ]; then export VERSIONNUM=0; fi > if [ x$MINORNUM = x ]; then export MINORNUM=0; fi > if [ x$RELEASENUM = x ]; then export RELEASENUM=0; fi >+export VERSIONNUM=5 >+export MINORNUM=0 >+export RELEASENUM=0 > >-TARGETLIB := $(TARGET).so >+TARGETLIB := $(TARGET).dylib > TARGETSONAME := $(TARGETLIB).$(VERSIONNUM) > TARGETREALNAME := $(TARGETSONAME).$(MINORNUM).$(RELEASENUM) > >@@ -37,7 +40,7 @@ > # list of additional INCLUDE directories to search headers from > # (separated by blanks) > #----------------------------------- >-INCLUDEDIRS := ../RACommon ../RASharedMemory ../RASocket . ../../../include ${JAVA_HOME}/include ${JAVA_HOME}/include/linux >+INCLUDEDIRS := ../RACommon ../RASharedMemory ../RASocket . ../../../include /System/Library/Frameworks/JavaVM.framework/Versions/CurrentJDK/Headers/ > > > #----------------------------------- >@@ -93,11 +96,11 @@ > # shared memory system settings for max value (Bug 129276). It compiled fine > # after removing -fPIC option from CFLAGS list. This option is required for EM64T > >-CFLAGS := $(C_FLAGS) $(DEBUGABLE) -Wall $(OPTIMIZABLE) $(USE_FPIC_OPTION) $(addprefix -I,$(INCLUDEDIRS)) -D_LINUX_X86 $(DEFINES) >+CFLAGS := $(C_FLAGS) $(DEBUGABLE) -Wall $(OPTIMIZABLE) $(USE_FPIC_OPTION) $(addprefix -I,$(INCLUDEDIRS)) $(DEFINES) > > CXXFLAGS := $(CFLAGS) > >-LINKOPTS := $(L_FLAGS) $(DEBUGABLE) -shared -Wl,-soname,$(TARGETSONAME) -o $(TARGETDIR)/$(TARGETREALNAME) $(addprefix -L,$(LIBDIRS)) >+LINKOPTS := $(L_FLAGS) $(DEBUGABLE) -undefined dynamic_lookup -dynamiclib -o $(TARGETDIR)/$(TARGETREALNAME) $(addprefix -L,$(LIBDIRS)) > > > #----------------------------------- >@@ -145,4 +148,4 @@ > $(CC) $(LINKOPTS) $(OBJS) $(addprefix -l,$(LIBS)) > $(CREATELINK) $(TARGETREALNAME) $(TARGETDIR)/$(TARGETSONAME) > $(CREATELINK) $(TARGETSONAME) $(TARGETDIR)/$(TARGETLIB) >- >+ $(CREATELINK) $(TARGETREALNAME) $(TARGETDIR)/$(TARGET).jnilib >Index: src-native-new/samples/TimeCollector/TimeCollector.make >=================================================================== >RCS file: /cvsroot/tptp/platform/org.eclipse.tptp.platform.agentcontroller/src-native-new/samples/TimeCollector/TimeCollector.make,v >retrieving revision 1.5 >diff -u -r1.5 TimeCollector.make >--- src-native-new/samples/TimeCollector/TimeCollector.make 19 Mar 2007 03:14:39 -0000 1.5 >+++ src-native-new/samples/TimeCollector/TimeCollector.make 10 Nov 2008 20:34:23 -0000 >@@ -3,7 +3,7 @@ > # > # makefile: TimeCollector project > # >-# $Id: TimeCollector.make,v 1.5 2007/03/19 03:14:39 rsmith Exp $ >+# $Id: TimeCollector.make,v 1.1.6.2 2008/11/10 19:15:30 pklicnik Exp $ > ################################################################################ > > >@@ -27,7 +27,7 @@ > # list of additional libraries to be linked with > # (separated by blanks) > #----------------------------------- >-LIBS := uuid dl tptpAgentBase tptpUtils processControlUtil transportSupport pthread tptpLogUtils tptpConfig transportSupport hcclco hcclsm hccls >+LIBS := dl tptpAgentBase tptpUtils processControlUtil transportSupport pthread tptpLogUtils tptpConfig transportSupport hcclco hcclsm hccls iconv > > > #----------------------------------- >@@ -56,7 +56,7 @@ > # > #----------------------------------- > >-CFLAGS := $(C_FLAGS) $(DEBUGABLE) -Wall $(OPTIMIZABLE) -fPIC $(addprefix -I,$(INCLUDEDIRS)) -D_LINUX_X86 >+CFLAGS := $(C_FLAGS) $(DEBUGABLE) -Wall $(OPTIMIZABLE) -fPIC $(addprefix -I,$(INCLUDEDIRS)) > > CXXFLAGS := $(CFLAGS) > >Index: src-native-new/src/transport/TPTPAgentCompTL/TPTPAgentCompTL.make >=================================================================== >RCS file: /cvsroot/tptp/platform/org.eclipse.tptp.platform.agentcontroller/src-native-new/src/transport/TPTPAgentCompTL/TPTPAgentCompTL.make,v >retrieving revision 1.4 >diff -u -r1.4 TPTPAgentCompTL.make >--- src-native-new/src/transport/TPTPAgentCompTL/TPTPAgentCompTL.make 19 Mar 2007 03:14:38 -0000 1.4 >+++ src-native-new/src/transport/TPTPAgentCompTL/TPTPAgentCompTL.make 10 Nov 2008 20:34:25 -0000 >@@ -3,7 +3,7 @@ > # > # makefile: TPTPAgentCompTL project > # >-# $Id$ >+# $Id: TPTPAgentCompTL.make,v 1.1.6.4 2008/11/10 19:15:30 pklicnik Exp $ > ################################################################################ > > >@@ -27,8 +27,11 @@ > if [ x$VERSIONNUM = x ]; then export VERSIONNUM=0; fi > if [ x$MINORNUM = x ]; then export MINORNUM=0; fi > if [ x$RELEASENUM = x ]; then export RELEASENUM=0; fi >+iexport VERSIONNUM=5 >+export MINORNUM=0 >+export RELEASENUM=0 > >-TARGETLIB := $(TARGET).so >+TARGETLIB := $(TARGET).dylib > TARGETSONAME := $(TARGETLIB).$(VERSIONNUM) > TARGETREALNAME := $(TARGETSONAME).$(MINORNUM).$(RELEASENUM) > >@@ -72,11 +75,11 @@ > # > #----------------------------------- > >-CFLAGS := $(C_FLAGS) $(DEBUGABLE) -Wall $(OPTIMIZABLE) -fPIC $(addprefix -I,$(INCLUDEDIRS)) -D_LINUX_X86 >+CFLAGS := $(C_FLAGS) $(DEBUGABLE) -Wall $(OPTIMIZABLE) -fPIC $(addprefix -I,$(INCLUDEDIRS)) > > CXXFLAGS := $(CFLAGS) > >-LINKOPTS := $(L_FLAGS) $(DEBUGABLE) -shared -Wl,-soname,$(TARGETSONAME) -o $(TARGETDIR)/$(TARGETREALNAME) $(addprefix -L,$(LIBDIRS)) >+LINKOPTS := $(L_FLAGS) $(DEBUGABLE) -undefined dynamic_lookup -dynamiclib -o $(TARGETDIR)/$(TARGETREALNAME) $(addprefix -L,$(LIBDIRS)) > > > #----------------------------------- >@@ -124,4 +127,4 @@ > $(CC) $(LINKOPTS) $(OBJS) $(addprefix -l,$(LIBS)) > $(CREATELINK) $(TARGETREALNAME) $(TARGETDIR)/$(TARGETSONAME) > $(CREATELINK) $(TARGETSONAME) $(TARGETDIR)/$(TARGETLIB) >- >+ $(CREATELINK) $(TARGETREALNAME) $(TARGETDIR)/$(TARGET).jnilib >Index: src-native-new/src/transport/TPTPAgentCompTL/AgentCTL.c >=================================================================== >RCS file: /cvsroot/tptp/platform/org.eclipse.tptp.platform.agentcontroller/src-native-new/src/transport/TPTPAgentCompTL/AgentCTL.c,v >retrieving revision 1.26 >diff -u -r1.26 AgentCTL.c >--- src-native-new/src/transport/TPTPAgentCompTL/AgentCTL.c 16 Jun 2008 21:11:56 -0000 1.26 >+++ src-native-new/src/transport/TPTPAgentCompTL/AgentCTL.c 10 Nov 2008 20:34:25 -0000 >@@ -8,7 +8,7 @@ > * Contributors: > * Andy Kaylor, Intel - Initial API and Implementation > * >- * $Id: AgentCTL.c,v 1.26 2008/06/16 21:11:56 jkubasta Exp $ >+ * $Id: AgentCTL.c,v 1.1.6.2 2008/11/10 19:50:40 pklicnik Exp $ > * > *******************************************************************************/ > >@@ -304,7 +304,8 @@ > setHandleInherited(handle); > > actlData->serverPipe = handle; >- >+ >+ printf("Agent CTL representing\n"); > return baseTL_startTransportListener( tlo, serveRequests ); > } > >Index: src-native-new/src/transport/RADataTransfer/RADataTransfer.make >=================================================================== >RCS file: /cvsroot/tptp/platform/org.eclipse.tptp.platform.agentcontroller/src-native-new/src/transport/RADataTransfer/RADataTransfer.make,v >retrieving revision 1.1 >diff -u -r1.1 RADataTransfer.make >--- src-native-new/src/transport/RADataTransfer/RADataTransfer.make 2 Apr 2007 18:05:35 -0000 1.1 >+++ src-native-new/src/transport/RADataTransfer/RADataTransfer.make 10 Nov 2008 20:34:25 -0000 >@@ -27,8 +27,11 @@ > if [ x$VERSIONNUM = x ]; then export VERSIONNUM=0; fi > if [ x$MINORNUM = x ]; then export MINORNUM=0; fi > if [ x$RELEASENUM = x ]; then export RELEASENUM=0; fi >+export VERSIONNUM=5 >+export MINORNUM=0 >+export RELEASENUM=0 > >-TARGETLIB := $(TARGET).so >+TARGETLIB := $(TARGET).dylib > TARGETSONAME := $(TARGETLIB).$(VERSIONNUM) > TARGETREALNAME := $(TARGETSONAME).$(MINORNUM).$(RELEASENUM) > >@@ -37,7 +40,7 @@ > # list of additional INCLUDE directories to search headers from > # (separated by blanks) > #----------------------------------- >-INCLUDEDIRS := . ../../../include $(JAVA_HOME)/include $(JAVA_HOME)/include/linux ../RACommon ../RASocket ../RASharedMemory >+INCLUDEDIRS := . ../../../include /System/Library/Frameworks/JavaVM.framework/Versions/CurrentJDK/Headers/ ../RACommon ../RASocket ../RASharedMemory > > > #----------------------------------- >@@ -74,11 +77,11 @@ > > DEFINES := -DSQLUNIX -DSQLLinux -DENW -DREENTRANT -D_REENTRANT -DCONFIG_X86_CMPXCHG > >-CFLAGS := $(C_FLAGS) $(DEBUGABLE) -Wall $(OPTIMIZABLE) -fPIC $(addprefix -I,$(INCLUDEDIRS)) -D_LINUX_X86 $(DEFINES) >+CFLAGS := $(C_FLAGS) $(DEBUGABLE) -Wall $(OPTIMIZABLE) -fPIC $(addprefix -I,$(INCLUDEDIRS)) $(DEFINES) > > CXXFLAGS := $(CFLAGS) > >-LINKOPTS := $(L_FLAGS) $(DEBUGABLE) -shared -Wl,-soname,$(TARGETSONAME) -o $(TARGETDIR)/$(TARGETREALNAME) $(addprefix -L,$(LIBDIRS)) >+LINKOPTS := $(L_FLAGS) $(DEBUGABLE) -undefined dynamic_lookup -dynamiclib -o $(TARGETDIR)/$(TARGETREALNAME) $(addprefix -L,$(LIBDIRS)) > > > #----------------------------------- >@@ -126,4 +129,4 @@ > $(CC) $(LINKOPTS) $(OBJS) $(addprefix -l,$(LIBS)) > $(CREATELINK) $(TARGETREALNAME) $(TARGETDIR)/$(TARGETSONAME) > $(CREATELINK) $(TARGETSONAME) $(TARGETDIR)/$(TARGETLIB) >- >+ $(CREATELINK) $(TARGETREALNAME) $(TARGETDIR)/$(TARGET).jnilib >Index: src-native-new/src/shared/TPTPLogUtils/TPTPLogUtils.make >=================================================================== >RCS file: /cvsroot/tptp/platform/org.eclipse.tptp.platform.agentcontroller/src-native-new/src/shared/TPTPLogUtils/TPTPLogUtils.make,v >retrieving revision 1.4 >diff -u -r1.4 TPTPLogUtils.make >--- src-native-new/src/shared/TPTPLogUtils/TPTPLogUtils.make 19 Mar 2007 03:14:39 -0000 1.4 >+++ src-native-new/src/shared/TPTPLogUtils/TPTPLogUtils.make 10 Nov 2008 20:34:24 -0000 >@@ -1,127 +1,130 @@ >- >-################################################################################ >-# >-# makefile: tptpUtils project >-# >-# $Id: $ >-################################################################################ >- >- >-#----------------------------------- >-# >-# Customizable section >-# >-# - The TARGETREALNAME variable specifies the name of the library file >-# that will be generated, this includes a base (TARGETLIB) plus a >-# version number plus a minor number plus a release number >-# - The TARGETSONAME variable specifies a file name that has just the >-# library name plus the major version number >-# - The TARGETLIB variable specifies the base library name >-# - The TARGETSONAME and TARGETLIB are generated as symbolic links >-# when the library is built >-# >-#----------------------------------- >-TARGET := libtptpLogUtils >-TARGETDIR := ../../../lib >- >-if [ x$VERSIONNUM = x ]; then export VERSIONNUM=0; fi >-if [ x$MINORNUM = x ]; then export MINORNUM=0; fi >-if [ x$RELEASENUM = x ]; then export RELEASENUM=0; fi >- >-TARGETLIB := $(TARGET).so >-TARGETSONAME := $(TARGETLIB).$(VERSIONNUM) >-TARGETREALNAME := $(TARGETSONAME).$(MINORNUM).$(RELEASENUM) >- >- >-#----------------------------------- >-# list of additional INCLUDE directories to search headers from >-# (separated by blanks) >-#----------------------------------- >-INCLUDEDIRS := ../transport/RACommon ../transport/RASharedMemory ../transport/RASocket . ../../../include ${XERCESC_HOME}/include ${CBE_SDK_HOME}/include >- >- >-#----------------------------------- >-# list of additional libraries to be linked with >-# (separated by blanks) >-#----------------------------------- >-LIBS := uuid dl xerces-c pthread >- >-#----------------------------------- >-# list of additional library directories to search from >-# (separated by blanks) >-#----------------------------------- >-LIBDIRS := ../../lib ${XERCESC_HOME}/lib >- >- >-#----------------------------------- >-# >-# Compiler options >-# >-# -g produce debug info >-# -Wall enable all types of warnings >-# -O3 highest level of code optimization >-# -fPIC generate position-independent code (PIC). >-# This is required for building shared library. >-# -c compile only >-# >-# Linking options >-# >-# -Wl pass options to linker >-# -shared produce shared library >-# -L add the given directory to the search path for libraries >-# >-#----------------------------------- >- >-CFLAGS := $(C_FLAGS) $(DEBUGABLE) -Wall $(OPTIMIZABLE) -fPIC $(addprefix -I,$(INCLUDEDIRS)) -D_LINUX_X86 >- >-CXXFLAGS := $(CFLAGS) >- >-LINKOPTS := $(L_FLAGS) $(DEBUGABLE) -shared -Wl,-soname,$(TARGETSONAME) -o $(TARGETDIR)/$(TARGETREALNAME) $(addprefix -L,$(LIBDIRS)) >- >- >-#----------------------------------- >-# general commands and options >-#----------------------------------- >- >-CC := gcc >-CXX := $(CC) >- >-SOURCE := $(wildcard *.c) $(wildcard *.cpp) >- >-OBJS := $(patsubst %.c,%.o,$(patsubst %.cpp,%.o,$(SOURCE))) >- >-REMOVEFILE := rm -f >-CREATELINK := ln -sf >- >- >-#----------------------------------- >-# "make" rules >-#----------------------------------- >- >-.PHONY : default everything objs clean veryclean rebuild $(TARGET) >- >- >-default : $(TARGET) >- >- >-objs : $(OBJS) >- >- >-clean : >- $(REMOVEFILE) *.o >- >- >-veryclean: clean >- $(REMOVEFILE) $(TARGETDIR)/$(TARGETLIB) >- $(REMOVEFILE) $(TARGETDIR)/$(TARGETSONAME) >- $(REMOVEFILE) $(TARGETDIR)/$(TARGETREALNAME) >- >- >-rebuild: veryclean everything >- >- >-$(TARGET) : $(OBJS) >- $(CC) $(LINKOPTS) $(OBJS) $(addprefix -l,$(LIBS)) >- $(CREATELINK) $(TARGETREALNAME) $(TARGETDIR)/$(TARGETSONAME) >- $(CREATELINK) $(TARGETSONAME) $(TARGETDIR)/$(TARGETLIB) >- >+ >+################################################################################ >+# >+# makefile: tptpUtils project >+# >+# $Id: TPTPLogUtils.make,v 1.1.6.4 2008/11/10 19:15:30 pklicnik Exp $ >+################################################################################ >+ >+ >+#----------------------------------- >+# >+# Customizable section >+# >+# - The TARGETREALNAME variable specifies the name of the library file >+# that will be generated, this includes a base (TARGETLIB) plus a >+# version number plus a minor number plus a release number >+# - The TARGETSONAME variable specifies a file name that has just the >+# library name plus the major version number >+# - The TARGETLIB variable specifies the base library name >+# - The TARGETSONAME and TARGETLIB are generated as symbolic links >+# when the library is built >+# >+#----------------------------------- >+TARGET := libtptpLogUtils >+TARGETDIR := ../../../lib >+ >+#if [ x$VERSIONNUM = x ]; then export VERSIONNUM=0; fi >+#if [ x$MINORNUM = x ]; then export MINORNUM=0; fi >+#if [ x$RELEASENUM = x ]; then export RELEASENUM=0; fi >+export VERSIONNUM=5 >+export MINORNUM=0 >+export RELEASENUM=0 >+ >+TARGETLIB := $(TARGET).dylib >+TARGETSONAME := $(TARGETLIB).$(VERSIONNUM) >+TARGETREALNAME := $(TARGETSONAME).$(MINORNUM).$(RELEASENUM) >+ >+ >+#----------------------------------- >+# list of additional INCLUDE directories to search headers from >+# (separated by blanks) >+#----------------------------------- >+INCLUDEDIRS := ../transport/RACommon ../transport/RASharedMemory ../transport/RASocket . ../../../include ${XERCESC_HOME}/include ${CBE_SDK_HOME}/include >+ >+ >+#----------------------------------- >+# list of additional libraries to be linked with >+# (separated by blanks) >+#----------------------------------- >+LIBS := dl xerces-c pthread iconv stdc++ >+ >+#----------------------------------- >+# list of additional library directories to search from >+# (separated by blanks) >+#----------------------------------- >+LIBDIRS := ../../lib ${XERCESC_HOME}/lib >+ >+ >+#----------------------------------- >+# >+# Compiler options >+# >+# -g produce debug info >+# -Wall enable all types of warnings >+# -O3 highest level of code optimization >+# -fPIC generate position-independent code (PIC). >+# This is required for building shared library. >+# -c compile only >+# >+# Linking options >+# >+# -Wl pass options to linker >+# -shared produce shared library >+# -L add the given directory to the search path for libraries >+# >+#----------------------------------- >+ >+CFLAGS := $(C_FLAGS) $(DEBUGABLE) -Wall $(OPTIMIZABLE) -fPIC $(addprefix -I,$(INCLUDEDIRS)) >+ >+CXXFLAGS := $(CFLAGS) >+ >+LINKOPTS := $(L_FLAGS) $(DEBUGABLE) -undefined dynamic_lookup -dynamiclib -o $(TARGETDIR)/$(TARGETREALNAME) $(addprefix -L,$(LIBDIRS)) >+ >+ >+#----------------------------------- >+# general commands and options >+#----------------------------------- >+ >+CC := gcc >+CXX := g++ >+ >+SOURCE := $(wildcard *.c) $(wildcard *.cpp) >+ >+OBJS := $(patsubst %.c,%.o,$(patsubst %.cpp,%.o,$(SOURCE))) >+ >+REMOVEFILE := rm -f >+CREATELINK := ln -sf >+ >+ >+#----------------------------------- >+# "make" rules >+#----------------------------------- >+ >+.PHONY : default everything objs clean veryclean rebuild $(TARGET) >+ >+ >+default : $(TARGET) >+ >+ >+objs : $(OBJS) >+ >+ >+clean : >+ $(REMOVEFILE) *.o >+ >+ >+veryclean: clean >+ $(REMOVEFILE) $(TARGETDIR)/$(TARGETLIB) >+ $(REMOVEFILE) $(TARGETDIR)/$(TARGETSONAME) >+ $(REMOVEFILE) $(TARGETDIR)/$(TARGETREALNAME) >+ >+ >+rebuild: veryclean everything >+ >+ >+$(TARGET) : $(OBJS) >+ $(CC) $(LINKOPTS) $(OBJS) $(addprefix -l,$(LIBS)) >+ $(CREATELINK) $(TARGETREALNAME) $(TARGETDIR)/$(TARGETSONAME) >+ $(CREATELINK) $(TARGETSONAME) $(TARGETDIR)/$(TARGETLIB) >+ $(CREATELINK) $(TARGETREALNAME) $(TARGETDIR)/$(TARGET).jnilib >Index: src-native-new/src/shared/TPTPLogUtils/TPTPLogUtilsInternal.h >=================================================================== >RCS file: /cvsroot/tptp/platform/org.eclipse.tptp.platform.agentcontroller/src-native-new/src/shared/TPTPLogUtils/TPTPLogUtilsInternal.h,v >retrieving revision 1.5 >diff -u -r1.5 TPTPLogUtilsInternal.h >--- src-native-new/src/shared/TPTPLogUtils/TPTPLogUtilsInternal.h 4 Apr 2006 22:14:58 -0000 1.5 >+++ src-native-new/src/shared/TPTPLogUtils/TPTPLogUtilsInternal.h 10 Nov 2008 20:34:24 -0000 >@@ -9,7 +9,7 @@ > * Samson Wai, IBM - Initial implementation > * Andy Kaylor, Intel - Refactored code for shared library > * >- * $Id: TPTPLogUtilsInternal.h,v 1.5 2006/04/04 22:14:58 kcallaghan Exp $ >+ * $Id: TPTPLogUtilsInternal.h,v 1.1.6.1 2008/10/06 12:31:21 pklicnik Exp $ > ******************************************************************************/ > > #ifndef __TPTPLOGUTILSINTERNAL_H__ >@@ -21,6 +21,8 @@ > #define CBE_LIBRARY_NAME "CommonBaseEvent.dll" > #elif defined(_HPUX) > #define CBE_LIBRARY_NAME "libcbe.sl" >+#elif defined(__APPLE__) >+ #define CBE_LIBRARY_NAME "libcbe.dylib" > #else > #define CBE_LIBRARY_NAME "libcbe.so" > #endif >Index: src-native-new/src/agents/RABindings/RABindings.make >=================================================================== >RCS file: /cvsroot/tptp/platform/org.eclipse.tptp.platform.agentcontroller/src-native-new/src/agents/RABindings/RABindings.make,v >retrieving revision 1.1 >diff -u -r1.1 RABindings.make >--- src-native-new/src/agents/RABindings/RABindings.make 2 Apr 2007 18:05:34 -0000 1.1 >+++ src-native-new/src/agents/RABindings/RABindings.make 10 Nov 2008 20:34:23 -0000 >@@ -27,8 +27,11 @@ > if [ x$VERSIONNUM = x ]; then export VERSIONNUM=0; fi > if [ x$MINORNUM = x ]; then export MINORNUM=0; fi > if [ x$RELEASENUM = x ]; then export RELEASENUM=0; fi >+export VERSIONNUM=5 >+export MINORNUM=0 >+export RELEASENUM=0 > >-TARGETLIB := $(TARGET).so >+TARGETLIB := $(TARGET).dylib > TARGETSONAME := $(TARGETLIB).$(VERSIONNUM) > TARGETREALNAME := $(TARGETSONAME).$(MINORNUM).$(RELEASENUM) > >@@ -37,14 +40,14 @@ > # list of additional INCLUDE directories to search headers from > # (separated by blanks) > #----------------------------------- >-INCLUDEDIRS := . ../../../include $(JAVA_HOME)/include $(JAVA_HOME)/include/linux ../../transport/RACommon ../../transport/RASocket ../../transport/RASharedMemory ../../transport/RADataTransfer >+INCLUDEDIRS := . ../../../include /System/Library/Frameworks/JavaVM.framework/Versions/CurrentJDK/Headers/ ../../transport/RACommon ../../transport/RASocket ../../transport/RASharedMemory ../../transport/RADataTransfer > > > #----------------------------------- > # list of additional libraries to be linked with > # (separated by blanks) > #----------------------------------- >-LIBS := dl hcclco hccls hcclsm hccldt pthread >+LIBS := dl pthread > > #----------------------------------- > # list of additional library directories to search from >@@ -74,11 +77,11 @@ > > DEFINES := -DSQLUNIX -DSQLLinux -DENW -DREENTRANT -D_REENTRANT -DCONFIG_X86_CMPXCHG > >-CFLAGS := $(C_FLAGS) $(DEBUGABLE) -Wall $(OPTIMIZABLE) -fPIC $(addprefix -I,$(INCLUDEDIRS)) -D_LINUX_X86 $(DEFINES) >+CFLAGS := $(C_FLAGS) $(DEBUGABLE) -Wall $(OPTIMIZABLE) -fPIC $(addprefix -I,$(INCLUDEDIRS)) $(DEFINES) > > CXXFLAGS := $(CFLAGS) > >-LINKOPTS := $(L_FLAGS) $(DEBUGABLE) -shared -Wl,-soname,$(TARGETSONAME) -o $(TARGETDIR)/$(TARGETREALNAME) $(addprefix -L,$(LIBDIRS)) >+LINKOPTS := $(L_FLAGS) $(DEBUGABLE) -undefined dynamic_lookup -dynamiclib -single_module -o $(TARGETDIR)/$(TARGETREALNAME) $(addprefix -L,$(LIBDIRS)) > > > #----------------------------------- >@@ -126,4 +129,4 @@ > $(CC) $(LINKOPTS) $(OBJS) $(addprefix -l,$(LIBS)) > $(CREATELINK) $(TARGETREALNAME) $(TARGETDIR)/$(TARGETSONAME) > $(CREATELINK) $(TARGETSONAME) $(TARGETDIR)/$(TARGETLIB) >- >+ $(CREATELINK) $(TARGETREALNAME) $(TARGETDIR)/$(TARGET).jnilib >Index: src-native-new/src/client/TCPDataServer.cpp >=================================================================== >RCS file: /cvsroot/tptp/platform/org.eclipse.tptp.platform.agentcontroller/src-native-new/src/client/TCPDataServer.cpp,v >retrieving revision 1.26 >diff -u -r1.26 TCPDataServer.cpp >--- src-native-new/src/client/TCPDataServer.cpp 20 May 2008 18:54:22 -0000 1.26 >+++ src-native-new/src/client/TCPDataServer.cpp 10 Nov 2008 20:34:24 -0000 >@@ -9,7 +9,7 @@ > * Vishnu K Naikawadi, Intel - Initial API and Implementation (Based on the Java > * API implementation by IBM) > * >- * $Id: TCPDataServer.cpp,v 1.26 2008/05/20 18:54:22 jkubasta Exp $ >+ * $Id: TCPDataServer.cpp,v 1.1.6.1 2008/10/02 15:50:38 pklicnik Exp $ > * > *******************************************************************************/ > >@@ -742,7 +742,8 @@ > HANDLE th1; > DWORD tid1; > >- tptpStartThread(TCPDataServer::TCPDataProcessor::startThread, (LPVOID) _server, &tid1, &th1); >+ //~PK-CHANGE >+ tptpStartThread(TCPDataServer::TCPDataProcessor::startThread, (LPVOID) _server, (_opaque_pthread_t**)&tid1, &th1); > CLOSE_THREAD_HANDLE(th1); > > //HANDLE th2; >@@ -766,7 +767,8 @@ > HANDLE th1; > DWORD tid1; > >- tptpStartThread(TCPDataServer::TCPDataProcessor::startThread, (LPVOID) _server, &tid1, &th1); >+ //~PK-CHANGE >+ tptpStartThread(TCPDataServer::TCPDataProcessor::startThread, (LPVOID) _server, (_opaque_pthread_t**)&tid1, &th1); > CLOSE_THREAD_HANDLE(th1); > } > >Index: src-native-new/src/client/Client.make >=================================================================== >RCS file: /cvsroot/tptp/platform/org.eclipse.tptp.platform.agentcontroller/src-native-new/src/client/Client.make,v >retrieving revision 1.8 >diff -u -r1.8 Client.make >--- src-native-new/src/client/Client.make 19 Mar 2007 03:14:39 -0000 1.8 >+++ src-native-new/src/client/Client.make 10 Nov 2008 20:34:24 -0000 >@@ -3,7 +3,7 @@ > # > # makefile: client project > # >-# $Id: Client.make,v 1.8 2007/03/19 03:14:39 rsmith Exp $ >+# $Id: Client.make,v 1.1.6.4 2008/11/10 19:15:30 pklicnik Exp $ > ################################################################################ > > >@@ -27,8 +27,11 @@ > if [ x$VERSIONNUM = x ]; then export VERSIONNUM=0; fi > if [ x$MINORNUM = x ]; then export MINORNUM=0; fi > if [ x$RELEASENUM = x ]; then export RELEASENUM=0; fi >+export VERSIONNUM=5 >+export MINORNUM=0 >+export RELEASENUM=0 > >-TARGETLIB := $(TARGET).so >+TARGETLIB := $(TARGET).dylib > TARGETSONAME := $(TARGETLIB).$(VERSIONNUM) > TARGETREALNAME := $(TARGETSONAME).$(MINORNUM).$(RELEASENUM) > >@@ -55,7 +58,7 @@ > # list of additional libraries to be linked with > # (separated by blanks) > #----------------------------------- >-LIBS := uuid dl xerces-c transportSupport tptpUtils >+LIBS := dl xerces-c transportSupport tptpUtils > > #----------------------------------- > # list of additional library directories to search from >@@ -83,11 +86,11 @@ > # > #----------------------------------- > >-CFLAGS := $(C_FLAGS) $(DEBUGABLE) -Wall $(OPTIMIZABLE) -fPIC $(addprefix -I,$(INCLUDEDIRS)) -D_LINUX_X86 >+CFLAGS := $(C_FLAGS) $(DEBUGABLE) -Wall $(OPTIMIZABLE) -fPIC $(addprefix -I,$(INCLUDEDIRS)) > > CXXFLAGS := $(CFLAGS) > >-LINKOPTS := $(L_FLAGS) $(DEBUGABLE) -shared -Wl,-soname,$(TARGETSONAME) -o $(TARGETDIR)/$(TARGETREALNAME) $(addprefix -L,$(LIBDIRS)) >+LINKOPTS := $(L_FLAGS) $(DEBUGABLE) -undefined dynamic_lookup -dynamiclib -o $(TARGETDIR)/$(TARGETREALNAME) $(addprefix -L,$(LIBDIRS)) > > > #----------------------------------- >@@ -95,7 +98,7 @@ > #----------------------------------- > > CC := gcc >-CXX := $(CC) >+CXX := g++ > > SOURCE := $(wildcard *.cpp) > >@@ -135,4 +138,4 @@ > $(CC) $(LINKOPTS) $(OBJS) $(addprefix -l,$(LIBS)) > $(CREATELINK) $(TARGETREALNAME) $(TARGETDIR)/$(TARGETSONAME) > $(CREATELINK) $(TARGETSONAME) $(TARGETDIR)/$(TARGETLIB) >- >+ $(CREATELINK) $(TARGETREALNAME) $(TARGETDIR)/$(TARGET).jnilib >Index: src-native-new/src/client/ConnectionImpl.cpp >=================================================================== >RCS file: /cvsroot/tptp/platform/org.eclipse.tptp.platform.agentcontroller/src-native-new/src/client/ConnectionImpl.cpp,v >retrieving revision 1.34 >diff -u -r1.34 ConnectionImpl.cpp >--- src-native-new/src/client/ConnectionImpl.cpp 21 May 2008 15:53:28 -0000 1.34 >+++ src-native-new/src/client/ConnectionImpl.cpp 10 Nov 2008 20:34:24 -0000 >@@ -9,7 +9,7 @@ > * Vishnu K Naikawadi, Intel - Initial API and Implementation (Based on the Java > * API implementation by IBM) > * >- * $Id: ConnectionImpl.cpp,v 1.34 2008/05/21 15:53:28 jkubasta Exp $ >+ * $Id: ConnectionImpl.cpp,v 1.1.6.1 2008/10/02 15:50:38 pklicnik Exp $ > * > *******************************************************************************/ > >@@ -112,7 +112,8 @@ > DWORD tid; > > reader = new SocketReaderThread(this); >- tptpStartThread(ConnectionImpl::SocketReaderThread::startThread, (LPVOID) &reader, &tid, &th); >+ //~PK-CHANGE >+ tptpStartThread(ConnectionImpl::SocketReaderThread::startThread, (LPVOID) &reader, (_opaque_pthread_t**)&tid, &th); > CLOSE_THREAD_HANDLE(th); > > } >Index: src-native-new/test/Stress/Ping/Ping.make >=================================================================== >RCS file: /cvsroot/tptp/platform/org.eclipse.tptp.platform.agentcontroller/src-native-new/test/Stress/Ping/Ping.make,v >retrieving revision 1.1 >diff -u -r1.1 Ping.make >--- src-native-new/test/Stress/Ping/Ping.make 28 Aug 2006 18:48:05 -0000 1.1 >+++ src-native-new/test/Stress/Ping/Ping.make 10 Nov 2008 20:34:26 -0000 >@@ -3,7 +3,7 @@ > # > # makefile: GetAndRelease project > # >-# $Id: Ping.make,v 1.1 2006/08/28 18:48:05 akaylor Exp $ >+# $Id: Ping.make,v 1.1 2008/06/17 16:11:24 jcayne Exp $ > ################################################################################ > > >Index: src-native-new/src/agentController/AgentController.c >=================================================================== >RCS file: /cvsroot/tptp/platform/org.eclipse.tptp.platform.agentcontroller/src-native-new/src/agentController/AgentController.c,v >retrieving revision 1.36 >diff -u -r1.36 AgentController.c >--- src-native-new/src/agentController/AgentController.c 15 May 2008 21:51:56 -0000 1.36 >+++ src-native-new/src/agentController/AgentController.c 10 Nov 2008 20:34:23 -0000 >@@ -9,7 +9,7 @@ > * Andy Kaylor, Intel - Initial re-implementation of Agent Controller > * IBM - Non-Windows startup code moved from older RAC (by Andy Kaylor) > * >- * $Id: AgentController.c,v 1.36 2008/05/15 21:51:56 jkubasta Exp $ >+ * $Id: AgentController.c,v 1.1.6.2 2008/10/06 16:43:15 pklicnik Exp $ > *******************************************************************************/ > > >@@ -109,6 +109,7 @@ > BOOL invokeShutdown = FALSE; > int generateReturnVal = 0; > >+ printf( "argc check\n" ); > if (argc > 1) > { > if ( !parseAndProcessParameters( argc, argv, &invokeShutdown, &connectionManager ) ) >@@ -128,7 +129,12 @@ > } > /* Bug 175696 ends */ > >+ printf( "environment valid\n" ); >+ > initializeXMLPlatformUtils(); >+ >+ printf( "initalize XML\n" ); >+ > loggingService_init( &loggingService ); > > if ( invokeShutdown ) >@@ -159,11 +165,15 @@ > configurationManager.agentManager = &agentManager; > configurationManager.loggingService = &loggingService; > >+ printf( "after assignment stuff\n" ); >+ > /* Initialize */ > connectionManager_init( &connectionManager ); > agentManager_init( &agentManager ); > configurationManager_init( &configurationManager ); > >+ printf( "after initalization block\n" ); >+ > /* Search for the serviceconfig file and call SetConfig with default option if the serviceconfig has not been generated */ > generateReturnVal = generateDefaultServiceConfigIfNecessary(); > >@@ -171,6 +181,7 @@ > TPTP_LOG_ERROR_MSG1(am, "generateDefaultServiceConfigIfNecessary() function returned a non-zero error code, indicating an error. retval: %d", generateReturnVal); > } > >+ printf( "afer generateDefaultServiceConfig\n" ); > > /* Locate our configuration file */ > strcpy( configBuffer, argv[0] ); /* Bug 68906 */ >@@ -188,6 +199,8 @@ > /* Read our configuration settings */ > initRet = configurationManager_readConfigFile( &configurationManager ); > >+ printf( "after read config file\n" ); >+ > if (initRet < 0) > { > TPTP_LOG_DEBUG_MSG( am, "Error reading the Agent Controller configuration file. Please check for valid configuration." ); >@@ -206,6 +219,8 @@ > TPTP_LOG_DEBUG_MSG( am, "Ready to start servers" ); > > /* start the transport layers */ >+ >+ printf( "starting servers\n" ); > > rc = connectionManager_startServers( &connectionManager ); > if (rc == -1) >@@ -215,10 +230,12 @@ > printf( "See servicelog.log for error report. \n"); > return -1; > } >+ printf( "starting AutoloadAgents\n" ); > agentManager_startAutoloadAgents( &agentManager ); > > TPTP_LOG_DEBUG_MSG( am, "Everything is running" ); > >+ printf( "going into handle main complete\n" ); > handleMainComplete(); > } > } >@@ -773,19 +790,24 @@ > > #else /* Neither Windows nor OS400 */ > >+ printf( "flushing\n" ); > /* flush any error messages */ > fflush(stderr); > >+ printf( "mutex lock\n" ); > /* Wait for the okToEnd flag to be set */ > pthread_mutex_lock( &endMutex ); > while ( TRUE ) >- { >+ { >+ printf( "pthread_cond_wait\n" ); > pthread_cond_wait( &endCondition, &endMutex ); > if ( okToEnd ) > break; > } >+ printf( "pthread unlock\n" ); > pthread_mutex_unlock( &endMutex ); > >+ printf( "cleanup()\n" ); > cleanup(); > > /* Detach the internal server handle and wait for the external message pump to exit */ >Index: src-native-new/src/agentController/AgentController.make >=================================================================== >RCS file: /cvsroot/tptp/platform/org.eclipse.tptp.platform.agentcontroller/src-native-new/src/agentController/AgentController.make,v >retrieving revision 1.11 >diff -u -r1.11 AgentController.make >--- src-native-new/src/agentController/AgentController.make 31 Oct 2007 15:43:07 -0000 1.11 >+++ src-native-new/src/agentController/AgentController.make 10 Nov 2008 20:34:23 -0000 >@@ -3,7 +3,7 @@ > # > # makefile: AgentController project > # >-# $Id: AgentController.make,v 1.11 2007/10/31 15:43:07 samwai Exp $ >+# $Id: AgentController.make,v 1.1.6.3 2008/11/10 19:15:30 pklicnik Exp $ > ################################################################################ > > >@@ -58,11 +58,11 @@ > # > #----------------------------------- > >-CFLAGS := $(C_FLAGS) $(DEBUGABLE) -Wall $(OPTIMIZABLE) -fPIC $(addprefix -I,$(INCLUDEDIRS)) -D_LINUX_X86 -D_TPTP_DIAGNOSTIC_ >+CFLAGS := $(C_FLAGS) $(DEBUGABLE) -Wall $(OPTIMIZABLE) -fPIC $(addprefix -I,$(INCLUDEDIRS)) -D_TPTP_DIAGNOSTIC_ > > CXXFLAGS := $(CFLAGS) > >-LINKOPTS := $(L_FLAGS) $(DEBUGABLE) -o $(TARGETDIR)/$(TARGET) $(addprefix -L,$(LIBDIRS)) >+LINKOPTS := $(L_FLAGS) $(DEBUGABLE) -m $(addprefix -L,$(LIBDIRS)) -o $(TARGETDIR)/$(TARGET) > > > #----------------------------------- >@@ -70,7 +70,7 @@ > #----------------------------------- > > CC := gcc >-CXX := $(CC) >+CXX := g++ > > SOURCE := $(wildcard *.c) $(wildcard *.cpp) > >@@ -103,5 +103,5 @@ > > > $(TARGET) : $(OBJS) >- $(CC) $(LINKOPTS) $(OBJS) $(addprefix -l,$(LIBS)) >+ $(CXX) $(LINKOPTS) $(OBJS) $(addprefix -l,$(LIBS)) > >Index: src-native-new/src/agentController/AgentManager.c >=================================================================== >RCS file: /cvsroot/tptp/platform/org.eclipse.tptp.platform.agentcontroller/src-native-new/src/agentController/AgentManager.c,v >retrieving revision 1.64 >diff -u -r1.64 AgentManager.c >--- src-native-new/src/agentController/AgentManager.c 12 Jun 2007 17:15:52 -0000 1.64 >+++ src-native-new/src/agentController/AgentManager.c 10 Nov 2008 20:34:23 -0000 >@@ -7,7 +7,7 @@ > * > * Contributors: > * Andy Kaylor, Intel - Initial re-implementation of Agent Controller >- * $Id: AgentManager.c,v 1.64 2007/06/12 17:15:52 samwai Exp $ >+ * $Id: AgentManager.c,v 1.1.6.2 2008/11/10 19:50:40 pklicnik Exp $ > *******************************************************************************/ > > >@@ -1440,6 +1440,7 @@ > if ( (am->processControllerAgent != NULL ) && > (am->processControllerAgent->processID == processID) ) > { >+ printf( "found ProcessController!! %d %s\n", agentID, agentName ); > am->processControllerAgent->agentID = agentID; > strcpy( am->processControllerAgent->agentName, agentName ); > } >@@ -2826,6 +2827,7 @@ > processController = agentManager_getProcessController( am ); > if ( processController == 0 ) > { >+ printf( "TPTP_AM_NO_PROCESS_CONTROLLER BEING SENT FROM launchAgent: %d\n", processController ); > /* Report an error */ > agentManager_sendErrorResponse( am, TPTP_AM_NO_PROCESS_CONTROLLER, sourceID, context ); > >@@ -3040,20 +3042,24 @@ > *********************************************************************/ > agent_t* agentManager_getProcessController( AgentManager_t* am ) > { >+ printf( "in getProcessController\n" ); > if ( (am->processControllerAgent != 0) && > (am->processControllerAgent->agentID != -1) ) > { >+ printf( "I think the process controller agent process id is: %d\n", am->processControllerAgent->processID ); > if ( !isProcessActive( am->processControllerAgent->processID ) ) > { >+ printf( "!isProcessActive\n" ); > tptp_free( am->processControllerAgent ); > am->processControllerAgent = 0; > > /* TODO: Should we try to restart it? */ > } >- >+ printf( "returning something in getProcessController\n" ); > return am->processControllerAgent; > } > >+ printf( "returning 0 in getProcessController\n" ); > return 0; > } > >Index: src-native-new/src/agentController/ConnectionManager.c >=================================================================== >RCS file: /cvsroot/tptp/platform/org.eclipse.tptp.platform.agentcontroller/src-native-new/src/agentController/ConnectionManager.c,v >retrieving revision 1.31 >diff -u -r1.31 ConnectionManager.c >--- src-native-new/src/agentController/ConnectionManager.c 7 Dec 2007 04:04:05 -0000 1.31 >+++ src-native-new/src/agentController/ConnectionManager.c 10 Nov 2008 20:34:23 -0000 >@@ -7,7 +7,7 @@ > * > * Contributors: > * Andy Kaylor, Intel - Initial re-implementation of Agent Controller >- * $Id: ConnectionManager.c,v 1.31 2007/12/07 04:04:05 jkubasta Exp $ >+ * $Id: ConnectionManager.c,v 1.1.6.4 2008/11/10 19:50:40 pklicnik Exp $ > *******************************************************************************/ > > >@@ -120,13 +120,17 @@ > > #ifdef _WIN32 > strcpy( fullLibName, libName ); >+#elif __APPLE__ >+ sprintf( fullLibName, "lib%s.dylib", libName ); > #else > sprintf( fullLibName, "lib%s.so", libName ); > #endif >+ printf( "trying to load lib: %s\n", fullLibName ); > > dllRef = LOAD_LIBRARY( fullLibName ); > if ( dllRef != NULL ) > { >+ printf( "loaded lib: %s\n", fullLibName ); > /* Initialize our structure */ > tl->dllRef = dllRef; > tl->transportID = cm->nextTransportID;; >@@ -187,6 +191,7 @@ > } > else > { >+ TPTP_LOG_ERROR_MSG1( cm, "dlerror is: %s\n", dlerror() ); > TPTP_LOG_ERROR_MSG2( cm, "Unable to load transport layer: %s %s", libName, fullLibName ); > } > >@@ -203,13 +208,17 @@ > > #ifdef _WIN32 > strcpy( fullLibName, libName ); >+#elif __APPLE__ >+ sprintf( fullLibName, "lib%s.dylib", libName ); > #else > sprintf( fullLibName, "lib%s.so", libName ); > #endif > >+ printf( "trying to load library: %s\n", fullLibName ); > dllRef = LOAD_LIBRARY( fullLibName ); > if ( dllRef != NULL ) > { >+ printf( "got a reference to %s\n", fullLibName ); > /* Initialize our structure */ > cx->dllRef = dllRef; > cx->createCommandExtractor = (createCommandExtractor_ptr_t)RESOLVE_ENTRY_POINT( dllRef, "createCommandExtractor" ); >@@ -238,6 +247,7 @@ > } > else > { >+ TPTP_LOG_ERROR_MSG1( cm, "dlerror is: %s\n", dlerror() ); > TPTP_LOG_ERROR_MSG2( cm, "Unable to load command extractor: %s %s", libName, fullLibName ); > } > >@@ -255,8 +265,10 @@ > { > mp = (message_pipeline_t*)node->data; > >+ printf( "startServers\n" ); > ret = mp->tl.startTransportListener( &(mp->tl.tlo) ); > >+ > if ( ret != 0 ) > { > /* Log an error */ >Index: src-config/org/eclipse/tptp/platform/agentcontroller/config/PlatformObject.java >=================================================================== >RCS file: /cvsroot/tptp/platform/org.eclipse.tptp.platform.agentcontroller/src-config/org/eclipse/tptp/platform/agentcontroller/config/PlatformObject.java,v >retrieving revision 1.6 >diff -u -r1.6 PlatformObject.java >--- src-config/org/eclipse/tptp/platform/agentcontroller/config/PlatformObject.java 6 Apr 2006 15:48:11 -0000 1.6 >+++ src-config/org/eclipse/tptp/platform/agentcontroller/config/PlatformObject.java 10 Nov 2008 20:34:22 -0000 >@@ -4,7 +4,7 @@ > are made available under the terms of the Eclipse Public License v1.0 > which accompanies this distribution, and is available at > http://www.eclipse.org/legal/epl-v10.html >-$Id: PlatformObject.java,v 1.6 2006/04/06 15:48:11 samwai Exp $ >+$Id: PlatformObject.java,v 1.1.6.1 2008/10/06 12:15:42 pklicnik Exp $ > Â > Contributors: > Â Â Â IBM Rational - initial implementation >@@ -26,7 +26,7 @@ > public final static String jvmLib = getJvmLib(); > public final static String keytool = getKeytool(); > public final static String quote = getQuote(); >- >+ > private static String getEncoding() { > if(name.equals("z/OS") || name.equals("OS/390")) { > // return "ibm-1047-s390"; // Bug 99057 >@@ -35,7 +35,7 @@ > } > else { > return "UTF-8"; >- } >+ } > } > > private static String getLibEnv() { >@@ -48,6 +48,10 @@ > else if(name.startsWith("Windows")) { > return "PATH"; > } >+ else if (name.startsWith("Mac")) { >+ // I'm not convinced its LD_LIBRARY_PATH on mac, but we'll see >+ return "LD_LIBRARY_PATH"; >+ } > else { > return "LD_LIBRARY_PATH"; > } >@@ -90,6 +94,9 @@ > else if(name.equals("HP-UX")) { > return "libjvm.sl"; > } >+ else if(name.startsWith("Mac")) { >+ return "libjvm.dylib"; >+ } > else { > return "libjvm.so"; > } >Index: src-native-new/src/transport/RASharedMemory/RASharedMemory.make >=================================================================== >RCS file: /cvsroot/tptp/platform/org.eclipse.tptp.platform.agentcontroller/src-native-new/src/transport/RASharedMemory/RASharedMemory.make,v >retrieving revision 1.7 >diff -u -r1.7 RASharedMemory.make >--- src-native-new/src/transport/RASharedMemory/RASharedMemory.make 2 Apr 2007 18:05:38 -0000 1.7 >+++ src-native-new/src/transport/RASharedMemory/RASharedMemory.make 10 Nov 2008 20:34:25 -0000 >@@ -27,8 +27,11 @@ > if [ x$VERSIONNUM = x ]; then export VERSIONNUM=0; fi > if [ x$MINORNUM = x ]; then export MINORNUM=0; fi > if [ x$RELEASENUM = x ]; then export RELEASENUM=0; fi >+export VERSIONNUM=5 >+export MINORNUM=0 >+export RELEASENUM=0 > >-TARGETLIB := $(TARGET).so >+TARGETLIB := $(TARGET).dylib > TARGETSONAME := $(TARGETLIB).$(VERSIONNUM) > TARGETREALNAME := $(TARGETSONAME).$(MINORNUM).$(RELEASENUM) > >@@ -37,7 +40,7 @@ > # list of additional INCLUDE directories to search headers from > # (separated by blanks) > #----------------------------------- >-INCLUDEDIRS := . ../../../include ../RACommon ../RASocket $(JAVA_HOME)/include $(JAVA_HOME)/include/linux >+INCLUDEDIRS := . ../../../include ../RACommon ../RASocket /System/Library/Frameworks/JavaVM.framework/Versions/CurrentJDK/Headers/ > > > #----------------------------------- >@@ -72,22 +75,22 @@ > # > #----------------------------------- > >-DEFINES := -DSQLUNIX -DSQLLinux -DENW -DREENTRANT -D_REENTRANT -DCONFIG_X86_CMPXCHG >+DEFINES := -DSQLUNIX -DENW -DREENTRANT -D_REENTRANT -DCONFIG_X86_CMPXCHG > >-CFLAGS := $(C_FLAGS) $(DEBUGABLE) -Wall $(OPTIMIZABLE) -fPIC $(addprefix -I,$(INCLUDEDIRS)) -D_LINUX_X86 $(DEFINES) >+CFLAGS := $(C_FLAGS) $(DEBUGABLE) -Wall $(OPTIMIZABLE) -fPIC $(addprefix -I,$(INCLUDEDIRS)) $(DEFINES) > > CXXFLAGS := $(CFLAGS) > >-LINKOPTS := $(L_FLAGS) $(DEBUGABLE) -shared -Wl,-soname,$(TARGETSONAME) -o $(TARGETDIR)/$(TARGETREALNAME) $(addprefix -L,$(LIBDIRS)) >+LINKOPTS := $(L_FLAGS) $(DEBUGABLE) -undefined dynamic_lookup -dynamiclib -o $(TARGETDIR)/$(TARGETREALNAME) $(addprefix -L,$(LIBDIRS)) > > > #----------------------------------- > # general commands and options > #----------------------------------- > >-CC := g++ >+CC := gcc > CXX := g++ >-CPP := g++ >+CPP := $(CXX) > > SOURCE := $(wildcard *.c) $(wildcard *.cpp) > >@@ -127,4 +130,4 @@ > $(CC) $(LINKOPTS) $(OBJS) $(addprefix -l,$(LIBS)) > $(CREATELINK) $(TARGETREALNAME) $(TARGETDIR)/$(TARGETSONAME) > $(CREATELINK) $(TARGETSONAME) $(TARGETDIR)/$(TARGETLIB) >- >+ $(CREATELINK) $(TARGETREALNAME) $(TARGETDIR)/$(TARGET).jnilib >Index: src-native-new/src/transport/RASharedMemory/sun_asm.il >=================================================================== >RCS file: /cvsroot/tptp/platform/org.eclipse.tptp.platform.agentcontroller/src-native-new/src/transport/RASharedMemory/sun_asm.il,v >retrieving revision 1.3 >diff -u -r1.3 sun_asm.il >--- src-native-new/src/transport/RASharedMemory/sun_asm.il 8 Aug 2005 19:32:00 -0000 1.3 >+++ src-native-new/src/transport/RASharedMemory/sun_asm.il 10 Nov 2008 20:34:25 -0000 >@@ -4,7 +4,7 @@ > * are made available under the terms of the Eclipse Public License v1.0 > * which accompanies this distribution, and is available at > * http://www.eclipse.org/legal/epl-v10.html >- * $Id: sun_asm.il,v 1.3 2005/08/08 19:32:00 akaylor Exp $ >+ * $Id: sun_asm.il,v 1.1 2008/06/17 16:11:24 jcayne Exp $ > * > * Contributors: > * IBM - Initial API and implementation >Index: src-native-new/src/transport/RASharedMemory/ldcws.s >=================================================================== >RCS file: /cvsroot/tptp/platform/org.eclipse.tptp.platform.agentcontroller/src-native-new/src/transport/RASharedMemory/ldcws.s,v >retrieving revision 1.3 >diff -u -r1.3 ldcws.s >--- src-native-new/src/transport/RASharedMemory/ldcws.s 8 Aug 2005 19:32:00 -0000 1.3 >+++ src-native-new/src/transport/RASharedMemory/ldcws.s 10 Nov 2008 20:34:25 -0000 >@@ -6,7 +6,7 @@ > ; are made available under the terms of the Eclipse Public License v1.0 > ; which accompanies this distribution, and is available at > ; http://www.eclipse.org/legal/epl-v10.html >-; $Id: ldcws.s,v 1.3 2005/08/08 19:32:00 akaylor Exp $ >+; $Id: ldcws.s,v 1.1 2008/06/17 16:11:24 jcayne Exp $ > ; > ; Contributors: > ; IBM - Initial API and implementation >Index: src-native-new/src/transport/RASharedMemory/osslatch.h >=================================================================== >RCS file: /cvsroot/tptp/platform/org.eclipse.tptp.platform.agentcontroller/src-native-new/src/transport/RASharedMemory/osslatch.h,v >retrieving revision 1.8 >diff -u -r1.8 osslatch.h >--- src-native-new/src/transport/RASharedMemory/osslatch.h 19 Mar 2007 03:14:37 -0000 1.8 >+++ src-native-new/src/transport/RASharedMemory/osslatch.h 10 Nov 2008 20:34:25 -0000 >@@ -4,7 +4,7 @@ > * are made available under the terms of the Eclipse Public License v1.0 > * which accompanies this distribution, and is available at > * http://www.eclipse.org/legal/epl-v10.html >- * $Id: osslatch.h,v 1.8 2007/03/19 03:14:37 rsmith Exp $ >+ * $Id: osslatch.h,v 1.1.6.2 2008/10/06 12:31:21 pklicnik Exp $ > * > * Contributors: > * IBM - Initial API and implementation >@@ -109,6 +109,10 @@ > /* The lock word size in abilock_t is the same for both 32- and 64-bit */ > #include <abi_mutex.h> > typedef volatile abilock_t OSSLock ; >+#elif defined __APPLE__ >+ #include <libkern/OSAtomic.h> >+ #include <pthread.h> >+ typedef OSSpinLock OSSLock ; > #else > typedef volatile int OSSLock ; > #endif >@@ -343,6 +347,14 @@ > return (0==cs(&oldval,((cs_t*)oss_lockaddr(pLatch)),OSS_LATCH_LOCK)); > } > >+/******************************************************************************/ >+#elif defined __APPLE__ >+ >+#define oss_lockaddr(pLatch) (&((pLatch)->lock)) >+#define oss_trylock(pLatch) ( OSSpinLockTry(oss_lockaddr(pLatch)) ) >+#define oss_checklock(pLatch) ( *oss_lockaddr(pLatch) ) >+#define oss_unlock(pLatch) ((void)OSSpinLockUnlock(oss_lockaddr(pLatch))) >+#define oss_initlock(pLatch) ((void)(oss_unlock((pLatch)))) > > /******************************************************************************/ > #elif defined SQL_OS400 /*@d170450ssu*/ >Index: src-native-new/src/transport/RASharedMemory/osstime.cpp >=================================================================== >RCS file: /cvsroot/tptp/platform/org.eclipse.tptp.platform.agentcontroller/src-native-new/src/transport/RASharedMemory/osstime.cpp,v >retrieving revision 1.4 >diff -u -r1.4 osstime.cpp >--- src-native-new/src/transport/RASharedMemory/osstime.cpp 19 Mar 2007 03:14:37 -0000 1.4 >+++ src-native-new/src/transport/RASharedMemory/osstime.cpp 10 Nov 2008 20:34:25 -0000 >@@ -4,7 +4,7 @@ > * are made available under the terms of the Eclipse Public License v1.0 > * which accompanies this distribution, and is available at > * http://www.eclipse.org/legal/epl-v10.html >- * $Id: osstime.cpp,v 1.4 2007/03/19 03:14:37 rsmith Exp $ >+ * $Id: osstime.cpp,v 1.1.6.1 2008/10/06 12:31:21 pklicnik Exp $ > * > * Contributors: > * IBM - Initial API and implementation >@@ -39,7 +39,9 @@ > > #ifdef SQLWINT > #include <windows.h> >- >+#elif __APPLE__ >+#include <unistd.h> >+#include <time.h> > #elif SQLUNIX > #include <time.h> > #include <unistd.h> >@@ -61,6 +63,16 @@ > Sleep(1); > #elif SQLOS2 > DosSleep(1); >+#elif __APPLE__ >+ struct timespec t1; >+ struct timespec t2; >+ t1.tv_sec=0; >+ t1.tv_nsec=900; >+ //printf( "before nanosleep\n" ); >+ //nanosleep(&t1, &t2); >+ //sleep(1); >+ usleep(1); >+ //printf( "after nanosleep\n" ); > #elif SQLUNIX > usleep(1); > #else >Index: src-native-new/src/agents/FileTransferAgent/FileTransferAgent.make >=================================================================== >RCS file: /cvsroot/tptp/platform/org.eclipse.tptp.platform.agentcontroller/src-native-new/src/agents/FileTransferAgent/FileTransferAgent.make,v >retrieving revision 1.5 >diff -u -r1.5 FileTransferAgent.make >--- src-native-new/src/agents/FileTransferAgent/FileTransferAgent.make 19 Mar 2007 03:14:40 -0000 1.5 >+++ src-native-new/src/agents/FileTransferAgent/FileTransferAgent.make 10 Nov 2008 20:34:23 -0000 >@@ -27,7 +27,7 @@ > # list of additional libraries to be linked with > # (separated by blanks) > #----------------------------------- >-LIBS := tptpUtils tptpLogUtils processControlUtil tptpConfig tptpAgentBase namedPipeTL transportSupport sharedMemTL xerces-c hcclco hcclsm hccls >+LIBS := tptpUtils tptpLogUtils processControlUtil tptpConfig tptpAgentBase namedPipeTL transportSupport sharedMemTL xerces-c hcclco hcclsm hccls stdc++ iconv > > #----------------------------------- > # list of additional library directories to search from >@@ -54,11 +54,11 @@ > # > #----------------------------------- > >-CFLAGS := $(C_FLAGS) $(DEBUGABLE) -Wall $(OPTIMIZABLE) -fPIC $(addprefix -I,$(INCLUDEDIRS)) -D_LINUX_X86 >+CFLAGS := $(C_FLAGS) $(DEBUGABLE) -Wall $(OPTIMIZABLE) -fPIC $(addprefix -I,$(INCLUDEDIRS)) > > CXXFLAGS := $(CFLAGS) > >-LINKOPTS := $(L_FLAGS) $(DEBUGABLE) -o $(TARGETDIR)/$(TARGET) $(addprefix -L,$(LIBDIRS)) >+LINKOPTS := $(L_FLAGS) $(DEBUGABLE) -m $(addprefix -L,$(LIBDIRS)) -o $(TARGETDIR)/$(TARGET) > > > #----------------------------------- >@@ -66,7 +66,7 @@ > #----------------------------------- > > CC := gcc >-CXX := $(CC) >+CXX := g++ > > SOURCE := $(wildcard *.c) $(wildcard *.cpp) > >@@ -100,4 +100,4 @@ > > > $(TARGET) : $(OBJS) >- $(CC) $(LINKOPTS) $(OBJS) $(addprefix -l,$(LIBS)) >+ $(CXX) $(LINKOPTS) $(OBJS) $(addprefix -l,$(LIBS)) >Index: src-native-new/src/agents/FileTransferAgent/FileTransferAgent.cpp >=================================================================== >RCS file: /cvsroot/tptp/platform/org.eclipse.tptp.platform.agentcontroller/src-native-new/src/agents/FileTransferAgent/FileTransferAgent.cpp,v >retrieving revision 1.25 >diff -u -r1.25 FileTransferAgent.cpp >--- src-native-new/src/agents/FileTransferAgent/FileTransferAgent.cpp 9 Apr 2007 17:01:26 -0000 1.25 >+++ src-native-new/src/agents/FileTransferAgent/FileTransferAgent.cpp 10 Nov 2008 20:34:23 -0000 >@@ -8,7 +8,7 @@ > * Contributors: > * Hoang Nguyen, Intel - Initial implementation. > * >- * $Id: FileTransferAgent.cpp,v 1.25 2007/04/09 17:01:26 gnagarajan Exp $ >+ * $Id: FileTransferAgent.cpp,v 1.1.6.1 2008/10/02 15:50:38 pklicnik Exp $ > * > *******************************************************************************/ > >@@ -175,8 +175,9 @@ > pInfo->localFile = localFile; > pInfo->remoteFile = remoteFile; > pInfo->pAgent = this; >- >- ret= tptpStartThread(putFileThread, (void *) pInfo, &pthreadId, &pthreadHandle); >+ >+ //~PK-CHANGE >+ ret= tptpStartThread(putFileThread, (void *) pInfo, (_opaque_pthread_t**)&pthreadId, &pthreadHandle); > if (ret == -1) { > TPTP_LOG_ERROR_MSG(this, "FileTransferAgent putFile -error with create and get"); > return ERROR; >@@ -434,7 +435,7 @@ > pInfo->remoteFile = remoteFile; > pInfo->pAgent = this; > >- ret= tptpStartThread(getFileThread, (void *) pInfo, &pthreadId, &pthreadHandle); >+ ret= tptpStartThread(getFileThread, (void *) pInfo, (_opaque_pthread_t**)&pthreadId, &pthreadHandle); > > if (ret == -1) { > TPTP_LOG_ERROR_MSG(this, "FileTransferAgent -- error with open and send "); >Index: src-native-new/test/testAgentController/NamedPipeTLTest/nptlTest.make >=================================================================== >RCS file: /cvsroot/tptp/platform/org.eclipse.tptp.platform.agentcontroller/src-native-new/test/testAgentController/NamedPipeTLTest/nptlTest.make,v >retrieving revision 1.1 >diff -u -r1.1 nptlTest.make >--- src-native-new/test/testAgentController/NamedPipeTLTest/nptlTest.make 27 May 2005 00:41:27 -0000 1.1 >+++ src-native-new/test/testAgentController/NamedPipeTLTest/nptlTest.make 10 Nov 2008 20:34:26 -0000 >@@ -3,7 +3,7 @@ > # > # makefile: NamedPipeTLTestUtils project > # >-# $Id: nptlTest.make,v 1.1 2005/05/27 00:41:27 akaylor Exp $ >+# $Id: nptlTest.make,v 1.1 2008/06/17 16:11:24 jcayne Exp $ > ################################################################################ > > >Index: src-native-new/test/Stress/MultiThread/MultiThread.make >=================================================================== >RCS file: /cvsroot/tptp/platform/org.eclipse.tptp.platform.agentcontroller/src-native-new/test/Stress/MultiThread/MultiThread.make,v >retrieving revision 1.1 >diff -u -r1.1 MultiThread.make >--- src-native-new/test/Stress/MultiThread/MultiThread.make 7 Nov 2005 20:51:59 -0000 1.1 >+++ src-native-new/test/Stress/MultiThread/MultiThread.make 10 Nov 2008 20:34:26 -0000 >@@ -3,7 +3,7 @@ > # > # makefile: MultiThread project > # >-# $Id$ >+# $Id: MultiThread.make,v 1.1 2008/06/17 16:11:24 jcayne Exp $ > ################################################################################ > > >Index: src-native-new/src/agents/agentBase/AgentBase.make >=================================================================== >RCS file: /cvsroot/tptp/platform/org.eclipse.tptp.platform.agentcontroller/src-native-new/src/agents/agentBase/AgentBase.make,v >retrieving revision 1.11 >diff -u -r1.11 AgentBase.make >--- src-native-new/src/agents/agentBase/AgentBase.make 19 Mar 2007 03:14:39 -0000 1.11 >+++ src-native-new/src/agents/agentBase/AgentBase.make 10 Nov 2008 20:34:23 -0000 >@@ -3,7 +3,7 @@ > # > # makefile: agentBase project > # >-# $Id: AgentBase.make,v 1.11 2007/03/19 03:14:39 rsmith Exp $ >+# $Id: AgentBase.make,v 1.1.6.5 2008/11/10 19:15:30 pklicnik Exp $ > ################################################################################ > > >@@ -27,8 +27,11 @@ > if [ x$VERSIONNUM = x ]; then export VERSIONNUM=0; fi > if [ x$MINORNUM = x ]; then export MINORNUM=0; fi > if [ x$RELEASENUM = x ]; then export RELEASENUM=0; fi >+export VERSIONNUM=5 >+export MINORNUM=0 >+export RELEASENUM=0 > >-TARGETLIB := $(TARGET).so >+TARGETLIB := $(TARGET).dylib > TARGETSONAME := $(TARGETLIB).$(VERSIONNUM) > TARGETREALNAME := $(TARGETSONAME).$(MINORNUM).$(RELEASENUM) > >@@ -43,7 +46,7 @@ > # list of additional libraries to be linked with > # (separated by blanks) > #----------------------------------- >-LIBS := uuid dl transportSupport tptpUtils tptpLogUtils tptpConfig pthread xerces-c >+LIBS := dl transportSupport tptpUtils tptpLogUtils tptpConfig pthread xerces-c stdc++ > > #----------------------------------- > # list of additional library directories to search from >@@ -70,11 +73,11 @@ > # > #----------------------------------- > >-CFLAGS := $(C_FLAGS) $(DEBUGABLE) -Wall $(OPTIMIZABLE) -fPIC $(addprefix -I,$(INCLUDEDIRS)) -D_LINUX_X86 >+CFLAGS := $(C_FLAGS) $(DEBUGABLE) -Wall $(OPTIMIZABLE) -fPIC $(addprefix -I,$(INCLUDEDIRS)) > > CXXFLAGS := $(CFLAGS) > >-LINKOPTS := $(L_FLAGS) $(DEBUGABLE) -shared -Wl,-soname,$(TARGETSONAME) -o $(TARGETDIR)/$(TARGETREALNAME) $(addprefix -L,$(LIBDIRS)) >+LINKOPTS := $(L_FLAGS) $(DEBUGABLE) -Wl,-m -undefined dynamic_lookup -dynamiclib -o $(TARGETDIR)/$(TARGETREALNAME) $(addprefix -L,$(LIBDIRS)) > > > #----------------------------------- >@@ -82,7 +85,7 @@ > #----------------------------------- > > CC := gcc >-CXX := $(CC) >+CXX := g++ > > SOURCE := $(wildcard *.cpp) > >@@ -122,4 +125,4 @@ > $(CC) $(LINKOPTS) $(OBJS) $(addprefix -l,$(LIBS)) > $(CREATELINK) $(TARGETREALNAME) $(TARGETDIR)/$(TARGETSONAME) > $(CREATELINK) $(TARGETSONAME) $(TARGETDIR)/$(TARGETLIB) >- >+ $(CREATELINK) $(TARGETREALNAME) $(TARGETDIR)/$(TARGET).jnilib >Index: src-native-new/src/agents/agentBase/BaseAgentImpl.cpp >=================================================================== >RCS file: /cvsroot/tptp/platform/org.eclipse.tptp.platform.agentcontroller/src-native-new/src/agents/agentBase/BaseAgentImpl.cpp,v >retrieving revision 1.71 >diff -u -r1.71 BaseAgentImpl.cpp >--- src-native-new/src/agents/agentBase/BaseAgentImpl.cpp 29 Apr 2008 19:19:25 -0000 1.71 >+++ src-native-new/src/agents/agentBase/BaseAgentImpl.cpp 10 Nov 2008 20:34:24 -0000 >@@ -8,7 +8,7 @@ > * Contributors: > * Vishnu K Naikawadi,Intel - Initial API and implementation > * >- * $Id: BaseAgentImpl.cpp,v 1.71 2008/04/29 19:19:25 aalexeev Exp $ >+ * $Id: BaseAgentImpl.cpp,v 1.1.6.1 2008/10/17 16:17:42 pklicnik Exp $ > *******************************************************************************/ > > #include <stdio.h> >@@ -497,6 +497,8 @@ > char *errStr = NULL; > char *fullStr = NULL; > >+ printf( "sending error command!!!\n" ); >+ > // Convert TPTP error code into a string and append errInfo string > // to get the complete error msg. > errStr = tptp_getErrorString(tptpErrCode); >Index: src-native-new/src/agents/agentBase/DataProviderImpl.cpp >=================================================================== >RCS file: /cvsroot/tptp/platform/org.eclipse.tptp.platform.agentcontroller/src-native-new/src/agents/agentBase/DataProviderImpl.cpp,v >retrieving revision 1.39 >diff -u -r1.39 DataProviderImpl.cpp >--- src-native-new/src/agents/agentBase/DataProviderImpl.cpp 26 May 2008 21:01:33 -0000 1.39 >+++ src-native-new/src/agents/agentBase/DataProviderImpl.cpp 10 Nov 2008 20:34:24 -0000 >@@ -8,7 +8,7 @@ > * Contributors: > * Vishnu K Naikawadi,Intel - Initial API and implementation > * >- * $Id: DataProviderImpl.cpp,v 1.39 2008/05/26 21:01:33 aalexeev Exp $ >+ * $Id: DataProviderImpl.cpp,v 1.1.6.1 2008/10/02 13:43:08 pklicnik Exp $ > *******************************************************************************/ > > #include <stdio.h> >@@ -446,8 +446,8 @@ > { > DWORD tid ; > HANDLE th ; >- >- tptpStartThread(handleSharedMemMsg, (void *) dataConn, &tid, &th); >+ //~PK-CHANGE - casted the int to _opaque_pthread_t** ... correct? >+ tptpStartThread(handleSharedMemMsg, (void *) dataConn, (_opaque_pthread_t**) &tid, &th); > CLOSE_THREAD_HANDLE(th); > } > >Index: src-native-new/src/shared/processControlUtil/ProcessControlUtil.c >=================================================================== >RCS file: /cvsroot/tptp/platform/org.eclipse.tptp.platform.agentcontroller/src-native-new/src/shared/processControlUtil/ProcessControlUtil.c,v >retrieving revision 1.50 >diff -u -r1.50 ProcessControlUtil.c >--- src-native-new/src/shared/processControlUtil/ProcessControlUtil.c 16 May 2008 21:25:55 -0000 1.50 >+++ src-native-new/src/shared/processControlUtil/ProcessControlUtil.c 10 Nov 2008 20:34:25 -0000 >@@ -10,10 +10,14 @@ > * code which was implemented by IBM > * IBM Corporation - initial implementation of process launch > * >- * $Id: ProcessControlUtil.c,v 1.50 2008/05/16 21:25:55 jkubasta Exp $ >+ * $Id: ProcessControlUtil.c,v 1.1.6.2 2008/10/17 16:17:42 pklicnik Exp $ > *******************************************************************************/ > #include <stdio.h> >-#include <malloc.h> >+#ifdef __APPLE__ >+ #include <stdlib.h> >+#else >+ #include <malloc.h> >+#endif > #include "tptp/TransportSupport.h" > #include "tptp/ProcCtlUtils.h" > #include "tptp/NoLog.h" >@@ -36,8 +40,13 @@ > #include <errno.h> > #include <sys/stat.h> > #include <sys/types.h> >- #include <linux/stat.h> //for mode S_IXUSR >+ #ifndef __APPLE__ >+ #include <linux/stat.h> //for mode S_IXUSR >+ #endif > #define STAT stat >+ >+ #include <errno.h> >+ > #endif > extern char **environ; > void freeEnvironmentStrings(void *env); >@@ -459,14 +468,25 @@ > struct STAT statBuf; > mode_t modes; > *errCode=0; >+ FILE *out = fopen( "check.log", "a+" ); >+ >+ int result; >+ >+ fprintf( out, "checking file: %s\n", appName ); > > // Check if file exists (not a directory) and that user has execute permission. > if (appName) > { >- if (STAT(appName, &statBuf) != 0) >+ result = STAT(appName, &statBuf); >+ if (result != 0) > { > //perror("PCUtil"); > *errCode = TPTP_PC_EXECUTABLE_NOT_FOUND; >+ fprintf( out, "checkExec: Invalid App\n" ); >+ fprintf( out, "result is: %d\n", result ); >+ fprintf( out, "error string is: %s\n", strerror(errno) ); >+ >+ fflush( out ); > TPTP_LOG_DEBUG_MSG1("PCUtil: Error - Invalid App %s", appName); > return validApp; > } >@@ -474,15 +494,21 @@ > if (S_ISDIR(modes)) > { > *errCode = TPTP_PC_FILE_IS_A_DIR; >+ fprintf( out, "checkExec: App is dir\n" ); >+ fflush( out ); > TPTP_LOG_DEBUG_MSG1("PCUtil: Error - App %s is a directory", appName); > } > else if ((modes & S_IXUSR) == S_IXUSR) > { > validApp = 1; >+ fprintf( out, "checkExec: apparently, a valid app\n" ); >+ fflush( out ); > } > else > { > *errCode = TPTP_PC_FILE_NOT_EXECUTABLE; >+ fprintf( out, "checkExec: not exec by owner\n" ); >+ fflush( out ); > TPTP_LOG_DEBUG_MSG1("PCUtil: Error - App %s is not executable by owner", appName); > } > } >@@ -490,8 +516,11 @@ > { > //Null argument > *errCode = TPTP_UNEXPECTED_NULL_ARG; >+ fprintf( out, "checkexec: arg is null\n" ); >+ fflush( out ); > TPTP_LOG_DEBUG_MSG("PCUtil: Error - Arg appName is a NULL value"); > } >+ fclose( out ); > return validApp; > } > >Index: src-native-new/src/shared/processControlUtil/launcher_md.c >=================================================================== >RCS file: /cvsroot/tptp/platform/org.eclipse.tptp.platform.agentcontroller/src-native-new/src/shared/processControlUtil/launcher_md.c,v >retrieving revision 1.25 >diff -u -r1.25 launcher_md.c >--- src-native-new/src/shared/processControlUtil/launcher_md.c 25 Oct 2007 10:25:42 -0000 1.25 >+++ src-native-new/src/shared/processControlUtil/launcher_md.c 10 Nov 2008 20:34:25 -0000 >@@ -10,7 +10,7 @@ > * Karla Callaghan, Intel - Brought multi-platform support in from HCLauncher > * code which was implemented by IBM > * >- * $Id: launcher_md.c,v 1.25 2007/10/25 10:25:42 ialelekov Exp $ >+ * $Id: launcher_md.c,v 1.1.6.1 2008/10/17 16:17:42 pklicnik Exp $ > *******************************************************************************/ > > #ifdef MVS >@@ -68,7 +68,7 @@ > CloseHandle(handle); > } > return FALSE; >-#elif defined _AIX || defined MVS || defined _HPUX >+#elif defined _AIX || defined MVS || defined _HPUX || defined __APPLE__ > errno = 0; > if(-1 == getpriority(PRIO_PROCESS, pid) && errno != 0) { > return FALSE; >Index: src-native-new/src/shared/processControlUtil/ProcessControlUtil.make >=================================================================== >RCS file: /cvsroot/tptp/platform/org.eclipse.tptp.platform.agentcontroller/src-native-new/src/shared/processControlUtil/ProcessControlUtil.make,v >retrieving revision 1.5 >diff -u -r1.5 ProcessControlUtil.make >--- src-native-new/src/shared/processControlUtil/ProcessControlUtil.make 19 Mar 2007 03:14:40 -0000 1.5 >+++ src-native-new/src/shared/processControlUtil/ProcessControlUtil.make 10 Nov 2008 20:34:25 -0000 >@@ -3,7 +3,7 @@ > # > # makefile: processControlUtil project > # >-# $Id: ProcessControlUtil.make,v 1.5 2007/03/19 03:14:40 rsmith Exp $ >+# $Id: ProcessControlUtil.make,v 1.1.6.4 2008/11/10 19:15:30 pklicnik Exp $ > ################################################################################ > > >@@ -27,8 +27,11 @@ > if [ x$VERSIONNUM = x ]; then export VERSIONNUM=0; fi > if [ x$MINORNUM = x ]; then export MINORNUM=0; fi > if [ x$RELEASENUM = x ]; then export RELEASENUM=0; fi >+export VERSIONNUM=5 >+export MINORNUM=0 >+export RELEASENUM=0 > >-TARGETLIB := $(TARGET).so >+TARGETLIB := $(TARGET).dylib > TARGETSONAME := $(TARGETLIB).$(VERSIONNUM) > TARGETREALNAME := $(TARGETSONAME).$(MINORNUM).$(RELEASENUM) > >@@ -44,7 +47,7 @@ > # list of additional libraries to be linked with > # (separated by blanks) > #----------------------------------- >-LIBS := uuid dl >+LIBS := dl > > #----------------------------------- > # list of additional library directories to search from >@@ -72,11 +75,11 @@ > # > #----------------------------------- > >-CFLAGS := $(C_FLAGS) $(DEBUGABLE) -Wall $(OPTIMIZABLE) -fPIC $(addprefix -I,$(INCLUDEDIRS)) -D_LINUX_X86 >+CFLAGS := $(C_FLAGS) $(DEBUGABLE) -Wall $(OPTIMIZABLE) -fPIC $(addprefix -I,$(INCLUDEDIRS)) > > CXXFLAGS := $(CFLAGS) > >-LINKOPTS := $(L_FLAGS) $(DEBUGABLE) -shared -Wl,-soname,$(TARGETSONAME) -o $(TARGETDIR)/$(TARGETREALNAME) $(addprefix -L,$(LIBDIRS)) >+LINKOPTS := $(L_FLAGS) $(DEBUGABLE) -undefined dynamic_lookup -dynamiclib -o $(TARGETDIR)/$(TARGETREALNAME) $(addprefix -L,$(LIBDIRS)) > > > #----------------------------------- >@@ -124,4 +127,4 @@ > $(CC) $(LINKOPTS) $(OBJS) $(addprefix -l,$(LIBS)) > $(CREATELINK) $(TARGETREALNAME) $(TARGETDIR)/$(TARGETSONAME) > $(CREATELINK) $(TARGETSONAME) $(TARGETDIR)/$(TARGETLIB) >- >+ $(CREATELINK) $(TARGETREALNAME) $(TARGETDIR)/$(TARGET).jnilib >Index: src-native-new/src/agents/native/java_profiler/hash.c >=================================================================== >RCS file: /cvsroot/tptp/platform/org.eclipse.tptp.platform.agentcontroller/src-native-new/src/agents/native/java_profiler/hash.c,v >retrieving revision 1.2 >diff -u -r1.2 hash.c >--- src-native-new/src/agents/native/java_profiler/hash.c 6 Apr 2007 00:40:59 -0000 1.2 >+++ src-native-new/src/agents/native/java_profiler/hash.c 10 Nov 2008 20:34:24 -0000 >@@ -4,7 +4,7 @@ > * are made available under the terms of the Eclipse Public License v1.0 > * which accompanies this distribution, and is available at > * http://www.eclipse.org/legal/epl-v10.html >- * $Id: hash.c,v 1.2 2007/04/06 00:40:59 jkubasta Exp $ >+ * $Id: hash.c,v 1.1.6.1 2008/10/02 15:50:38 pklicnik Exp $ > * > * Contributors: > * IBM - Initial API and implementation >@@ -17,6 +17,8 @@ > /* no malloc.h needed */ > #elif MVS > /* no malloc.h needed */ >+#elif __APPLE__ >+ /* no malloc.h needed */ > #else > #include <malloc.h> > #endif >Index: src-native-new/src/agents/native/java_profiler/performance.h >=================================================================== >RCS file: /cvsroot/tptp/platform/org.eclipse.tptp.platform.agentcontroller/src-native-new/src/agents/native/java_profiler/performance.h,v >retrieving revision 1.2 >diff -u -r1.2 performance.h >--- src-native-new/src/agents/native/java_profiler/performance.h 6 Apr 2007 00:46:09 -0000 1.2 >+++ src-native-new/src/agents/native/java_profiler/performance.h 10 Nov 2008 20:34:24 -0000 >@@ -4,7 +4,7 @@ > * are made available under the terms of the Eclipse Public License v1.0 > * which accompanies this distribution, and is available at > * http://www.eclipse.org/legal/epl-v10.html >- * $Id: performance.h,v 1.2 2007/04/06 00:46:09 jkubasta Exp $ >+ * $Id: performance.h,v 1.1.6.1 2008/10/02 15:50:38 pklicnik Exp $ > * > * Contributors: > * IBM - Initial API and implementation >@@ -30,6 +30,8 @@ > #elif __linux__ > #include <stdint.h> > #define _inline inline >+#elif __APPLE__ >+ #define _inline > #elif _SOLARIS > #define _inline > #elif _AIX >Index: src-native-new/src/agents/native/java_profiler/StatelessHeapSnapshotManager_C.cpp >=================================================================== >RCS file: /cvsroot/tptp/platform/org.eclipse.tptp.platform.agentcontroller/src-native-new/src/agents/native/java_profiler/StatelessHeapSnapshotManager_C.cpp,v >retrieving revision 1.2 >diff -u -r1.2 StatelessHeapSnapshotManager_C.cpp >--- src-native-new/src/agents/native/java_profiler/StatelessHeapSnapshotManager_C.cpp 6 Apr 2007 00:30:55 -0000 1.2 >+++ src-native-new/src/agents/native/java_profiler/StatelessHeapSnapshotManager_C.cpp 10 Nov 2008 20:34:24 -0000 >@@ -4,7 +4,7 @@ > * are made available under the terms of the Eclipse Public License v1.0 > * which accompanies this distribution, and is available at > * http://www.eclipse.org/legal/epl-v10.html >- * $Id: StatelessHeapSnapshotManager_C.cpp,v 1.2 2007/04/06 00:30:55 jkubasta Exp $ >+ * $Id: StatelessHeapSnapshotManager_C.cpp,v 1.1.6.1 2008/10/02 15:50:38 pklicnik Exp $ > * > * Contributors: > * IBM - Initial API and implementation >@@ -278,7 +278,7 @@ > traceWriteInt32LittleEndian(77); > #elif defined(__OS400__) > traceWriteInt32LittleEndian(88); >-#elif defined(__linux__) && defined(__powerpc64__) || defined(_WIN64) /*ts. bug 120479*/ >+#elif defined(__linux__) && defined(__powerpc64__) || defined(_WIN64) || defined (__APPLE__) /*ts. bug 120479*/ > /* traceWriteInt32LittleEndian(99); */ > #else > #error "unknown platform" >Index: src-native-new/src/agents/native/java_profiler/java_profiler.make >=================================================================== >RCS file: /cvsroot/tptp/platform/org.eclipse.tptp.platform.agentcontroller/src-native-new/src/agents/native/java_profiler/java_profiler.make,v >retrieving revision 1.1 >diff -u -r1.1 java_profiler.make >--- src-native-new/src/agents/native/java_profiler/java_profiler.make 2 Apr 2007 18:05:29 -0000 1.1 >+++ src-native-new/src/agents/native/java_profiler/java_profiler.make 10 Nov 2008 20:34:24 -0000 >@@ -24,11 +24,15 @@ > TARGET := libpiAgent > TARGETDIR := ../../../../lib > >+VERSIONNUM := 5 >+MINORNUM := 0 >+RELEASENUM := 0 >+ > if [ x$VERSIONNUM = x ]; then export VERSIONNUM=0; fi > if [ x$MINORNUM = x ]; then export MINORNUM=0; fi > if [ x$RELEASENUM = x ]; then export RELEASENUM=0; fi > >-TARGETLIB := $(TARGET).so >+TARGETLIB := $(TARGET).dylib > TARGETSONAME := $(TARGETLIB).$(VERSIONNUM) > TARGETREALNAME := $(TARGETSONAME).$(MINORNUM).$(RELEASENUM) > >@@ -37,14 +41,14 @@ > # list of additional INCLUDE directories to search headers from > # (separated by blanks) > #----------------------------------- >-INCLUDEDIRS := . ../../../../include $(JAVA_HOME)/include $(JAVA_HOME)/include/linux ../../RABindings ../../../transport/RACommon ../../../transport/RASocket ../../../transport/RASharedMemory ../../../transport/RADataTransfer >+INCLUDEDIRS := . ../../../../include /System/Library/Frameworks/JavaVM.framework/Versions/CurrentJDK/Headers/ ../../RABindings ../../../transport/RACommon ../../../transport/RASocket ../../../transport/RASharedMemory ../../../transport/RADataTransfer > > > #----------------------------------- > # list of additional libraries to be linked with > # (separated by blanks) > #----------------------------------- >-LIBS := dl hcbnd >+LIBS := dl > > #----------------------------------- > # list of additional library directories to search from >@@ -72,13 +76,13 @@ > # > #----------------------------------- > >-DEFINES := -DSQLUNIX -DSQLLinux -DENW -DREENTRANT -D_REENTRANT -DCONFIG_X86_CMPXCHG >+DEFINES := -DSQLUNIX -DSQLAIXPPC -DENW -DREENTRANT -D_REENTRANT -DCONFIG_X86_CMPXCHG > >-CFLAGS := $(C_FLAGS) $(DEBUGABLE) -Wall $(OPTIMIZABLE) -fPIC $(addprefix -I,$(INCLUDEDIRS)) -D_LINUX_X86 $(DEFINES) >+CFLAGS := $(C_FLAGS) $(DEBUGABLE) -Wall $(OPTIMIZABLE) -fPIC $(addprefix -I,$(INCLUDEDIRS)) $(DEFINES) > > CXXFLAGS := $(CFLAGS) > >-LINKOPTS := $(L_FLAGS) $(DEBUGABLE) -shared -Wl,-soname,$(TARGETSONAME) -o $(TARGETDIR)/$(TARGETREALNAME) $(addprefix -L,$(LIBDIRS)) >+LINKOPTS := $(L_FLAGS) $(DEBUGABLE) -undefined dynamic_lookup -dynamiclib -single_module -o $(TARGETDIR)/$(TARGETREALNAME) $(addprefix -L,$(LIBDIRS)) > > > #----------------------------------- >@@ -86,7 +90,7 @@ > #----------------------------------- > > CC := gcc >-CXX := $(CC) >+CXX := g++ > > #SOURCE := $(wildcard *.c) $(wildcard *.cpp) > SOURCE := $(wildcard *.c) $(wildcard *.cpp) $(wildcard ../heapsnapshots/*.c) $(wildcard ../heapsnapshots/*.cpp) >@@ -127,4 +131,4 @@ > $(CC) $(LINKOPTS) $(OBJS) $(addprefix -l,$(LIBS)) > $(CREATELINK) $(TARGETREALNAME) $(TARGETDIR)/$(TARGETSONAME) > $(CREATELINK) $(TARGETSONAME) $(TARGETDIR)/$(TARGETLIB) >- >+ $(CREATELINK) $(TARGETREALNAME) $(TARGETDIR)/$(TARGET).jnilib >Index: src-native-new/src/transport/RACommon/RAComm.c >=================================================================== >RCS file: /cvsroot/tptp/platform/org.eclipse.tptp.platform.agentcontroller/src-native-new/src/transport/RACommon/RAComm.c,v >retrieving revision 1.12 >diff -u -r1.12 RAComm.c >--- src-native-new/src/transport/RACommon/RAComm.c 19 Mar 2007 03:14:38 -0000 1.12 >+++ src-native-new/src/transport/RACommon/RAComm.c 10 Nov 2008 20:34:25 -0000 >@@ -4,7 +4,7 @@ > * are made available under the terms of the Eclipse Public License v1.0 > * which accompanies this distribution, and is available at > * http://www.eclipse.org/legal/epl-v10.html >- * $Id: RAComm.c,v 1.12 2007/03/19 03:14:38 rsmith Exp $ >+ * $Id: RAComm.c,v 1.1.6.1 2008/10/02 13:43:08 pklicnik Exp $ > * > * Contributors: > * IBM - Initial API and implementation >@@ -78,6 +78,9 @@ > #elif _SOLARIS > #define _inline > #define _NO_ATOMIC_CAS 1 >+#elif __APPLE__ >+ #define _inline >+ #define _NO_ATOMIC_CAS 1 > #elif _HPUX > #include <unistd.h> > #define _inline >Index: src-native-new/src/transport/RACommon/RACommon.make >=================================================================== >RCS file: /cvsroot/tptp/platform/org.eclipse.tptp.platform.agentcontroller/src-native-new/src/transport/RACommon/RACommon.make,v >retrieving revision 1.7 >diff -u -r1.7 RACommon.make >--- src-native-new/src/transport/RACommon/RACommon.make 2 Apr 2007 18:05:35 -0000 1.7 >+++ src-native-new/src/transport/RACommon/RACommon.make 10 Nov 2008 20:34:25 -0000 >@@ -27,8 +27,11 @@ > if [ x$VERSIONNUM = x ]; then export VERSIONNUM=0; fi > if [ x$MINORNUM = x ]; then export MINORNUM=0; fi > if [ x$RELEASENUM = x ]; then export RELEASENUM=0; fi >+export VERSIONNUM=5 >+export MINORNUM=0 >+export RELEASENUM=0 > >-TARGETLIB := $(TARGET).so >+TARGETLIB := $(TARGET).dylib > TARGETSONAME := $(TARGETLIB).$(VERSIONNUM) > TARGETREALNAME := $(TARGETSONAME).$(MINORNUM).$(RELEASENUM) > >@@ -37,7 +40,7 @@ > # list of additional INCLUDE directories to search headers from > # (separated by blanks) > #----------------------------------- >-INCLUDEDIRS := . ../../../include ../RASharedMemory $(JAVA_HOME)/include $(JAVA_HOME)/include/linux >+INCLUDEDIRS := . ../../../include ../RASharedMemory /System/Library/Frameworks/JavaVM.framework/Versions/CurrentJDK/Headers/ > > > #----------------------------------- >@@ -74,11 +77,11 @@ > > DEFINES := -DSQLUNIX -DSQLLinux -DENW -DREENTRANT -D_REENTRANT -DCONFIG_X86_CMPXCHG > >-CFLAGS := $(C_FLAGS) $(DEBUGABLE) -Wall $(OPTIMIZABLE) -fPIC $(addprefix -I,$(INCLUDEDIRS)) -D_LINUX_X86 $(DEFINES) >+CFLAGS := $(C_FLAGS) $(DEBUGABLE) -Wall $(OPTIMIZABLE) -fPIC $(addprefix -I,$(INCLUDEDIRS)) $(DEFINES) > > CXXFLAGS := $(CFLAGS) > >-LINKOPTS := $(L_FLAGS) $(DEBUGABLE) -shared -Wl,-soname,$(TARGETSONAME) -o $(TARGETDIR)/$(TARGETREALNAME) $(addprefix -L,$(LIBDIRS)) >+LINKOPTS := $(L_FLAGS) $(DEBUGABLE) -undefined dynamic_lookup -dynamiclib -single_module -o $(TARGETDIR)/$(TARGETREALNAME) $(addprefix -L,$(LIBDIRS)) > > > #----------------------------------- >@@ -126,4 +129,4 @@ > $(CC) $(LINKOPTS) $(OBJS) $(addprefix -l,$(LIBS)) > $(CREATELINK) $(TARGETREALNAME) $(TARGETDIR)/$(TARGETSONAME) > $(CREATELINK) $(TARGETSONAME) $(TARGETDIR)/$(TARGETLIB) >- >+ $(CREATELINK) $(TARGETREALNAME) $(TARGETDIR)/$(TARGET).jnilib >Index: src-native-new/test/Stress/SendAndReceive/SendAndReceive.make >=================================================================== >RCS file: /cvsroot/tptp/platform/org.eclipse.tptp.platform.agentcontroller/src-native-new/test/Stress/SendAndReceive/SendAndReceive.make,v >retrieving revision 1.1 >diff -u -r1.1 SendAndReceive.make >--- src-native-new/test/Stress/SendAndReceive/SendAndReceive.make 7 Nov 2005 20:51:59 -0000 1.1 >+++ src-native-new/test/Stress/SendAndReceive/SendAndReceive.make 10 Nov 2008 20:34:26 -0000 >@@ -3,7 +3,7 @@ > # > # makefile: SendAndReceive project > # >-# $Id$ >+# $Id: SendAndReceive.make,v 1.1 2008/06/17 16:11:26 jcayne Exp $ > ################################################################################ > > >Index: src-native-new/test/PerfmonAgent/PerfmonAgent.make >=================================================================== >RCS file: /cvsroot/tptp/platform/org.eclipse.tptp.platform.agentcontroller/src-native-new/test/PerfmonAgent/PerfmonAgent.make,v >retrieving revision 1.2 >diff -u -r1.2 PerfmonAgent.make >--- src-native-new/test/PerfmonAgent/PerfmonAgent.make 19 Mar 2007 03:14:39 -0000 1.2 >+++ src-native-new/test/PerfmonAgent/PerfmonAgent.make 10 Nov 2008 20:34:26 -0000 >@@ -3,7 +3,7 @@ > # > # makefile: PerfmonAgent sample project > # >-# $Id: PerfmonAgent.make,v 1.2 2007/03/19 03:14:39 rsmith Exp $ >+# $Id: PerfmonAgent.make,v 1.1.6.1 2008/11/10 19:15:29 pklicnik Exp $ > ################################################################################ > > >@@ -41,7 +41,7 @@ > > > $(TARGETDIR)/PerfmonAgent: PerfmonAgent/PerfmonAgent.cpp PerfmonAgent/PerfmonAgent.h $(PERFLINLIB) $(SUPPORTLIB) >- g++ $(DEBUGABLE) -Wall -DLINUX -D_LINUX_X86 $(addprefix -I,$(INCLUDES)) -o $(TARGETDIR)/PerfmonAgent PerfmonAgent/PerfmonAgent.cpp $(addprefix -L,$(LIBDIRS)) $(addprefix -l,$(LIBS)) >+ g++ $(DEBUGABLE) -Wall -DLINUX $(addprefix -I,$(INCLUDES)) -o $(TARGETDIR)/PerfmonAgent PerfmonAgent/PerfmonAgent.cpp $(addprefix -L,$(LIBDIRS)) $(addprefix -l,$(LIBS)) > > #----------------------------------- > # >Index: src-native-new/src/transport/BaseTransport/BaseTL.c >=================================================================== >RCS file: /cvsroot/tptp/platform/org.eclipse.tptp.platform.agentcontroller/src-native-new/src/transport/BaseTransport/BaseTL.c,v >retrieving revision 1.15 >diff -u -r1.15 BaseTL.c >--- src-native-new/src/transport/BaseTransport/BaseTL.c 29 Apr 2008 19:19:26 -0000 1.15 >+++ src-native-new/src/transport/BaseTransport/BaseTL.c 10 Nov 2008 20:34:25 -0000 >@@ -8,7 +8,7 @@ > * Contributors: > * Andy Kaylor, Intel - Initial API and Implementation > * >- * $Id: BaseTL.c,v 1.15 2008/04/29 19:19:26 aalexeev Exp $ >+ * $Id: BaseTL.c,v 1.1.6.1 2008/10/16 19:14:07 pklicnik Exp $ > * > *******************************************************************************/ > >@@ -16,6 +16,8 @@ > #include "tptp/TPTPBaseTL.h" > #include "tptp/BaseTLLog.h" > >+ >+ > /** > ********************************************************* > * >@@ -168,8 +170,11 @@ > if ( !isValidTPTPBlock(tlo, TPTP_BASETL_MAKE_OBJECT_ID(tlo)) ) > return TPTP_ERROR_INVALID_PARAMETER; > >+ printf( "BASETL tlo addr: %x\n", tlo ); > stateData = tlo->data; /* This was verified not to be NULL by isValidTPTPBlock */ >+ printf( "BASETL stateData addr: %x\n", stateData ); > >+ printf( "BASETL STARTING THREAD\n" ); > /* Start the server thread for this TL */ > tptpStartThread( processingFunc, (void*)stateData, &threadID, &threadHandle); > CLOSE_THREAD_HANDLE(threadHandle); >Index: src-native-new/src/transport/BaseTransport/BaseTransport.make >=================================================================== >RCS file: /cvsroot/tptp/platform/org.eclipse.tptp.platform.agentcontroller/src-native-new/src/transport/BaseTransport/BaseTransport.make,v >retrieving revision 1.3 >diff -u -r1.3 BaseTransport.make >--- src-native-new/src/transport/BaseTransport/BaseTransport.make 19 Mar 2007 03:14:38 -0000 1.3 >+++ src-native-new/src/transport/BaseTransport/BaseTransport.make 10 Nov 2008 20:34:25 -0000 >@@ -3,7 +3,7 @@ > # > # makefile: BaseTransport project > # >-# $Id$ >+# $Id: BaseTransport.make,v 1.1.6.4 2008/11/10 19:15:30 pklicnik Exp $ > ################################################################################ > > >@@ -27,8 +27,11 @@ > if [ x$VERSIONNUM = x ]; then export VERSIONNUM=0; fi > if [ x$MINORNUM = x ]; then export MINORNUM=0; fi > if [ x$RELEASENUM = x ]; then export RELEASENUM=0; fi >+export VERSIONNUM=5 >+export MINORNUM=0 >+export RELEASENUM=0 > >-TARGETLIB := $(TARGET).so >+TARGETLIB := $(TARGET).dylib > TARGETSONAME := $(TARGETLIB).$(VERSIONNUM) > TARGETREALNAME := $(TARGETSONAME).$(MINORNUM).$(RELEASENUM) > >@@ -72,11 +75,11 @@ > # > #----------------------------------- > >-CFLAGS := $(C_FLAGS) $(DEBUGABLE) -Wall $(OPTIMIZABLE) -fPIC $(addprefix -I,$(INCLUDEDIRS)) -D_LINUX_X86 >+CFLAGS := $(C_FLAGS) $(DEBUGABLE) -Wall $(OPTIMIZABLE) -fPIC $(addprefix -I,$(INCLUDEDIRS)) > > CXXFLAGS := $(CFLAGS) > >-LINKOPTS := $(L_FLAGS) $(DEBUGABLE) -shared -Wl,-soname,$(TARGETSONAME) -o $(TARGETDIR)/$(TARGETREALNAME) $(addprefix -L,$(LIBDIRS)) >+LINKOPTS := $(L_FLAGS) $(DEBUGABLE) -undefined dynamic_lookup -dynamiclib -o $(TARGETDIR)/$(TARGETREALNAME) $(addprefix -L,$(LIBDIRS)) > > > #----------------------------------- >@@ -124,4 +127,4 @@ > $(CC) $(LINKOPTS) $(OBJS) $(addprefix -l,$(LIBS)) > $(CREATELINK) $(TARGETREALNAME) $(TARGETDIR)/$(TARGETSONAME) > $(CREATELINK) $(TARGETSONAME) $(TARGETDIR)/$(TARGETLIB) >- >+ $(CREATELINK) $(TARGETREALNAME) $(TARGETDIR)/$(TARGET).jnilib >Index: src-native-new/src/CmdExtractor/CmdExtractor.make >=================================================================== >RCS file: /cvsroot/tptp/platform/org.eclipse.tptp.platform.agentcontroller/src-native-new/src/CmdExtractor/CmdExtractor.make,v >retrieving revision 1.5 >diff -u -r1.5 CmdExtractor.make >--- src-native-new/src/CmdExtractor/CmdExtractor.make 19 Mar 2007 03:14:38 -0000 1.5 >+++ src-native-new/src/CmdExtractor/CmdExtractor.make 10 Nov 2008 20:34:23 -0000 >@@ -4,7 +4,7 @@ > # > # makefile: tptpCmdExtr project > # >-# $Id: CmdExtractor.make,v 1.5 2007/03/19 03:14:38 rsmith Exp $ >+# $Id: CmdExtractor.make,v 1.1.6.4 2008/11/10 19:15:30 pklicnik Exp $ > ################################################################################ > > >@@ -28,8 +28,11 @@ > if [ x$VERSIONNUM = x ]; then export VERSIONNUM=0; fi > if [ x$MINORNUM = x ]; then export MINORNUM=0; fi > if [ x$RELEASENUM = x ]; then export RELEASENUM=0; fi >+export VERSIONNUM=5 >+export MINORNUM=0 >+export RELEASENUM=0 > >-TARGETLIB := $(TARGET).so >+TARGETLIB := $(TARGET).dylib > TARGETSONAME := $(TARGETLIB).$(VERSIONNUM) > TARGETREALNAME := $(TARGETSONAME).$(MINORNUM).$(RELEASENUM) > >@@ -45,7 +48,7 @@ > # list of additional libraries to be linked with > # (separated by blanks) > #----------------------------------- >-LIBS := uuid dl xerces-c >+LIBS := dl xerces-c > > #----------------------------------- > # list of additional library directories to search from >@@ -73,11 +76,11 @@ > # > #----------------------------------- > >-CFLAGS := $(C_FLAGS) $(DEBUGABLE) -Wall $(OPTIMIZABLE) -fPIC $(addprefix -I,$(INCLUDEDIRS)) -D_LINUX_X86 >+CFLAGS := $(C_FLAGS) $(DEBUGABLE) -Wall $(OPTIMIZABLE) -fPIC $(addprefix -I,$(INCLUDEDIRS)) > > CXXFLAGS := $(CFLAGS) > >-LINKOPTS := $(L_FLAGS) $(DEBUGABLE) -shared -Wl,-soname,$(TARGETSONAME) -o $(TARGETDIR)/$(TARGETREALNAME) $(addprefix -L,$(LIBDIRS)) >+LINKOPTS := $(L_FLAGS) $(DEBUGABLE) -undefined dynamic_lookup -dynamiclib -o $(TARGETDIR)/$(TARGETREALNAME) $(addprefix -L,$(LIBDIRS)) > > > #----------------------------------- >@@ -85,7 +88,7 @@ > #----------------------------------- > > CC := gcc >-CXX := $(CC) >+CXX := g++ > > SOURCE := $(wildcard *.c) $(wildcard *.cpp) > >@@ -125,4 +128,4 @@ > $(CC) $(LINKOPTS) $(OBJS) $(addprefix -l,$(LIBS)) > $(CREATELINK) $(TARGETREALNAME) $(TARGETDIR)/$(TARGETSONAME) > $(CREATELINK) $(TARGETSONAME) $(TARGETDIR)/$(TARGETLIB) >- >+ $(CREATELINK) $(TARGETREALNAME) $(TARGETDIR)/$(TARGET).jnilib >Index: src-native-new/src/TPTPJava/TPTPJava.make >=================================================================== >RCS file: /cvsroot/tptp/platform/org.eclipse.tptp.platform.agentcontroller/src-native-new/src/TPTPJava/TPTPJava.make,v >retrieving revision 1.3 >diff -u -r1.3 TPTPJava.make >--- src-native-new/src/TPTPJava/TPTPJava.make 30 Jan 2008 16:23:08 -0000 1.3 >+++ src-native-new/src/TPTPJava/TPTPJava.make 10 Nov 2008 20:34:23 -0000 >@@ -3,7 +3,7 @@ > # > # makefile: socketTL project > # >-# $Id: TPTPJava.make,v 1.3 2008/01/30 16:23:08 ialelekov Exp $ >+# $Id: TPTPJava.make,v 1.1.6.4 2008/11/10 19:15:29 pklicnik Exp $ > ################################################################################ > > >@@ -27,8 +27,11 @@ > if [ x$VERSIONNUM = x ]; then export VERSIONNUM=0; fi > if [ x$MINORNUM = x ]; then export MINORNUM=0; fi > if [ x$RELEASENUM = x ]; then export RELEASENUM=0; fi >+export VERSIONNUM=5 >+export MINORNUM=0 >+export RELEASENUM=0 > >-TARGETLIB := $(TARGET).so >+TARGETLIB := $(TARGET).dylib > TARGETSONAME := $(TARGETLIB).$(VERSIONNUM) > TARGETREALNAME := $(TARGETSONAME).$(MINORNUM).$(RELEASENUM) > >@@ -37,7 +40,7 @@ > # list of additional INCLUDE directories to search headers from > # (separated by blanks) > #----------------------------------- >-INCLUDEDIRS := . ../../include $(JAVA_HOME)/include $(JAVA_HOME)/include/linux >+INCLUDEDIRS := . ../../include /System/Library/Frameworks/JavaVM.framework/Versions/CurrentJDK/Headers/ > > > #----------------------------------- >@@ -72,11 +75,11 @@ > # > #----------------------------------- > >-CFLAGS := $(C_FLAGS) $(DEBUGABLE) -Wall $(OPTIMIZABLE) -fPIC $(addprefix -I,$(INCLUDEDIRS)) -D_LINUX_X86 >+CFLAGS := $(C_FLAGS) $(DEBUGABLE) -Wall $(OPTIMIZABLE) -fPIC $(addprefix -I,$(INCLUDEDIRS)) > > CXXFLAGS := $(CFLAGS) > >-LINKOPTS := $(L_FLAGS) $(DEBUGABLE) -shared -Wl,-soname,$(TARGETSONAME) -o $(TARGETDIR)/$(TARGETREALNAME) $(addprefix -L,$(LIBDIRS)) >+LINKOPTS := $(L_FLAGS) $(DEBUGABLE) -undefined dynamic_lookup -dynamiclib -o $(TARGETDIR)/$(TARGETREALNAME) $(addprefix -L,$(LIBDIRS)) > > > #----------------------------------- >@@ -124,4 +127,4 @@ > $(CC) $(LINKOPTS) $(OBJS) $(addprefix -l,$(LIBS)) > $(CREATELINK) $(TARGETREALNAME) $(TARGETDIR)/$(TARGETSONAME) > $(CREATELINK) $(TARGETSONAME) $(TARGETDIR)/$(TARGETLIB) >- >+ $(CREATELINK) $(TARGETREALNAME) $(TARGETDIR)/$(TARGET).jnilib >Index: src-native-new/src/javaBaseAgent/JavaBaseAgent.make >=================================================================== >RCS file: /cvsroot/tptp/platform/org.eclipse.tptp.platform.agentcontroller/src-native-new/src/javaBaseAgent/JavaBaseAgent.make,v >retrieving revision 1.8 >diff -u -r1.8 JavaBaseAgent.make >--- src-native-new/src/javaBaseAgent/JavaBaseAgent.make 19 Mar 2007 03:14:39 -0000 1.8 >+++ src-native-new/src/javaBaseAgent/JavaBaseAgent.make 10 Nov 2008 20:34:24 -0000 >@@ -1,107 +1,111 @@ >- >-################################################################################ >-# >-# makefile: JavaBaseAgent project >-# >-# $Id: JavaBaseAgent.make,v 1.5 2005/09/26 03:30:22 gnagarajan Exp $ >-################################################################################ >-#----------------------------------- >-# >-# Customizable section >-# >-#----------------------------------- >-TARGET := libjavaBaseAgent >-TARGETDIR := ../../lib >- >-if [ x$VERSIONNUM = x ]; then export VERSIONNUM=0; fi >-if [ x$MINORNUM = x ]; then export MINORNUM=0; fi >-if [ x$RELEASENUM = x ]; then export RELEASENUM=0; fi >- >-TARGETLIB := $(TARGET).so >-TARGETSONAME := $(TARGETLIB).$(VERSIONNUM) >-TARGETREALNAME := $(TARGETSONAME).$(MINORNUM).$(RELEASENUM) >- >-#----------------------------------- >-# list of additional INCLUDE directories to search headers from >-# (separated by blanks) >-#----------------------------------- >-INCLUDEDIRS := ../transport/RACommon ../transport/RASharedMemory ../transport/RASocket . ../../include $(JAVA_HOME)/include $(JAVA_HOME)/include/linux >- >- >-#----------------------------------- >-# list of additional libraries to be linked with >-# (separated by blanks) >-#----------------------------------- >-LIBS := uuid dl tptpAgentBase pthread >- >-#----------------------------------- >-# list of additional library directories to search from >-# (separated by blanks) >-#----------------------------------- >-LIBDIRS := ../../lib $(JAVA_HOME)/lib >- >- >-#----------------------------------- >-# >-# Compiler options >-# >-# -g produce debug info >-# -Wall enable all types of warnings >-# -O3 highest level of code optimization >-# -fPIC generate position-independent code (PIC). >-# This is required for building shared library. >-# -c compile only >-# >-# Linking options >-# >-# -Wl pass options to linker >-# -shared produce shared library >-# -L add the given directory to the search path for libraries >-# >-#----------------------------------- >- >-CFLAGS := $(C_FLAGS) $(DEBUGABLE) -Wall $(OPTIMIZABLE) -fPIC $(addprefix -I,$(INCLUDEDIRS)) -D_LINUX_X86 >- >-CXXFLAGS := $(CFLAGS) >- >-LINKOPTS := $(L_FLAGS) $(DEBUGABLE) -shared -Wl,-soname,$(TARGETSONAME) -o $(TARGETDIR)/$(TARGETREALNAME) $(addprefix -L,$(LIBDIRS)) >- >-#----------------------------------- >-# general commands and options >-#----------------------------------- >- >-CC := gcc >-CXX := $(CC) >- >-SOURCE := $(wildcard *.cpp) >- >-OBJS := $(patsubst %.cpp,%.o,$(SOURCE)) >- >-REMOVEFILE := rm -f >-CREATELINK := ln -sf >- >- >-#----------------------------------- >-# "make" rules >-#----------------------------------- >- >-.PHONY : default everything objs clean veryclean rebuild $(TARGET) >- >-default : $(TARGET) >- >-objs : $(OBJS) >- >-clean : >- $(REMOVEFILE) *.o >- >-veryclean: clean >- $(REMOVEFILE) $(TARGETDIR)/$(TARGETLIB) >- $(REMOVEFILE) $(TARGETDIR)/$(TARGETSONAME) >- $(REMOVEFILE) $(TARGETDIR)/$(TARGETREALNAME) >- >-rebuild: veryclean everything >- >-$(TARGET) : $(OBJS) >- $(CC) $(LINKOPTS) $(OBJS) $(addprefix -l,$(LIBS)) >- $(CREATELINK) $(TARGETREALNAME) $(TARGETDIR)/$(TARGETSONAME) >- $(CREATELINK) $(TARGETSONAME) $(TARGETDIR)/$(TARGETLIB) >+ >+################################################################################ >+# >+# makefile: JavaBaseAgent project >+# >+# $Id: JavaBaseAgent.make,v 1.1.6.5 2008/11/10 19:15:30 pklicnik Exp $ >+################################################################################ >+#----------------------------------- >+# >+# Customizable section >+# >+#----------------------------------- >+TARGET := libjavaBaseAgent >+TARGETDIR := ../../lib >+ >+if [ x$VERSIONNUM = x ]; then export VERSIONNUM=0; fi >+if [ x$MINORNUM = x ]; then export MINORNUM=0; fi >+if [ x$RELEASENUM = x ]; then export RELEASENUM=0; fi >+export VERSIONNUM=5 >+export MINORNUM=0 >+export RELEASENUM=0 >+ >+TARGETLIB := $(TARGET).dyylib >+TARGETSONAME := $(TARGETLIB).$(VERSIONNUM) >+TARGETREALNAME := $(TARGETSONAME).$(MINORNUM).$(RELEASENUM) >+ >+#----------------------------------- >+# list of additional INCLUDE directories to search headers from >+# (separated by blanks) >+#----------------------------------- >+INCLUDEDIRS := ../transport/RACommon ../transport/RASharedMemory ../transport/RASocket . ../../include /System/Library/Frameworks/JavaVM.framework/Versions/CurrentJDK/Headers/ >+ >+ >+#----------------------------------- >+# list of additional libraries to be linked with >+# (separated by blanks) >+#----------------------------------- >+LIBS := dl tptpAgentBase pthread stdc++ >+ >+#----------------------------------- >+# list of additional library directories to search from >+# (separated by blanks) >+#----------------------------------- >+LIBDIRS := ../../lib /System/Library/Frameworks/JavaVM.framework/Versions/CurrentJDK/Libraries/ >+ >+ >+#----------------------------------- >+# >+# Compiler options >+# >+# -g produce debug info >+# -Wall enable all types of warnings >+# -O3 highest level of code optimization >+# -fPIC generate position-independent code (PIC). >+# This is required for building shared library. >+# -c compile only >+# >+# Linking options >+# >+# -Wl pass options to linker >+# -shared produce shared library >+# -L add the given directory to the search path for libraries >+# >+#----------------------------------- >+ >+CFLAGS := $(C_FLAGS) $(DEBUGABLE) -Wall $(OPTIMIZABLE) -fPIC $(addprefix -I,$(INCLUDEDIRS)) >+ >+CXXFLAGS := $(CFLAGS) >+ >+LINKOPTS := $(L_FLAGS) $(DEBUGABLE) -undefined dynamic_lookup -dynamiclib -o $(TARGETDIR)/$(TARGETREALNAME) $(addprefix -L,$(LIBDIRS)) >+ >+#----------------------------------- >+# general commands and options >+#----------------------------------- >+ >+CC := gcc >+CXX := g++ >+ >+SOURCE := $(wildcard *.cpp) >+ >+OBJS := $(patsubst %.cpp,%.o,$(SOURCE)) >+ >+REMOVEFILE := rm -f >+CREATELINK := ln -sf >+ >+ >+#----------------------------------- >+# "make" rules >+#----------------------------------- >+ >+.PHONY : default everything objs clean veryclean rebuild $(TARGET) >+ >+default : $(TARGET) >+ >+objs : $(OBJS) >+ >+clean : >+ $(REMOVEFILE) *.o >+ >+veryclean: clean >+ $(REMOVEFILE) $(TARGETDIR)/$(TARGETLIB) >+ $(REMOVEFILE) $(TARGETDIR)/$(TARGETSONAME) >+ $(REMOVEFILE) $(TARGETDIR)/$(TARGETREALNAME) >+ >+rebuild: veryclean everything >+ >+$(TARGET) : $(OBJS) >+ $(CC) $(LINKOPTS) $(OBJS) $(addprefix -l,$(LIBS)) >+ $(CREATELINK) $(TARGETREALNAME) $(TARGETDIR)/$(TARGETSONAME) >+ $(CREATELINK) $(TARGETSONAME) $(TARGETDIR)/$(TARGETLIB) >+ $(CREATELINK) $(TARGETREALNAME) $(TARGETDIR)/$(TARGET).jnilib >Index: src-native-new/src/transport/TPTPClientCompTL/ClientCTL.c >=================================================================== >RCS file: /cvsroot/tptp/platform/org.eclipse.tptp.platform.agentcontroller/src-native-new/src/transport/TPTPClientCompTL/ClientCTL.c,v >retrieving revision 1.50 >diff -u -r1.50 ClientCTL.c >--- src-native-new/src/transport/TPTPClientCompTL/ClientCTL.c 13 May 2008 15:51:45 -0000 1.50 >+++ src-native-new/src/transport/TPTPClientCompTL/ClientCTL.c 10 Nov 2008 20:34:26 -0000 >@@ -8,7 +8,7 @@ > * Contributors: > * Andy Kaylor, Intel - Initial API and Implementation > * >- * $Id: ClientCTL.c,v 1.50 2008/05/13 15:51:45 jcayne Exp $ >+ * $Id: ClientCTL.c,v 1.1.6.2 2008/11/10 19:50:40 pklicnik Exp $ > * > *******************************************************************************/ > >@@ -571,6 +571,9 @@ > > /* create and initialize the server socket */ > rc = getTheSocket(cctlData->port, cctlData->sockets, &(cctlData->numSockets)); >+ >+ printf( "return code is: %d\n", rc ); >+ printf( "getTheSocket numSocket: %d\n", cctlData->numSockets ); > > if ( rc < 0 || cctlData->numSockets == 0 ) > { >@@ -589,6 +592,13 @@ > } > } > >+ printf( "getTheSocket numSocket2: %d\n", cctlData->numSockets ); >+ printf( "get the Socket numSocket addr: %x\n", tlo ); >+ >+ printf( "calling baseTL - tlo: %x\n", tlo ); >+ printf( "calling baseTL - stateData %x\n", stateData ); >+ printf( "calling baseTL - cctlData %x\n", cctlData ); >+ > return baseTL_startTransportListener( tlo, serveRequests ); > } > >Index: src-native-new/src/transport/TPTPClientCompTL/CCTLServer.c >=================================================================== >RCS file: /cvsroot/tptp/platform/org.eclipse.tptp.platform.agentcontroller/src-native-new/src/transport/TPTPClientCompTL/CCTLServer.c,v >retrieving revision 1.31 >diff -u -r1.31 CCTLServer.c >--- src-native-new/src/transport/TPTPClientCompTL/CCTLServer.c 16 Jun 2008 20:58:03 -0000 1.31 >+++ src-native-new/src/transport/TPTPClientCompTL/CCTLServer.c 10 Nov 2008 20:34:25 -0000 >@@ -10,7 +10,7 @@ > * Kevin O'Leary, Intel - Extended Implementation > * IBM - Large portions of processing code moved from older RAC (by Andy Kaylor) > * >- * $Id: CCTLServer.c,v 1.31 2008/06/16 20:58:03 jkubasta Exp $ >+ * $Id: CCTLServer.c,v 1.1.6.1 2008/10/16 19:14:07 pklicnik Exp $ > * > *******************************************************************************/ > >@@ -459,6 +459,10 @@ > tl_state_data_t* stateData = (tl_state_data_t*)args; > cctl_state_data_t* cctlData = (cctl_state_data_t*)stateData->implData; > >+ >+ printf( "IN SERVEREQUEST: %x %x %x\n", args, stateData, cctlData ); >+ printf( "serveRequests: %d\n", cctlData->numSockets ); >+ > /* initial status before the thread is running */ > stateData->processingThreadState = TPTP_TL_THREAD_RUNNING; > >Index: src-native-new/src/transport/TPTPClientCompTL/TPTPClientCompTL.make >=================================================================== >RCS file: /cvsroot/tptp/platform/org.eclipse.tptp.platform.agentcontroller/src-native-new/src/transport/TPTPClientCompTL/TPTPClientCompTL.make,v >retrieving revision 1.7 >diff -u -r1.7 TPTPClientCompTL.make >--- src-native-new/src/transport/TPTPClientCompTL/TPTPClientCompTL.make 28 Jan 2008 10:44:58 -0000 1.7 >+++ src-native-new/src/transport/TPTPClientCompTL/TPTPClientCompTL.make 10 Nov 2008 20:34:26 -0000 >@@ -3,7 +3,7 @@ > # > # makefile: TPTPClientCompTL project > # >-# $Id$ >+# $Id: TPTPClientCompTL.make,v 1.1.6.4 2008/11/10 19:15:29 pklicnik Exp $ > ################################################################################ > > >@@ -27,8 +27,11 @@ > if [ x$VERSIONNUM = x ]; then export VERSIONNUM=0; fi > if [ x$MINORNUM = x ]; then export MINORNUM=0; fi > if [ x$RELEASENUM = x ]; then export RELEASENUM=0; fi >+export VERSIONNUM=5 >+export MINORNUM=0 >+export RELEASENUM=0 > >-TARGETLIB := $(TARGET).so >+TARGETLIB := $(TARGET).dylib > TARGETSONAME := $(TARGETLIB).$(VERSIONNUM) > TARGETREALNAME := $(TARGETSONAME).$(MINORNUM).$(RELEASENUM) > >@@ -37,7 +40,7 @@ > # list of additional INCLUDE directories to search headers from > # (separated by blanks) > #----------------------------------- >-INCLUDEDIRS := ../RACommon ../RASharedMemory ../RASocket . ../../../include $(JAVA_HOME)/include $(JAVA_HOME)/include/linux >+INCLUDEDIRS := ../RACommon ../RASharedMemory ../RASocket . ../../../include /System/Library/Frameworks/JavaVM.framework/Versions/CurrentJDK/Headers/ > > > #----------------------------------- >@@ -50,7 +53,7 @@ > # list of additional library directories to search from > # (separated by blanks) > #----------------------------------- >-LIBDIRS := ../../../lib $(JAVA_HOME)/lib >+LIBDIRS := ../../../lib /System/Library/Frameworks/JavaVM.framework/Versions/CurrentJDK/Libraries/ > > > #----------------------------------- >@@ -72,11 +75,11 @@ > # > #----------------------------------- > >-CFLAGS := $(C_FLAGS) $(DEBUGABLE) -Wall $(OPTIMIZABLE) -fPIC $(addprefix -I,$(INCLUDEDIRS)) -D_LINUX_X86 >+CFLAGS := $(C_FLAGS) $(DEBUGABLE) -Wall $(OPTIMIZABLE) -fPIC $(addprefix -I,$(INCLUDEDIRS)) > > CXXFLAGS := $(CFLAGS) > >-LINKOPTS := $(L_FLAGS) $(DEBUGABLE) -shared -Wl,-soname,$(TARGETSONAME) -o $(TARGETDIR)/$(TARGETREALNAME) $(addprefix -L,$(LIBDIRS)) >+LINKOPTS := $(L_FLAGS) $(DEBUGABLE) -undefined dynamic_lookup -dynamiclib -single_module -o $(TARGETDIR)/$(TARGETREALNAME) $(addprefix -L,$(LIBDIRS)) > > > #----------------------------------- >@@ -124,4 +127,4 @@ > $(CC) $(LINKOPTS) $(OBJS) $(addprefix -l,$(LIBS)) > $(CREATELINK) $(TARGETREALNAME) $(TARGETDIR)/$(TARGETSONAME) > $(CREATELINK) $(TARGETSONAME) $(TARGETDIR)/$(TARGETLIB) >- >+ $(CREATELINK) $(TARGETREALNAME) $(TARGETDIR)/$(TARGET).jnilib >Index: src-native-new/agents/org.eclipse.tptp.FileTransferAgent/agent.xml >=================================================================== >RCS file: /cvsroot/tptp/platform/org.eclipse.tptp.platform.agentcontroller/src-native-new/agents/org.eclipse.tptp.FileTransferAgent/agent.xml,v >retrieving revision 1.4 >diff -u -r1.4 agent.xml >--- src-native-new/agents/org.eclipse.tptp.FileTransferAgent/agent.xml 29 Feb 2008 03:31:18 -0000 1.4 >+++ src-native-new/agents/org.eclipse.tptp.FileTransferAgent/agent.xml 10 Nov 2008 20:34:22 -0000 >@@ -15,8 +15,7 @@ > <Bound>0</Bound> > <MaxControllers>-1</MaxControllers> > <MaxObservers>-1</MaxObservers> >- <ConfigFile>c:\tptp\agents\org.eclipse.tptp.FileTransferAgent\config\agentconfig.xml</ConfigFile> > <LaunchConfiguration> >- <launchInfo><Application executable=".\tptpFileTransferAgent.exe"></Application></launchInfo> >+ <launchInfo><Application executable="./tptpFileTransferAgent"></Application></launchInfo> > </LaunchConfiguration> > </Agent> >Index: src-native-new/src/transport/namedPipeTL/NamedPipeTL.make >=================================================================== >RCS file: /cvsroot/tptp/platform/org.eclipse.tptp.platform.agentcontroller/src-native-new/src/transport/namedPipeTL/NamedPipeTL.make,v >retrieving revision 1.6 >diff -u -r1.6 NamedPipeTL.make >--- src-native-new/src/transport/namedPipeTL/NamedPipeTL.make 19 Mar 2007 03:14:38 -0000 1.6 >+++ src-native-new/src/transport/namedPipeTL/NamedPipeTL.make 10 Nov 2008 20:34:26 -0000 >@@ -3,7 +3,7 @@ > # > # makefile: namedPipeTL project > # >-# $Id: NamedPipeTL.make,v 1.6 2007/03/19 03:14:38 rsmith Exp $ >+# $Id: NamedPipeTL.make,v 1.1.6.4 2008/11/10 19:15:30 pklicnik Exp $ > ################################################################################ > > >@@ -27,8 +27,11 @@ > if [ x$VERSIONNUM = x ]; then export VERSIONNUM=0; fi > if [ x$MINORNUM = x ]; then export MINORNUM=0; fi > if [ x$RELEASENUM = x ]; then export RELEASENUM=0; fi >+export VERSIONNUM=5 >+export MINORNUM=0 >+export RELEASENUM=0 > >-TARGETLIB := $(TARGET).so >+TARGETLIB := $(TARGET).dylib > TARGETSONAME := $(TARGETLIB).$(VERSIONNUM) > TARGETREALNAME := $(TARGETSONAME).$(MINORNUM).$(RELEASENUM) > >@@ -72,11 +75,11 @@ > # > #----------------------------------- > >-CFLAGS := $(C_FLAGS) $(DEBUGABLE) -Wall $(OPTIMIZABLE) -fPIC $(addprefix -I,$(INCLUDEDIRS)) -D_LINUX_X86 >+CFLAGS := $(C_FLAGS) $(DEBUGABLE) -Wall $(OPTIMIZABLE) -fPIC $(addprefix -I,$(INCLUDEDIRS)) > > CXXFLAGS := $(CFLAGS) > >-LINKOPTS := $(L_FLAGS) $(DEBUGABLE) -shared -Wl,-soname,$(TARGETSONAME) -o $(TARGETDIR)/$(TARGETREALNAME) $(addprefix -L,$(LIBDIRS)) >+LINKOPTS := $(L_FLAGS) $(DEBUGABLE) -undefined dynamic_lookup -dynamiclib -o $(TARGETDIR)/$(TARGETREALNAME) $(addprefix -L,$(LIBDIRS)) > > > #----------------------------------- >@@ -124,4 +127,4 @@ > $(CC) $(LINKOPTS) $(OBJS) $(addprefix -l,$(LIBS)) > $(CREATELINK) $(TARGETREALNAME) $(TARGETDIR)/$(TARGETSONAME) > $(CREATELINK) $(TARGETSONAME) $(TARGETDIR)/$(TARGETLIB) >- >+ $(CREATELINK) $(TARGETREALNAME) $(TARGETDIR)/$(TARGET).jnilib >Index: src-native-new/src/agents/perfmon/perflin/perflin.make >=================================================================== >RCS file: /cvsroot/tptp/platform/org.eclipse.tptp.platform.agentcontroller/src-native-new/src/agents/perfmon/perflin/perflin.make,v >retrieving revision 1.1 >diff -u -r1.1 perflin.make >--- src-native-new/src/agents/perfmon/perflin/perflin.make 2 Apr 2007 18:05:38 -0000 1.1 >+++ src-native-new/src/agents/perfmon/perflin/perflin.make 10 Nov 2008 20:34:24 -0000 >@@ -74,7 +74,7 @@ > > DEFINES := -DLINUX > >-CFLAGS := $(C_FLAGS) $(DEBUGABLE) -Wall $(OPTIMIZABLE) -fPIC $(addprefix -I,$(INCLUDEDIRS)) -D_LINUX_X86 $(DEFINES) >+CFLAGS := $(C_FLAGS) $(DEBUGABLE) -Wall $(OPTIMIZABLE) -fPIC $(addprefix -I,$(INCLUDEDIRS)) $(DEFINES) > > CXXFLAGS := $(CFLAGS) > >Index: src-native-new/src/agents/java/hcjbnd.make >=================================================================== >RCS file: /cvsroot/tptp/platform/org.eclipse.tptp.platform.agentcontroller/src-native-new/src/agents/java/hcjbnd.make,v >retrieving revision 1.1 >diff -u -r1.1 hcjbnd.make >--- src-native-new/src/agents/java/hcjbnd.make 2 Apr 2007 18:05:37 -0000 1.1 >+++ src-native-new/src/agents/java/hcjbnd.make 10 Nov 2008 20:34:24 -0000 >@@ -27,8 +27,11 @@ > if [ x$VERSIONNUM = x ]; then export VERSIONNUM=0; fi > if [ x$MINORNUM = x ]; then export MINORNUM=0; fi > if [ x$RELEASENUM = x ]; then export RELEASENUM=0; fi >+export VERSIONNUM=5 >+export MINORNUM=0 >+export RELEASENUM=0 > >-TARGETLIB := $(TARGET).so >+TARGETLIB := $(TARGET).dylib > TARGETSONAME := $(TARGETLIB).$(VERSIONNUM) > TARGETREALNAME := $(TARGETSONAME).$(MINORNUM).$(RELEASENUM) > >@@ -37,7 +40,7 @@ > # list of additional INCLUDE directories to search headers from > # (separated by blanks) > #----------------------------------- >-INCLUDEDIRS := . ../../../include $(JAVA_HOME)/include $(JAVA_HOME)/include/linux ../RABindings ../../transport/RACommon ../../transport/RASocket ../../transport/RASharedMemory ../../transport/RADataTransfer >+INCLUDEDIRS := . ../../../include /System/Library/Frameworks/JavaVM.framework/Versions/CurrentJDK/Headers/ ../RABindings ../../transport/RACommon ../../transport/RASocket ../../transport/RASharedMemory ../../transport/RADataTransfer > > > #----------------------------------- >@@ -72,13 +75,13 @@ > # > #----------------------------------- > >-DEFINES := -DSQLUNIX -DSQLLinux -DENW -DREENTRANT -D_REENTRANT -DCONFIG_X86_CMPXCHG >+DEFINES := -DSQLUNIX -DSQLLinux -DENW -DREENTRANT -D_REENTRANT -DCONFIG_X86_CMPXCHG -D_DEBUG2 -D_DEBUG > >-CFLAGS := $(C_FLAGS) $(DEBUGABLE) -Wall $(OPTIMIZABLE) -fPIC $(addprefix -I,$(INCLUDEDIRS)) -D_LINUX_X86 $(DEFINES) >+CFLAGS := $(C_FLAGS) $(DEBUGABLE) -Wall $(OPTIMIZABLE) -fPIC $(addprefix -I,$(INCLUDEDIRS)) $(DEFINES) > > CXXFLAGS := $(CFLAGS) > >-LINKOPTS := $(L_FLAGS) $(DEBUGABLE) -shared -Wl,-soname,$(TARGETSONAME) -o $(TARGETDIR)/$(TARGETREALNAME) $(addprefix -L,$(LIBDIRS)) >+LINKOPTS := $(L_FLAGS) $(DEBUGABLE) -undefined dynamic_lookup -dynamiclib -o $(TARGETDIR)/$(TARGETREALNAME) $(addprefix -L,$(LIBDIRS)) > > > #----------------------------------- >@@ -126,4 +129,4 @@ > $(CC) $(LINKOPTS) $(OBJS) $(addprefix -l,$(LIBS)) > $(CREATELINK) $(TARGETREALNAME) $(TARGETDIR)/$(TARGETSONAME) > $(CREATELINK) $(TARGETSONAME) $(TARGETDIR)/$(TARGETLIB) >- >+ $(CREATELINK) $(TARGETREALNAME) $(TARGETDIR)/$(TARGET).jnilib >Index: src-native-new/src/agents/perfmon/resutils/resutils.make >=================================================================== >RCS file: /cvsroot/tptp/platform/org.eclipse.tptp.platform.agentcontroller/src-native-new/src/agents/perfmon/resutils/resutils.make,v >retrieving revision 1.1 >diff -u -r1.1 resutils.make >--- src-native-new/src/agents/perfmon/resutils/resutils.make 2 Apr 2007 18:05:33 -0000 1.1 >+++ src-native-new/src/agents/perfmon/resutils/resutils.make 10 Nov 2008 20:34:24 -0000 >@@ -68,7 +68,7 @@ > > DEFINES := -DLINUX > >-CFLAGS := $(C_FLAGS) $(DEBUGABLE) -Wall $(OPTIMIZABLE) -fPIC $(addprefix -I,$(INCLUDEDIRS)) -D_LINUX_X86 $(DEFINES) >+CFLAGS := $(C_FLAGS) $(DEBUGABLE) -Wall $(OPTIMIZABLE) -fPIC $(addprefix -I,$(INCLUDEDIRS)) $(DEFINES) > > CXXFLAGS := $(CFLAGS) > >Index: src-native-new/samples/ConsoleTestClient/ConsoleTestClient.make >=================================================================== >RCS file: /cvsroot/tptp/platform/org.eclipse.tptp.platform.agentcontroller/src-native-new/samples/ConsoleTestClient/ConsoleTestClient.make,v >retrieving revision 1.4 >diff -u -r1.4 ConsoleTestClient.make >--- src-native-new/samples/ConsoleTestClient/ConsoleTestClient.make 15 Jan 2008 11:58:50 -0000 1.4 >+++ src-native-new/samples/ConsoleTestClient/ConsoleTestClient.make 10 Nov 2008 20:34:23 -0000 >@@ -3,7 +3,7 @@ > # > # makefile: client project > # >-# $Id: ConsoleTestClient.make,v 1.4 2008/01/15 11:58:50 ialelekov Exp $ >+# $Id: ConsoleTestClient.make,v 1.1.6.2 2008/11/10 19:15:30 pklicnik Exp $ > ################################################################################ > > >@@ -27,7 +27,7 @@ > # list of additional libraries to be linked with > # (separated by blanks) > #----------------------------------- >-LIBS := uuid dl tptpClient xerces-c transportSupport tptpUtils tptpConfig processControlUtil hcclco hcclsm hccls >+LIBS := dl tptpClient xerces-c transportSupport tptpUtils tptpConfig processControlUtil hcclco hcclsm hccls > > #----------------------------------- > # list of additional library directories to search from >@@ -55,11 +55,11 @@ > # > #----------------------------------- > >-CFLAGS := $(C_FLAGS) $(DEBUGABLE) -Wall $(OPTIMIZABLE) -fPIC $(addprefix -I,$(INCLUDEDIRS)) -D_LINUX_X86 >+CFLAGS := $(C_FLAGS) $(DEBUGABLE) -Wall $(OPTIMIZABLE) -fPIC $(addprefix -I,$(INCLUDEDIRS)) > > CXXFLAGS := $(CFLAGS) > >-LINKOPTS := $(L_FLAGS) $(DEBUGABLE) -o $(TARGETDIR)/$(TARGET) $(addprefix -L,$(LIBDIRS)) >+LINKOPTS := $(L_FLAGS) $(DEBUGABLE) $(addprefix -L,$(LIBDIRS)) -o $(TARGETDIR)/$(TARGET) > > > #----------------------------------- >Index: src-native-new/samples/ConsoleTestClient/TimeDataProcessor.cpp >=================================================================== >RCS file: /cvsroot/tptp/platform/org.eclipse.tptp.platform.agentcontroller/src-native-new/samples/ConsoleTestClient/TimeDataProcessor.cpp,v >retrieving revision 1.3 >diff -u -r1.3 TimeDataProcessor.cpp >--- src-native-new/samples/ConsoleTestClient/TimeDataProcessor.cpp 31 Oct 2005 05:21:31 -0000 1.3 >+++ src-native-new/samples/ConsoleTestClient/TimeDataProcessor.cpp 10 Nov 2008 20:34:23 -0000 >@@ -9,13 +9,15 @@ > * Vishnu K Naikawadi, Intel - Sample implementation of IDataProcessor for > * handling data coming from TimeCollector agent. > * >- * $Id: TimeDataProcessor.cpp,v 1.3 2005/10/31 05:21:31 rsmith Exp $ >+ * $Id: TimeDataProcessor.cpp,v 1.1.6.1 2008/10/16 20:56:18 pklicnik Exp $ > * > *******************************************************************************/ > > #include <iostream> > #include <memory.h> >-#include <malloc.h> >+#ifndef __APPLE__ >+ #include <malloc.h> >+#endif > #include "TimeDataProcessor.h" > > using namespace std; >Index: src-native-new/src/transport/sharedMemTL/SharedMemTL.make >=================================================================== >RCS file: /cvsroot/tptp/platform/org.eclipse.tptp.platform.agentcontroller/src-native-new/src/transport/sharedMemTL/SharedMemTL.make,v >retrieving revision 1.6 >diff -u -r1.6 SharedMemTL.make >--- src-native-new/src/transport/sharedMemTL/SharedMemTL.make 19 Mar 2007 03:14:39 -0000 1.6 >+++ src-native-new/src/transport/sharedMemTL/SharedMemTL.make 10 Nov 2008 20:34:26 -0000 >@@ -3,7 +3,7 @@ > # > # makefile: sharedMemTL project > # >-# $Id: SharedMemTL.make,v 1.6 2007/03/19 03:14:39 rsmith Exp $ >+# $Id: SharedMemTL.make,v 1.1.6.4 2008/11/10 19:15:30 pklicnik Exp $ > ################################################################################ > > >@@ -27,8 +27,11 @@ > if [ x$VERSIONNUM = x ]; then export VERSIONNUM=0; fi > if [ x$MINORNUM = x ]; then export MINORNUM=0; fi > if [ x$RELEASENUM = x ]; then export RELEASENUM=0; fi >+export VERSIONNUM=5 >+export MINORNUM=0 >+export RELEASENUM=0 > >-TARGETLIB := $(TARGET).so >+TARGETLIB := $(TARGET).dylib > TARGETSONAME := $(TARGETLIB).$(VERSIONNUM) > TARGETREALNAME := $(TARGETSONAME).$(MINORNUM).$(RELEASENUM) > >@@ -72,11 +75,11 @@ > # > #----------------------------------- > >-CFLAGS := $(C_FLAGS) $(DEBUGABLE) -Wall $(OPTIMIZABLE) -fPIC $(addprefix -I,$(INCLUDEDIRS)) -D_LINUX_X86 >+CFLAGS := $(C_FLAGS) $(DEBUGABLE) -Wall $(OPTIMIZABLE) -fPIC $(addprefix -I,$(INCLUDEDIRS)) > > CXXFLAGS := $(CFLAGS) > >-LINKOPTS := $(L_FLAGS) $(DEBUGABLE) -shared -Wl,-soname,$(TARGETSONAME) -o $(TARGETDIR)/$(TARGETREALNAME) $(addprefix -L,$(LIBDIRS)) >+LINKOPTS := $(L_FLAGS) $(DEBUGABLE) -undefined dynamic_lookup -dynamiclib -o $(TARGETDIR)/$(TARGETREALNAME) $(addprefix -L,$(LIBDIRS)) > > > #----------------------------------- >@@ -124,4 +127,4 @@ > $(CC) $(LINKOPTS) $(OBJS) $(addprefix -l,$(LIBS)) > $(CREATELINK) $(TARGETREALNAME) $(TARGETDIR)/$(TARGETSONAME) > $(CREATELINK) $(TARGETSONAME) $(TARGETDIR)/$(TARGETLIB) >- >+ $(CREATELINK) $(TARGETREALNAME) $(TARGETDIR)/$(TARGET).jnilib >Index: src-native-new/src/transport/CompSupport/CompSupport.make >=================================================================== >RCS file: /cvsroot/tptp/platform/org.eclipse.tptp.platform.agentcontroller/src-native-new/src/transport/CompSupport/CompSupport.make,v >retrieving revision 1.3 >diff -u -r1.3 CompSupport.make >--- src-native-new/src/transport/CompSupport/CompSupport.make 19 Mar 2007 03:14:40 -0000 1.3 >+++ src-native-new/src/transport/CompSupport/CompSupport.make 10 Nov 2008 20:34:25 -0000 >@@ -3,7 +3,7 @@ > # > # makefile: CompSupport project > # >-# $Id$ >+# $Id: CompSupport.make,v 1.1.6.4 2008/11/10 19:15:30 pklicnik Exp $ > ################################################################################ > > >@@ -27,8 +27,11 @@ > if [ x$VERSIONNUM = x ]; then export VERSIONNUM=0; fi > if [ x$MINORNUM = x ]; then export MINORNUM=0; fi > if [ x$RELEASENUM = x ]; then export RELEASENUM=0; fi >+export VERSIONNUM=5 >+export MINORNUM=0 >+export RELEASENUM=0 > >-TARGETLIB := $(TARGET).so >+TARGETLIB := $(TARGET).dylib > TARGETSONAME := $(TARGETLIB).$(VERSIONNUM) > TARGETREALNAME := $(TARGETSONAME).$(MINORNUM).$(RELEASENUM) > >@@ -72,11 +75,11 @@ > # > #----------------------------------- > >-CFLAGS := $(C_FLAGS) $(DEBUGABLE) -Wall $(OPTIMIZABLE) -fPIC $(addprefix -I,$(INCLUDEDIRS)) -D_LINUX_X86 >+CFLAGS := $(C_FLAGS) $(DEBUGABLE) -Wall $(OPTIMIZABLE) -fPIC $(addprefix -I,$(INCLUDEDIRS)) > > CXXFLAGS := $(CFLAGS) > >-LINKOPTS := $(L_FLAGS) $(DEBUGABLE) -shared -Wl,-soname,$(TARGETSONAME) -o $(TARGETDIR)/$(TARGETREALNAME) $(addprefix -L,$(LIBDIRS)) >+LINKOPTS := $(L_FLAGS) $(DEBUGABLE) -undefined dynamic_lookup -dynamiclib -o $(TARGETDIR)/$(TARGETREALNAME) $(addprefix -L,$(LIBDIRS)) > > > #----------------------------------- >@@ -124,4 +127,4 @@ > $(CC) $(LINKOPTS) $(OBJS) $(addprefix -l,$(LIBS)) > $(CREATELINK) $(TARGETREALNAME) $(TARGETDIR)/$(TARGETSONAME) > $(CREATELINK) $(TARGETSONAME) $(TARGETDIR)/$(TARGETLIB) >- >+ $(CREATELINK) $(TARGETREALNAME) $(TARGETDIR)/$(TARGET).jnilib >Index: src-native-new/test/Stress/GetAndRelease/GetAndRelease.make >=================================================================== >RCS file: /cvsroot/tptp/platform/org.eclipse.tptp.platform.agentcontroller/src-native-new/test/Stress/GetAndRelease/GetAndRelease.make,v >retrieving revision 1.1 >diff -u -r1.1 GetAndRelease.make >--- src-native-new/test/Stress/GetAndRelease/GetAndRelease.make 7 Nov 2005 20:51:59 -0000 1.1 >+++ src-native-new/test/Stress/GetAndRelease/GetAndRelease.make 10 Nov 2008 20:34:26 -0000 >@@ -3,7 +3,7 @@ > # > # makefile: GetAndRelease project > # >-# $Id$ >+# $Id: GetAndRelease.make,v 1.1.6.1 2008/11/10 19:15:30 pklicnik Exp $ > ################################################################################ > > >@@ -55,7 +55,7 @@ > # > #----------------------------------- > >-CFLAGS := -g -Wall -O3 -fPIC $(addprefix -I,$(INCLUDEDIRS)) -D_LINUX_X86 >+CFLAGS := -g -Wall -O3 -fPIC $(addprefix -I,$(INCLUDEDIRS)) > > CXXFLAGS := $(CFLAGS) > >Index: src-native-new/test/ConsoleTestClient/ConsoleTestClient.make >=================================================================== >RCS file: /cvsroot/tptp/platform/org.eclipse.tptp.platform.agentcontroller/src-native-new/test/ConsoleTestClient/ConsoleTestClient.make,v >retrieving revision 1.1 >diff -u -r1.1 ConsoleTestClient.make >--- src-native-new/test/ConsoleTestClient/ConsoleTestClient.make 4 Nov 2005 20:56:58 -0000 1.1 >+++ src-native-new/test/ConsoleTestClient/ConsoleTestClient.make 10 Nov 2008 20:34:26 -0000 >@@ -3,7 +3,7 @@ > # > # makefile: client project > # >-# $Id: ConsoleTestClient.make,v 1.1 2005/11/04 20:56:58 koleary Exp $ >+# $Id: ConsoleTestClient.make,v 1.1.6.1 2008/11/10 19:15:30 pklicnik Exp $ > ################################################################################ > > >@@ -55,7 +55,7 @@ > # > #----------------------------------- > >-CFLAGS := -g -Wall -O3 -fPIC $(addprefix -I,$(INCLUDEDIRS)) -D_LINUX_X86 >+CFLAGS := -g -Wall -O3 -fPIC $(addprefix -I,$(INCLUDEDIRS)) > > CXXFLAGS := $(CFLAGS) > >Index: src-native-new/test/launchTests/LaunchConsoleAgentClient/LaunchConsoleAgentClient.make >=================================================================== >RCS file: /cvsroot/tptp/platform/org.eclipse.tptp.platform.agentcontroller/src-native-new/test/launchTests/LaunchConsoleAgentClient/LaunchConsoleAgentClient.make,v >retrieving revision 1.1 >diff -u -r1.1 LaunchConsoleAgentClient.make >--- src-native-new/test/launchTests/LaunchConsoleAgentClient/LaunchConsoleAgentClient.make 29 Oct 2005 00:13:52 -0000 1.1 >+++ src-native-new/test/launchTests/LaunchConsoleAgentClient/LaunchConsoleAgentClient.make 10 Nov 2008 20:34:26 -0000 >@@ -3,7 +3,7 @@ > # > # makefile: client project > # >-# $Id: LaunchConsoleAgentClient.make,v 1.1 2005/10/29 00:13:52 kcallaghan Exp $ >+# $Id: LaunchConsoleAgentClient.make,v 1.1.6.1 2008/11/10 19:15:29 pklicnik Exp $ > ################################################################################ > > >@@ -55,7 +55,7 @@ > # > #----------------------------------- > >-CFLAGS := -g -Wall -O3 -fPIC $(addprefix -I,$(INCLUDEDIRS)) -D_LINUX_X86 >+CFLAGS := -g -Wall -O3 -fPIC $(addprefix -I,$(INCLUDEDIRS)) > > CXXFLAGS := $(CFLAGS) > >Index: src-native-new/src/agents/perfmon/PerfmonAgent/PerfmonAgent.make >=================================================================== >RCS file: /cvsroot/tptp/platform/org.eclipse.tptp.platform.agentcontroller/src-native-new/src/agents/perfmon/PerfmonAgent/PerfmonAgent.make,v >retrieving revision 1.2 >diff -u -r1.2 PerfmonAgent.make >--- src-native-new/src/agents/perfmon/PerfmonAgent/PerfmonAgent.make 12 Apr 2007 13:45:17 -0000 1.2 >+++ src-native-new/src/agents/perfmon/PerfmonAgent/PerfmonAgent.make 10 Nov 2008 20:34:24 -0000 >@@ -3,7 +3,7 @@ > # > # makefile: PerfmonAgent project > # >-# $Id: PerfmonAgent.make,v 1.2 2007/04/12 13:45:17 samwai Exp $ >+# $Id: PerfmonAgent.make,v 1.1.6.1 2008/11/10 19:15:29 pklicnik Exp $ > ################################################################################ > > >@@ -58,7 +58,7 @@ > # > #----------------------------------- > >-CFLAGS := $(C_FLAGS) $(DEBUGABLE) -Wall $(OPTIMIZABLE) -fPIC $(addprefix -I,$(INCLUDEDIRS)) -D_LINUX_X86 -D_TPTP_DIAGNOSTIC_ -DLINUX >+CFLAGS := $(C_FLAGS) $(DEBUGABLE) -Wall $(OPTIMIZABLE) -fPIC $(addprefix -I,$(INCLUDEDIRS)) -D_TPTP_DIAGNOSTIC_ -DLINUX > > CXXFLAGS := $(CFLAGS) > >Index: src-native-new/src/shared/tptpConfig/tptpConfig.make >=================================================================== >RCS file: /cvsroot/tptp/platform/org.eclipse.tptp.platform.agentcontroller/src-native-new/src/shared/tptpConfig/tptpConfig.make,v >retrieving revision 1.4 >diff -u -r1.4 tptpConfig.make >--- src-native-new/src/shared/tptpConfig/tptpConfig.make 19 Mar 2007 03:14:38 -0000 1.4 >+++ src-native-new/src/shared/tptpConfig/tptpConfig.make 10 Nov 2008 20:34:25 -0000 >@@ -4,7 +4,7 @@ > # > # makefile: tptpConfig project > # >-# $Id: tptpConfig.make,v 1.4 2007/03/19 03:14:38 rsmith Exp $ >+# $Id: tptpConfig.make,v 1.1.6.4 2008/11/10 19:15:30 pklicnik Exp $ > ################################################################################ > > >@@ -28,8 +28,11 @@ > if [ x$VERSIONNUM = x ]; then export VERSIONNUM=0; fi > if [ x$MINORNUM = x ]; then export MINORNUM=0; fi > if [ x$RELEASENUM = x ]; then export RELEASENUM=0; fi >+export VERSIONNUM=5 >+export MINORNUM=0 >+export RELEASENUM=0 > >-TARGETLIB := $(TARGET).so >+TARGETLIB := $(TARGET).dylib > TARGETSONAME := $(TARGETLIB).$(VERSIONNUM) > TARGETREALNAME := $(TARGETSONAME).$(MINORNUM).$(RELEASENUM) > >@@ -45,7 +48,7 @@ > # list of additional libraries to be linked with > # (separated by blanks) > #----------------------------------- >-LIBS := uuid dl xerces-c >+LIBS := dl xerces-c iconv stdc++ > > #----------------------------------- > # list of additional library directories to search from >@@ -73,11 +76,11 @@ > # > #----------------------------------- > >-CFLAGS := $(C_FLAGS) $(DEBUGABLE) -Wall $(OPTIMIZABLE) -fPIC $(addprefix -I,$(INCLUDEDIRS)) -D_LINUX_X86 >+CFLAGS := $(C_FLAGS) $(DEBUGABLE) -Wall $(OPTIMIZABLE) -fPIC $(addprefix -I,$(INCLUDEDIRS)) > > CXXFLAGS := $(CFLAGS) > >-LINKOPTS := $(L_FLAGS) $(DEBUGABLE) -shared -Wl,-soname,$(TARGETSONAME) -o $(TARGETDIR)/$(TARGETREALNAME) $(addprefix -L,$(LIBDIRS)) >+LINKOPTS := $(L_FLAGS) $(DEBUGABLE) -undefined dynamic_lookup -dynamiclib -o $(TARGETDIR)/$(TARGETREALNAME) $(addprefix -L,$(LIBDIRS)) > > > #----------------------------------- >@@ -85,7 +88,7 @@ > #----------------------------------- > > CC := gcc >-CXX := $(CC) >+CXX := g++ > > SOURCE := $(wildcard *.c) $(wildcard *.cpp) > >@@ -125,4 +128,4 @@ > $(CC) $(LINKOPTS) $(OBJS) $(addprefix -l,$(LIBS)) > $(CREATELINK) $(TARGETREALNAME) $(TARGETDIR)/$(TARGETSONAME) > $(CREATELINK) $(TARGETSONAME) $(TARGETDIR)/$(TARGETLIB) >- >+ $(CREATELINK) $(TARGETREALNAME) $(TARGETDIR)/$(TARGET).jnilib >Index: src-native-new/samples/SimpleAppl/SimpleAppl.make >=================================================================== >RCS file: /cvsroot/tptp/platform/org.eclipse.tptp.platform.agentcontroller/src-native-new/samples/SimpleAppl/SimpleAppl.make,v >retrieving revision 1.3 >diff -u -r1.3 SimpleAppl.make >--- src-native-new/samples/SimpleAppl/SimpleAppl.make 19 Mar 2007 03:14:39 -0000 1.3 >+++ src-native-new/samples/SimpleAppl/SimpleAppl.make 10 Nov 2008 20:34:23 -0000 >@@ -54,7 +54,7 @@ > # > #----------------------------------- > >-CFLAGS := $(C_FLAGS) $(DEBUGABLE) -Wall $(OPTIMIZABLE) -fPIC $(addprefix -I,$(INCLUDEDIRS)) -D_LINUX_X86 >+CFLAGS := $(C_FLAGS) $(DEBUGABLE) -Wall $(OPTIMIZABLE) -fPIC $(addprefix -I,$(INCLUDEDIRS)) > > CXXFLAGS := $(CFLAGS) > >Index: src-native-new/test/Stress/FullCycle/FullCycle.make >=================================================================== >RCS file: /cvsroot/tptp/platform/org.eclipse.tptp.platform.agentcontroller/src-native-new/test/Stress/FullCycle/FullCycle.make,v >retrieving revision 1.1 >diff -u -r1.1 FullCycle.make >--- src-native-new/test/Stress/FullCycle/FullCycle.make 7 Nov 2005 20:51:59 -0000 1.1 >+++ src-native-new/test/Stress/FullCycle/FullCycle.make 10 Nov 2008 20:34:26 -0000 >@@ -3,7 +3,7 @@ > # > # makefile: FullCycle project > # >-# $Id$ >+# $Id: FullCycle.make,v 1.1.6.1 2008/11/10 19:15:30 pklicnik Exp $ > ################################################################################ > > >@@ -55,7 +55,7 @@ > # > #----------------------------------- > >-CFLAGS := -g -Wall -O3 -fPIC $(addprefix -I,$(INCLUDEDIRS)) -D_LINUX_X86 >+CFLAGS := -g -Wall -O3 -fPIC $(addprefix -I,$(INCLUDEDIRS)) > > CXXFLAGS := $(CFLAGS) > >Index: src-native-new/agents/org.eclipse.tptp.TimeCollector/agent.xml >=================================================================== >RCS file: /cvsroot/tptp/platform/org.eclipse.tptp.platform.agentcontroller/src-native-new/agents/org.eclipse.tptp.TimeCollector/agent.xml,v >retrieving revision 1.5 >diff -u -r1.5 agent.xml >--- src-native-new/agents/org.eclipse.tptp.TimeCollector/agent.xml 29 Feb 2008 03:31:17 -0000 1.5 >+++ src-native-new/agents/org.eclipse.tptp.TimeCollector/agent.xml 10 Nov 2008 20:34:22 -0000 >@@ -15,8 +15,7 @@ > <Bound>0</Bound> > <MaxControllers>-1</MaxControllers> > <MaxObservers>-1</MaxObservers> >- <ConfigFile>c:\tptp\agents\org.eclipse.tptp.TimeCollector\config\agentconfig.xml</ConfigFile> > <LaunchConfiguration> >- <launchInfo><Application executable=".\TimeCollector.exe"></Application></launchInfo> >+ <launchInfo><Application executable="./TimeCollector"></Application></launchInfo> > </LaunchConfiguration> > </Agent> >Index: src-native-new/include/tptp/TPTPUtils.h >=================================================================== >RCS file: /cvsroot/tptp/platform/org.eclipse.tptp.platform.agentcontroller/src-native-new/include/tptp/TPTPUtils.h,v >retrieving revision 1.25 >diff -u -r1.25 TPTPUtils.h >--- src-native-new/include/tptp/TPTPUtils.h 13 May 2008 15:51:45 -0000 1.25 >+++ src-native-new/include/tptp/TPTPUtils.h 10 Nov 2008 20:34:23 -0000 >@@ -9,8 +9,8 @@ > * Andy Kaylor, Intel - Initial API and Implementation > * Karla Callaghan, Intel - Added Command Parsing functions > * >- * $Id: TPTPUtils.h,v 1.25 2008/05/13 15:51:45 jcayne Exp $ >- *******************************************************************************/ >+ * $Id: TPTPUtils.h,v 1.1.6.1 2008/10/06 16:07:32 pklicnik Exp $ >+ *******************************************************************************/ > > #ifndef __TPTPUTILS_H__ > #define __TPTPUTILS_H__ >@@ -127,7 +127,7 @@ > int getConfigurationString( const char* config, char* name, char **value ); > int getConfigurationInt( const char* config, char* name, tptp_int32 *value ); > >-int parseCommand( const char* cmd, >+int parseCommand( const char* cmd, > int* sourceID, > int* context, > char** interfaceID, >@@ -171,7 +171,7 @@ > > /* The single-writer/multiple-reader guard > compound synchronization object */ >-typedef struct _SWMR >+typedef struct _SWMR > { > /* This critical section guards access to the other objects > * managed by this data structure and also indicates >@@ -190,7 +190,7 @@ > #if defined _LINUX_X86 || defined _LINUX_390 || defined _HPUX > #include <pthread.h> > >- typedef struct >+ typedef struct > { > pthread_mutex_t mutex; > pthread_cond_t rcond; >@@ -220,17 +220,22 @@ > #endif > > /* Semaphore utilities */ >-#ifdef _WIN32 >-typedef struct >+#if defined(_WIN32) >+typedef struct > { > HANDLE hSem; > } Semaphore_t; >- >+#elif defined (__APPLE__) >+ #include <semaphore.h> >+ typedef struct >+ { >+ sem_t * sem; >+ } Semaphore_t; > #else /* Not _WIN32 */ > > //#include <pthread.h> > #include <semaphore.h> >-typedef struct >+typedef struct > { > sem_t sem; > } Semaphore_t; >Index: src-native-new/samples/Compatibility/CompClient.make >=================================================================== >RCS file: /cvsroot/tptp/platform/org.eclipse.tptp.platform.agentcontroller/src-native-new/samples/Compatibility/CompClient.make,v >retrieving revision 1.4 >diff -u -r1.4 CompClient.make >--- src-native-new/samples/Compatibility/CompClient.make 26 May 2008 21:33:37 -0000 1.4 >+++ src-native-new/samples/Compatibility/CompClient.make 10 Nov 2008 20:34:23 -0000 >@@ -3,7 +3,7 @@ > # > # makefile: client project > # >-# $Id: CompClient.make,v 1.4 2008/05/26 21:33:37 jkubasta Exp $ >+# $Id: CompClient.make,v 1.1.6.2 2008/11/10 19:15:30 pklicnik Exp $ > ################################################################################ > > >@@ -27,7 +27,7 @@ > # list of additional libraries to be linked with > # (separated by blanks) > #----------------------------------- >-LIBS := uuid dl tptpClient tptpUtils hcclco hcclsm hccls tptpConfig processControlUtil >+LIBS := dl tptpClient tptpUtils hcclco hcclsm hccls tptpConfig processControlUtil > > #----------------------------------- > # list of additional library directories to search from >@@ -55,11 +55,11 @@ > # > #----------------------------------- > >-CFLAGS := $(C_FLAGS) $(DEBUGABLE) -Wall $(OPTIMIZABLE) -fPIC $(addprefix -I,$(INCLUDEDIRS)) -D_LINUX_X86 >+CFLAGS := $(C_FLAGS) $(DEBUGABLE) -Wall $(OPTIMIZABLE) -fPIC $(addprefix -I,$(INCLUDEDIRS)) > > CXXFLAGS := $(CFLAGS) > >-LINKOPTS := $(L_FLAGS) $(DEBUGABLE) -o $(TARGETDIR)/$(TARGET) $(addprefix -L,$(LIBDIRS)) >+LINKOPTS := $(L_FLAGS) $(DEBUGABLE) $(addprefix -L,$(LIBDIRS)) -o $(TARGETDIR)/$(TARGET) > > > #----------------------------------- >@@ -101,5 +101,5 @@ > > > $(TARGET) : $(OBJS) >- $(CC) $(LINKOPTS) $(OBJS) $(addprefix -l,$(LIBS)) >+ $(CXX) $(LINKOPTS) $(OBJS) $(addprefix -l,$(LIBS)) > >Index: src-native-new/test/launchTests/LaunchAgentClient/LaunchAgentClient.make >=================================================================== >RCS file: /cvsroot/tptp/platform/org.eclipse.tptp.platform.agentcontroller/src-native-new/test/launchTests/LaunchAgentClient/LaunchAgentClient.make,v >retrieving revision 1.1 >diff -u -r1.1 LaunchAgentClient.make >--- src-native-new/test/launchTests/LaunchAgentClient/LaunchAgentClient.make 29 Oct 2005 00:13:52 -0000 1.1 >+++ src-native-new/test/launchTests/LaunchAgentClient/LaunchAgentClient.make 10 Nov 2008 20:34:26 -0000 >@@ -3,7 +3,7 @@ > # > # makefile: client project > # >-# $Id: LaunchAgentClient.make,v 1.1 2005/10/29 00:13:52 kcallaghan Exp $ >+# $Id: LaunchAgentClient.make,v 1.1.6.1 2008/11/10 19:15:30 pklicnik Exp $ > ################################################################################ > > >@@ -55,7 +55,7 @@ > # > #----------------------------------- > >-CFLAGS := -g -Wall -O3 -fPIC $(addprefix -I,$(INCLUDEDIRS)) -D_LINUX_X86 >+CFLAGS := -g -Wall -O3 -fPIC $(addprefix -I,$(INCLUDEDIRS)) > > CXXFLAGS := $(CFLAGS) > >Index: src-native-new/src/transport/RASocket/RASocket.make >=================================================================== >RCS file: /cvsroot/tptp/platform/org.eclipse.tptp.platform.agentcontroller/src-native-new/src/transport/RASocket/RASocket.make,v >retrieving revision 1.6 >diff -u -r1.6 RASocket.make >--- src-native-new/src/transport/RASocket/RASocket.make 2 Apr 2007 18:05:35 -0000 1.6 >+++ src-native-new/src/transport/RASocket/RASocket.make 10 Nov 2008 20:34:25 -0000 >@@ -27,8 +27,11 @@ > if [ x$VERSIONNUM = x ]; then export VERSIONNUM=0; fi > if [ x$MINORNUM = x ]; then export MINORNUM=0; fi > if [ x$RELEASENUM = x ]; then export RELEASENUM=0; fi >+export VERSIONNUM=5 >+export MINORNUM=0 >+export RELEASENUM=0 > >-TARGETLIB := $(TARGET).so >+TARGETLIB := $(TARGET).dylib > TARGETSONAME := $(TARGETLIB).$(VERSIONNUM) > TARGETREALNAME := $(TARGETSONAME).$(MINORNUM).$(RELEASENUM) > >@@ -37,7 +40,7 @@ > # list of additional INCLUDE directories to search headers from > # (separated by blanks) > #----------------------------------- >-INCLUDEDIRS := . ../../../include ../RACommon $(JAVA_HOME)/include $(JAVA_HOME)/include/linux >+INCLUDEDIRS := . ../../../include ../RACommon /System/Library/Frameworks/JavaVM.framework/Versions/CurrentJDK/Headers/ > > > #----------------------------------- >@@ -74,11 +77,11 @@ > > DEFINES := -DSQLUNIX -DSQLLinux -DENW -DREENTRANT -D_REENTRANT -DCONFIG_X86_CMPXCHG > >-CFLAGS := $(C_FLAGS) $(DEBUGABLE) -Wall $(OPTIMIZABLE) -fPIC $(addprefix -I,$(INCLUDEDIRS)) -D_LINUX_X86 $(DEFINES) >+CFLAGS := $(C_FLAGS) $(DEBUGABLE) -Wall $(OPTIMIZABLE) -fPIC $(addprefix -I,$(INCLUDEDIRS)) $(DEFINES) > > CXXFLAGS := $(CFLAGS) > >-LINKOPTS := $(L_FLAGS) $(DEBUGABLE) -shared -Wl,-soname,$(TARGETSONAME) -o $(TARGETDIR)/$(TARGETREALNAME) $(addprefix -L,$(LIBDIRS)) >+LINKOPTS := $(L_FLAGS) $(DEBUGABLE) -undefined dynamic_lookup -dynamiclib -o $(TARGETDIR)/$(TARGETREALNAME) $(addprefix -L,$(LIBDIRS)) > > > #----------------------------------- >@@ -126,4 +129,4 @@ > $(CC) $(LINKOPTS) $(OBJS) $(addprefix -l,$(LIBS)) > $(CREATELINK) $(TARGETREALNAME) $(TARGETDIR)/$(TARGETSONAME) > $(CREATELINK) $(TARGETSONAME) $(TARGETDIR)/$(TARGETLIB) >- >+ $(CREATELINK) $(TARGETREALNAME) $(TARGETDIR)/$(TARGET).jnilib >Index: src-native-new/samples/MyFileTransferClient/MyFileTransferClient.make >=================================================================== >RCS file: /cvsroot/tptp/platform/org.eclipse.tptp.platform.agentcontroller/src-native-new/samples/MyFileTransferClient/MyFileTransferClient.make,v >retrieving revision 1.4 >diff -u -r1.4 MyFileTransferClient.make >--- src-native-new/samples/MyFileTransferClient/MyFileTransferClient.make 15 Jan 2008 11:58:50 -0000 1.4 >+++ src-native-new/samples/MyFileTransferClient/MyFileTransferClient.make 10 Nov 2008 20:34:23 -0000 >@@ -3,7 +3,7 @@ > # > # makefile: client project > # >-# $Id: MyFileTransferClient.make,v 1.4 2008/01/15 11:58:50 ialelekov Exp $ >+# $Id: MyFileTransferClient.make,v 1.1.6.2 2008/11/10 19:15:30 pklicnik Exp $ > ################################################################################ > > >@@ -27,7 +27,7 @@ > # list of additional libraries to be linked with > # (separated by blanks) > #----------------------------------- >-LIBS := uuid dl tptpClient xerces-c transportSupport tptpUtils tptpConfig processControlUtil hcclco hcclsm hccls >+LIBS := dl tptpClient xerces-c transportSupport tptpUtils tptpConfig processControlUtil hcclco hcclsm hccls > > #----------------------------------- > # list of additional library directories to search from >@@ -55,7 +55,7 @@ > # > #----------------------------------- > >-CFLAGS := $(C_FLAGS) $(DEBUGABLE) -Wall $(OPTIMIZABLE) -fPIC $(addprefix -I,$(INCLUDEDIRS)) -D_LINUX_X86 >+CFLAGS := $(C_FLAGS) $(DEBUGABLE) -Wall $(OPTIMIZABLE) -fPIC $(addprefix -I,$(INCLUDEDIRS)) > > CXXFLAGS := $(CFLAGS) > >Index: src-native-new/src/agents/tptpProcessController/TPTPProcessController.cpp >=================================================================== >RCS file: /cvsroot/tptp/platform/org.eclipse.tptp.platform.agentcontroller/src-native-new/src/agents/tptpProcessController/TPTPProcessController.cpp,v >retrieving revision 1.74 >diff -u -r1.74 TPTPProcessController.cpp >--- src-native-new/src/agents/tptpProcessController/TPTPProcessController.cpp 7 Apr 2008 09:35:22 -0000 1.74 >+++ src-native-new/src/agents/tptpProcessController/TPTPProcessController.cpp 10 Nov 2008 20:34:24 -0000 >@@ -8,7 +8,7 @@ > * Contributors: > * Karla Callaghan, Intel - Initial API and Implementation > * >- * $Id: TPTPProcessController.cpp,v 1.74 2008/04/07 09:35:22 ialelekov Exp $ >+ * $Id: TPTPProcessController.cpp,v 1.1.6.2 2008/10/17 16:17:42 pklicnik Exp $ > *******************************************************************************/ > > #include "TPTPProcessController.h" >@@ -46,6 +46,8 @@ > static THREAD_USER_FUNC_RET_TYPE startProcesses(void* pProcessController); > static THREAD_USER_FUNC_RET_TYPE monitorProcessEvents(void* pProcController); > >+static FILE * outfile; >+ > #define BUFFER_LENGTH 1024 > > /////////////////////////////////////////////////// >@@ -56,6 +58,8 @@ > > ProcessController::ProcessController(char* name) : BaseAgentImpl(name) > { >+ >+ outfile = fopen( "processControllerLog", "a+" ); > tptp_initializeLock(&runningProcessListLock); > tptp_list_init(&runningProcessList); > tptp_list_setNodeDestructor(&runningProcessList, destroyProcessNode); >@@ -876,6 +880,8 @@ > newMonitor = initListenerT(requestorID, requestorCtxt, NULL); > if (!newMonitor) > { >+ fprintf( outfile, "Failed to create a new monitor\n" ); >+ fflush( outfile ); > TPTP_LOG_ERROR_MSG(this, "PC doMonitorProcessState: Failed to create a new monitor"); > return TPTP_SYS_NO_MEM; > } >@@ -887,11 +893,15 @@ > { > //Add requestor id & context to monitor list to get events of this process. > addProcessMonitor (pid, newMonitor); >+ fprintf( outfile, "findRunningProcessByPid 0\n" ); >+ fflush( outfile ); > } > else > { > // The PC did not launch this process, try to get a handle on it > // so that we can monitor the state of this process. >+ fprintf( outfile, "findRunningProcessByPid != 0\n" ); >+ fflush( outfile ); > #ifdef _WIN32 > //TODO: Move to _md file as this is platform specific code > >@@ -907,8 +917,14 @@ > return -1; > } > #else >- rc = ptrace (PTRACE_ATTACH, pid, NULL, NULL); >- if (rc < 0) { >+ #ifdef __APPLE__ >+ rc = ptrace (PT_ATTACH, pid, NULL, NULL); >+ #else >+ rc = ptrace (PTRACE_ATTACH, pid, NULL, NULL); >+ #endif >+ if (rc < 0) { >+ fprintf( outfile, "ptrace() call for pid %d failed\n", pid ); >+ fflush( outfile ); > TPTP_LOG_ERROR_MSG1(this, "ptrace() call failed for pid %d", pid); > tptp_free (newMonitor); > return -1; >@@ -927,6 +943,8 @@ > proc = initProcessT(0, 0, NULL, NULL, NULL, NULL, 0, 0); > if (!proc) > { >+ fprintf( outfile, "Failed to create a new proc struct\n" ); >+ fflush( outfile ); > TPTP_LOG_ERROR_MSG(this, "PC doMonitorProcessState: Failed to create a new proc struct"); > return TPTP_SYS_NO_MEM; > } >@@ -1521,10 +1539,14 @@ > int bufferCount = 0; > char* endTags = "</envVarList></processStarted></Cmd>"; > >+ fprintf( outfile, "before validateExecutable\n" ); >+ fclose( outfile ); > if (validateExecutable(pProcess->appName, errCode) != 1) > { > //Error - no valid name to launch > char * errStr = tptp_getErrorString(errCode); >+ fprintf( outfile, "after validateExecutable AND SENDING ERROR!!!\n" ); >+ fflush( outfile ); > TPTP_LOG_ERROR_MSG2(this, "PC startProcess: Error (%lu), invalid executable '%s'", errCode, pProcess->appName); > sendErrorCommand(pProcess->ownerID, > pProcess->ownerContext, >@@ -1542,6 +1564,8 @@ > //Error - working directory is not useable > char * errStr = tptp_getErrorString(errCode); > TPTP_LOG_DEBUG_MSG2(this, "PC startProcess: Error (%lu), invalid working dir '%s'", errCode, pProcess->workingDir); >+ fprintf( outfile, "SENDING ERROR FROM VALIDATEDIRECTORY\n" ); >+ fflush( outfile ); > sendErrorCommand(pProcess->ownerID, > pProcess->ownerContext, > TPTP_PC_UNABLE_TO_START_PROCESS, >@@ -1562,6 +1586,8 @@ > //Error - could not start the process > char * errStr = tptp_getErrorString(errCode); > TPTP_LOG_ERROR_MSG2(this, "PC startProcess: Error (%lu), failed to create process '%s'", errCode, pProcess->appName); >+ fprintf( outfile, "SENDING ERROR FROM DOCREATEPROCESS\n" ); >+ fflush( outfile ); > sendErrorCommand(pProcess->ownerID, > pProcess->ownerContext, > TPTP_PC_UNABLE_TO_START_PROCESS, >@@ -1674,6 +1700,8 @@ > // Error - could not stop the process > char* errStr = tptp_getErrorString(rc); > TPTP_LOG_ERROR_MSG1(this, "PC stopProcess: Failed to stop process %d", pid); >+ fprintf( outfile, "SENDING ERROR FROM DOSTOPPROCESS\n" ); >+ fflush( outfile ); > sendErrorCommand(replyDest, > replyContext, > TPTP_PC_UNABLE_TO_STOP_PROCESS, >@@ -1747,6 +1775,8 @@ > { > char* errStr = tptp_getErrorString(rc); > TPTP_LOG_ERROR_MSG1(this, "PC monitorProcessState: Failed to monitor process %d", pid); >+ fprintf( outfile, "SENDING ERROR FROM DOMONITORPROCESSSTATE\n" ); >+ fflush( outfile ); > sendErrorCommand(replyDest, > replyContext, > TPTP_PC_UNABLE_TO_MONITOR_PROCESS, >@@ -1817,6 +1847,8 @@ > { > char* errStr = tptp_getErrorString(rc); > TPTP_LOG_ERROR_MSG1(this, "PC terminateChildProcesses: Failed to terminate child processes for ownerID %d", ownerSourceID); >+ fprintf( outfile, "SENDING ERROR FROM DOTERMINATECHILDPROCESSES\n" ); >+ fflush( outfile ); > sendErrorCommand(replyDest, > replyContext, > TPTP_PC_UNABLE_TO_TERM_CHILD_PROCESSES, >@@ -1859,6 +1891,9 @@ > char* cmdName = 0; > tptp_list_t* paramList; > >+ fprintf( outfile, "in processCommand\n" ); >+ fflush( outfile ); >+ > //Handle basic agent commands > int handled = BaseAgentImpl::processCommand(cmd); > >@@ -1881,6 +1916,8 @@ > { > if (isEqualString(cmdName, "validateProcessToLaunch")) > { >+ fprintf( outfile, "validateProcessToLaunch\n" ); >+ fflush( outfile ); > // Command: validateProcessToLaunch > // Expected parameters: applicationName, workingDir > // If no params found report an error. >@@ -1909,6 +1946,8 @@ > } > else if (isEqualString(cmdName, "startProcess")) > { >+ fprintf( outfile, "startProcess\n" ); >+ fflush( outfile ); > // Command: startProcess > // Expected parameters: applicationName, commandLineArgs, > // workingDir, environmentVars, >@@ -2222,6 +2261,8 @@ > } > else if (isEqualString(cmdName, "stopProcess")) > { >+ fprintf( outfile, "stopProcess\n" ); >+ fflush( outfile ); > // Command: stopProcess > // Expected parameters: processID > // If no params found report an error. >@@ -2245,6 +2286,8 @@ > } > else if (isEqualString(cmdName, "getProcessUUID")) > { >+ fprintf( outfile, "getProcessUUID\n" ); >+ fflush( outfile ); > // Command: getProcessUUID > // Expected parameters: processID > // If no params found report an error. >@@ -2269,6 +2312,8 @@ > } > else if (isEqualString(cmdName, "monitorProcessState")) > { >+ fprintf( outfile, "monitorProcessState\n" ); >+ fflush( outfile ); > // Command: monitorProcessState > // Expected parameters: processID > // If no params found report an error. >@@ -2292,6 +2337,8 @@ > } > else if (isEqualString(cmdName, "terminateChildProcesses")) > { >+ fprintf( outfile, "terminateChildProcesses\n" ); >+ fflush( outfile ); > // Command: terminateChildProcesses > // Expected parameters: sourceID > // If no params found report an error. >@@ -2329,6 +2376,8 @@ > { > if (isEqualString(cmdName, "applicationAliases")) > { >+ fprintf( outfile, "applicationAliases\n" ); >+ fflush( outfile ); > // Command: applicationAliases > // Expected parameters: aliases > // If no params found - not an error. >@@ -2377,6 +2426,8 @@ > { > if (isEqualString(cmdName, "addEventListener")) > { >+ fprintf( outfile, "addEventListener\n" ); >+ fflush( outfile ); > // Command: addEventListener > // Expected parameters: interfaceID, listenerID > // If no params found report an error. >@@ -2430,20 +2481,36 @@ > if (pid <= 0) break; > > if (WIFEXITED(s)) { >- ptrace (PTRACE_DETACH, pid, NULL, NULL); >+ #ifdef __APPLE__ >+ ptrace (PT_DETACH, pid, NULL, NULL); >+ #else >+ ptrace (PTRACE_DETACH, pid, NULL, NULL); >+ #endif > } > else if (WIFSIGNALED(s)) { >- ptrace (PTRACE_DETACH, pid, NULL, NULL); >+ #ifdef __APPLE__ >+ ptrace (PT_DETACH, pid, NULL, NULL); >+ #else >+ ptrace (PTRACE_DETACH, pid, NULL, NULL); >+ #endif > } > else if (WIFSTOPPED(s)) { > int sig = WSTOPSIG(s); > > if (sig == SIGSTOP) { >- ptrace (PTRACE_CONT, pid, NULL, NULL); >+ #ifdef __APPLE__ >+ ptrace( PT_CONTINUE, pid, NULL, NULL ); >+ #else >+ ptrace (PTRACE_CONT, pid, NULL, NULL); >+ #endif > pid = 0; > } >- else { >- ptrace (PTRACE_DETACH, pid, NULL, NULL); >+ else { >+ #ifdef __APPLE__ >+ ptrace (PT_DETACH, pid, NULL, NULL); >+ #else >+ ptrace (PTRACE_DETACH, pid, NULL, NULL); >+ #endif > kill (pid, sig); > #ifdef __ia64 > pid = 0; // to supress false notification, bug #218845 >@@ -2630,6 +2697,9 @@ > //This routine does not terminate the agents that requested > //to keep alive. > ProcessControllerAgent->terminateAllChildProcesses(); >+ >+ fflush( outfile ); >+ fclose( outfile ); > > TPTP_LOG_DEBUG_MSG(ProcessControllerAgent, "Process Controller EXITING"); > >Index: src-native-new/src/agents/tptpProcessController/TPTPProcessController.make >=================================================================== >RCS file: /cvsroot/tptp/platform/org.eclipse.tptp.platform.agentcontroller/src-native-new/src/agents/tptpProcessController/TPTPProcessController.make,v >retrieving revision 1.9 >diff -u -r1.9 TPTPProcessController.make >--- src-native-new/src/agents/tptpProcessController/TPTPProcessController.make 19 Mar 2007 03:14:38 -0000 1.9 >+++ src-native-new/src/agents/tptpProcessController/TPTPProcessController.make 10 Nov 2008 20:34:24 -0000 >@@ -3,7 +3,7 @@ > # > # makefile: tptpProcessController project > # >-# $Id: TPTPProcessController.make,v 1.9 2007/03/19 03:14:38 rsmith Exp $ >+# $Id: TPTPProcessController.make,v 1.1.6.3 2008/11/10 19:15:29 pklicnik Exp $ > ################################################################################ > > >@@ -54,11 +54,11 @@ > # > #----------------------------------- > >-CFLAGS := $(C_FLAGS) $(DEBUGABLE) -Wall $(OPTIMIZABLE) -fPIC $(addprefix -I,$(INCLUDEDIRS)) -D_LINUX_X86 >+CFLAGS := $(C_FLAGS) $(DEBUGABLE) -Wall $(OPTIMIZABLE) -fPIC $(addprefix -I,$(INCLUDEDIRS)) > > CXXFLAGS := $(CFLAGS) > >-LINKOPTS := $(L_FLAGS) $(DEBUGABLE) -o $(TARGETDIR)/$(TARGET) $(addprefix -L,$(LIBDIRS)) >+LINKOPTS := $(L_FLAGS) $(DEBUGABLE) -m $(addprefix -L,$(LIBDIRS)) -o $(TARGETDIR)/$(TARGET) > > > #----------------------------------- >@@ -66,7 +66,7 @@ > #----------------------------------- > > CC := gcc >-CXX := $(CC) >+CXX := g++ > > SOURCE := $(wildcard *.c) $(wildcard *.cpp) > >@@ -100,4 +100,4 @@ > > > $(TARGET) : $(OBJS) >- $(CC) $(LINKOPTS) $(OBJS) $(addprefix -l,$(LIBS)) >+ $(CXX) $(LINKOPTS) $(OBJS) $(addprefix -l,$(LIBS)) >Index: src-native-new/src/InstService/version.rc >=================================================================== >RCS file: /cvsroot/tptp/platform/org.eclipse.tptp.platform.agentcontroller/src-native-new/src/InstService/version.rc,v >retrieving revision 1.2 >diff -u -r1.2 version.rc >--- src-native-new/src/InstService/version.rc 3 Mar 2006 23:28:24 -0000 1.2 >+++ src-native-new/src/InstService/version.rc 10 Nov 2008 20:34:23 -0000 >@@ -8,7 +8,7 @@ > * Contributors: > * Vishnu K Naikawadi, Intel - Brought over code from RAC implementation > * >- * $Id: version.rc,v 1.3 2005/06/30 19:29:14 vnaikawadi Exp $ >+ * $Id: version.rc,v 1.1 2008/06/17 16:11:25 jcayne Exp $ > * > *******************************************************************************/ > >Index: src-native-new/src/agents/thread/hcthread.make >=================================================================== >RCS file: /cvsroot/tptp/platform/org.eclipse.tptp.platform.agentcontroller/src-native-new/src/agents/thread/hcthread.make,v >retrieving revision 1.1 >diff -u -r1.1 hcthread.make >--- src-native-new/src/agents/thread/hcthread.make 2 Apr 2007 18:05:31 -0000 1.1 >+++ src-native-new/src/agents/thread/hcthread.make 10 Nov 2008 20:34:24 -0000 >@@ -27,8 +27,11 @@ > if [ x$VERSIONNUM = x ]; then export VERSIONNUM=0; fi > if [ x$MINORNUM = x ]; then export MINORNUM=0; fi > if [ x$RELEASENUM = x ]; then export RELEASENUM=0; fi >+export VERSIONNUM=5 >+export MINORNUM=0 >+export RELEASENUM=0 > >-TARGETLIB := $(TARGET).so >+TARGETLIB := $(TARGET).dylib > TARGETSONAME := $(TARGETLIB).$(VERSIONNUM) > TARGETREALNAME := $(TARGETSONAME).$(MINORNUM).$(RELEASENUM) > >@@ -37,7 +40,7 @@ > # list of additional INCLUDE directories to search headers from > # (separated by blanks) > #----------------------------------- >-INCLUDEDIRS := . ../../../include $(JAVA_HOME)/include $(JAVA_HOME)/include/linux ../RABindings ../../transport/RACommon ../../transport/RASocket ../../transport/RASharedMemory ../../transport/RADataTransfer >+INCLUDEDIRS := . ../../../include /System/Library/Frameworks/JavaVM.framework/Versions/CurrentJDK/Headers/ ../RABindings ../../transport/RACommon ../../transport/RASocket ../../transport/RASharedMemory ../../transport/RADataTransfer > > > #----------------------------------- >@@ -74,11 +77,11 @@ > > DEFINES := -DSQLUNIX -DSQLLinux -DENW -DREENTRANT -D_REENTRANT -DCONFIG_X86_CMPXCHG > >-CFLAGS := $(C_FLAGS) $(DEBUGABLE) -Wall $(OPTIMIZABLE) -fPIC $(addprefix -I,$(INCLUDEDIRS)) -D_LINUX_X86 $(DEFINES) >+CFLAGS := $(C_FLAGS) $(DEBUGABLE) -Wall $(OPTIMIZABLE) -fPIC $(addprefix -I,$(INCLUDEDIRS)) $(DEFINES) > > CXXFLAGS := $(CFLAGS) > >-LINKOPTS := $(L_FLAGS) $(DEBUGABLE) -shared -Wl,-soname,$(TARGETSONAME) -o $(TARGETDIR)/$(TARGETREALNAME) $(addprefix -L,$(LIBDIRS)) >+LINKOPTS := $(L_FLAGS) $(DEBUGABLE) -undefined dynamic_lookup -dynamiclib -single_module -o $(TARGETDIR)/$(TARGETREALNAME) $(addprefix -L,$(LIBDIRS)) > > > #----------------------------------- >@@ -126,4 +129,4 @@ > $(CC) $(LINKOPTS) $(OBJS) $(addprefix -l,$(LIBS)) > $(CREATELINK) $(TARGETREALNAME) $(TARGETDIR)/$(TARGETSONAME) > $(CREATELINK) $(TARGETSONAME) $(TARGETDIR)/$(TARGETLIB) >- >+ $(CREATELINK) $(TARGETREALNAME) $(TARGETDIR)/$(TARGET).jnilib >Index: src-native-new/bin/SetConfig.sh >=================================================================== >RCS file: src-native-new/bin/SetConfig.sh >diff -N src-native-new/bin/SetConfig.sh >--- /dev/null 1 Jan 1970 00:00:00 -0000 >+++ src-native-new/bin/SetConfig.sh 1 Jan 1970 00:00:00 -0000 >@@ -0,0 +1,49 @@ >+#!/bin/sh >+ >+# >+# Check if java is in the PATH >+# >+java -version > /dev/null 2>&1 >+if [ $? != 0 ]; then >+ echo 'ERROR: Cannot find java in the PATH' >+ echo 'RESOLUTION: Make sure the PATH environment variable contains the location of a java executable' >+ exit 0 >+fi >+ >+ >+if [ ! -s ../lib/config.jar ]; then >+ echo 'ERROR: Cannot find ..\lib\config.jar.' >+ echo 'RESOLUTION: Make sure you are running this script in <AC>/bin directory.' >+ exit 0 >+fi >+ >+ >+# >+# Check if the JRE contains a suitable JAXP >+# >+java -classpath ../lib/config.jar org.eclipse.tptp.platform.agentcontroller.config.TestJAXP > /dev/null 2>&1 >+if [ $? != 0 ]; then >+ echo 'ERROR: The Java Runtime in use does not contain a suitable JAXP feature' >+ echo 'RESOLUTION: Use a JRE which supports the JAXP feature' >+ exit 0 >+fi >+ >+# >+# Generate the configuration files >+# >+java -classpath ../lib/config.jar:../lib/config.nl1.jar:../lib/config.nl2.jar:../lib/config.nl2a.jar org.eclipse.tptp.platform.agentcontroller.config.SetConfig $* >+ >+# >+# Change the owner of ChkPass so that Agent Controller does not need root access for authenticating user passwords >+# >+RAC_SECURED=`grep -c '<Security ' ../config/serviceconfig.xml` >+AC_SECURED=`grep -c '<SecurityEnabled>true' ../config/serviceconfig.xml` >+SECURED=`expr $RAC_SECURED + $AC_SECURED` >+if [ $SECURED = "0" ]; then >+ echo >+else >+ echo >+ echo 'Agent Controller has been configured for security.' >+ echo 'Please enter root password to enable that security:' >+ su root -c "chown root ChkPass;chmod +s ChkPass" >+fi >Index: src-native-new/src/transport/transportSupport/TransportSupportNamedPipe_apple.c >=================================================================== >RCS file: src-native-new/src/transport/transportSupport/TransportSupportNamedPipe_apple.c >diff -N src-native-new/src/transport/transportSupport/TransportSupportNamedPipe_apple.c >--- /dev/null 1 Jan 1970 00:00:00 -0000 >+++ src-native-new/src/transport/transportSupport/TransportSupportNamedPipe_apple.c 1 Jan 1970 00:00:00 -0000 >@@ -0,0 +1,334 @@ >+/******************************************************************************* >+ * Copyright (c) 2005, 2007 Intel Corporation. >+ * All rights reserved. This program and the accompanying materials >+ * are made available under the terms of the Eclipse Public License v1.0 >+ * which accompanies this distribution, and is available at >+ * http://www.eclipse.org/legal/epl-v10.html >+ * >+ * Contributors: >+ * Hoang M Nguyen, Intel - Initial API and Implementation >+ * IBM - Portions of old RAC code (brought over by Hoang M Nguyen) >+ * >+ * $Id: TransportSupportNamedPipe_apple.c,v 1.1.2.1 2008/11/10 19:32:16 pklicnik Exp $ >+ * >+ *******************************************************************************/ >+ >+#ifdef __APPLE__ // Linux-specific >+ >+#include <stddef.h> >+#include <stdlib.h> >+#include <errno.h> >+#include <fcntl.h> >+#include <sys/stat.h> >+#include <sys/types.h> >+#include <dirent.h> >+ >+#include "tptp/TransportSupport.h" >+ >+#include "tptp/NoLog.h" >+ >+ >+ >+/** >+ ********************************************************* >+ * >+ * @brief >+ * read from the given named pipe >+ * >+ * @return >+ * The number of bytes that have been successfully read >+ * Negative - Error. >+ *********************************************************/ >+int readFromNamedPipe(HANDLE handle, >+ char *buffer, >+ int offset, >+ int length, >+ int *bytesRead) >+{ >+ ssize_t byte; >+ int result; >+ >+ while (1) { >+ byte = read(handle, buffer+offset, length-offset); >+ if(byte == 0) { >+ result = TPTP_PIPE_HAS_ENDED; >+ *bytesRead=0; >+ } >+ else if(byte < 0) { >+ if (errno == EINTR) continue; >+ >+ result = TPTP_UNABLE_TO_READ_FROM_NAMED_PIPE; >+ *bytesRead=0; >+ } >+ else { >+ result = 1; >+ *bytesRead = byte; >+ } >+ >+ break; >+ } >+ >+ return result; >+} >+ >+ >+ >+/** >+ ********************************************************* >+ * >+ * @brief >+ * write to the given named pipe with given data >+ * >+ * @return >+ * The number of bytes successfully written >+ * Negative - Error >+ *********************************************************/ >+ >+int writeToNamedPipe(HANDLE handle, >+ char *buffer, >+ int offset, >+ int length, >+ int *bytesWritten) { >+ int result; >+ ssize_t byte; >+ byte=write(handle, (unsigned char*)buffer+offset, length-offset); >+ if(byte==0) { >+ result=0; >+ *bytesWritten=0; >+ } >+ else if(byte<0) { >+ result=-1; >+ *bytesWritten=0; >+ } >+ else { >+ result=1; >+ *bytesWritten=byte; >+ } >+ return *bytesWritten; >+} >+ >+ >+/** >+ ********************************************************* >+ * >+ * @brief >+ * Clean up a given pipe >+ * >+ * @return >+ * 0 - Success >+ * nonzero - Error. >+ *********************************************************/ >+int cleanPipeUp(HANDLE *pPipeHandle) >+{ >+ if (*pPipeHandle >= 0) >+ { >+ close(*pPipeHandle); >+ *pPipeHandle = -1 ; >+ } >+ >+ return 0 ; >+} >+ >+ >+/** >+ ********************************************************* >+ * >+ * @brief >+ * Used by the creater of a named pipe to connect to a previously created named >+ * pipe for reading and waits for another application to open the pipe for writing. >+ * >+ * @note: This is a blocking call (i.e., the call will not return until someone else >+ * has opened the pipe for writing.) >+ * >+ * @note: the two parameters are needed for platform-independent support >+ * (handle to be used in Windows and the name of the pipe for Linux) >+ * >+ * @param handle - the handle returned from a successful call to >+ * ra_createNamedPipe() >+ * >+ * @param pPipeName - the full name of the pipe to connected to >+ * >+ * @return >+ * 0 - Success >+ * nonzero - Error. >+ * >+ *********************************************************/ >+int connectToNamedPipe(HANDLE *pHandle, const char *pPipeName) >+{ >+ int result = 0 ; >+ >+ /* Open the file */ >+ *pHandle = open(pPipeName, O_RDONLY); >+ >+ if(*pHandle < 0) >+ { >+ *pHandle = -1; >+ result = -1 ; >+ } >+ >+ return result; >+} >+ >+ >+ >+/** >+ ********************************************************* >+ * >+ * @brief >+ * Create the named pipe given its name >+ * >+ * @return >+ * the handle of the created pipe >+ * negative if error >+ *********************************************************/ >+HANDLE createGeneralNamedPipe(const char *pNameSpace, const char *pPipeName, int createOption, int bInheritHandle) >+{ >+ HANDLE result = (HANDLE) -1; >+ char pFullName[1024]; >+ >+ mode_t fcrtmask; /* 203936 */ >+ >+ /* Build the pipe name for the platform */ >+ strcpy(pFullName, pNameSpace); >+ strcat(pFullName, pPipeName); >+ >+ /* destroy it first if it existed */ >+ destroyNamedPipe(pFullName) ; >+ >+ /* Set the file creation mask so all permissions can be set */ >+ fcrtmask = umask(0000); >+ >+ /* Ensure the RA_PIPE_NAMESPACE directory exists and that everyone can access it */ >+ mkdir(pNameSpace, 0777); >+ >+ /* go create the pipe */ >+ result = mkfifo(pFullName, 0666) ; >+ >+ if(result) >+ { >+ errno = TPTP_UNABLE_TO_CREATE_NAMED_PIPE ; >+ result = INVALID_HANDLE_VALUE ; >+ } >+ else >+ { >+ /* Since mkfifo() may not return a valid file descriptor we will fill >+ in an initial value right now and the connectToNamedPipe() will >+ fill in the real descriptor. >+ */ >+ result = 0; >+ } >+ >+ /* reset the file creation mask back to what it was */ >+ umask(fcrtmask); >+ >+ return result; >+} >+ >+ >+ >+ >+/** >+ ********************************************************* >+ * >+ * @brief >+ * Opens a pipe with given option >+ * >+ * @return >+ * the handle of the open pipe >+ * negative if error >+ *********************************************************/ >+HANDLE openGeneralNamedPipe(const char *pNameSpace, const char *pPipeName, int openOption, int bInheritHandle) >+{ >+ HANDLE result; >+ char pFullName[1024]; >+ int old_flags; >+ BOOL retry = TRUE; >+ >+ int openMode = 0 ; >+ >+ if(pPipeName == NULL) >+ { >+ return (HANDLE) -1; >+ } >+ >+ /* Build the pipe name for the platform */ >+ sprintf(pFullName, "%s%s", pNameSpace, pPipeName) ; >+ >+ switch(openOption) >+ { >+ case TPTP_PIPE_READ_ONLY: openMode = O_RDONLY ; break ; >+ case TPTP_PIPE_WRITE_ONLY: openMode = O_WRONLY | O_NONBLOCK; break ; >+ /* NC here stands for non-critical. It is used by logging, which would rather fail than loop for long periods. */ >+ case TPTP_PIPE_NC_WRITE_ONLY: openMode = O_WRONLY | O_NONBLOCK; retry = FALSE; break ; >+ case TPTP_PIPE_DUPLEX: openMode = O_RDWR ; break ; >+ } >+ >+ /* Open the file */ >+ do >+ { >+ result=open(pFullName, openMode); >+ if(result < 0 ) >+ { >+ /* If errno is ENXIO, it means our partner at the other end >+ * of the pipe isn't listening. In that case we may want to >+ * retry. Otherwise, it's an unrecoverable failure. >+ * >+ * However, because the code to check for that caused a bug >+ * late in the release cycle, I backed out the check for this >+ * condition. We should add something that checks for >+ * if (errno == ENXIO) and only retry in that case when >+ * we have more time for testing. >+ */ >+ result = TPTP_NO_NAMED_PIPE_READER; >+ if ( retry ) >+ { >+ Sleep(1000); >+ } >+ } >+ else >+ { >+ /* unset the O_NONBLOCK flag */ >+ old_flags = fcntl(result, F_GETFL); >+ old_flags &= ~O_NONBLOCK; >+ fcntl(result, F_SETFL,old_flags); >+ } >+ } >+ while ( retry && (result < 0) ); >+ >+ return result; >+} >+ >+ >+/** >+ ********************************************************* >+ * >+ * @brief >+ * Called by the server pipe to disconnect from a pipe >+ * >+ * @note >+ * In Linux, disconnecting the named pipe is the same as closing it >+ * >+ *********************************************************/ >+int disconnectFromNamedPipe(HANDLE handle) >+{ >+ return ( cleanPipeUp(&handle) ); >+} >+ >+ >+/** >+ ********************************************************* >+ * >+ * @brief >+ * completely remove the named pipe from the system >+ * >+ * @return >+ * 0 - Success >+ * nonzero - Error. >+ *********************************************************/ >+int destroyNamedPipe(const char *pFullPipeName) >+{ >+ return ( unlink(pFullPipeName) ) ; >+} >+ >+ >+#endif // end-of-Linux-specific >Index: src-native-new/bin/ACRestart.sh >=================================================================== >RCS file: src-native-new/bin/ACRestart.sh >diff -N src-native-new/bin/ACRestart.sh >--- /dev/null 1 Jan 1970 00:00:00 -0000 >+++ src-native-new/bin/ACRestart.sh 1 Jan 1970 00:00:00 -0000 >@@ -0,0 +1,4 @@ >+#!/bin/sh >+./ACStop.sh >+sleep 5 >+./ACStart.sh >Index: src-native-new/src/transport/transportSupport/TransportOSCalls_apple.c >=================================================================== >RCS file: src-native-new/src/transport/transportSupport/TransportOSCalls_apple.c >diff -N src-native-new/src/transport/transportSupport/TransportOSCalls_apple.c >--- /dev/null 1 Jan 1970 00:00:00 -0000 >+++ src-native-new/src/transport/transportSupport/TransportOSCalls_apple.c 1 Jan 1970 00:00:00 -0000 >@@ -0,0 +1,248 @@ >+/******************************************************************************* >+ * Copyright (c) 2005, 2008 Intel Corporation and others. >+ * All rights reserved. This program and the accompanying materials >+ * are made available under the terms of the Eclipse Public License v1.0 >+ * which accompanies this distribution, and is available at >+ * http://www.eclipse.org/legal/epl-v10.html >+ * >+ * Contributors: >+ * Hoang M Nguyen, Intel - Initial API and Implementation >+ * >+ * $Id: TransportOSCalls_apple.c,v 1.1.2.1 2008/11/10 19:32:16 pklicnik Exp $ >+ * >+ *******************************************************************************/ >+ >+#ifdef __APPLE__ // Linux-specific >+ >+#include <sys/socket.h> >+#include <netinet/in.h> >+#include <arpa/inet.h> >+#include "tptp/TransportSupport.h" >+ >+ >+ >+/** >+ ********************************************************* >+ * >+ * @brief >+ * required initialization before using socket library. >+ * This also checks for socket DLL version. >+ * >+ * @note >+ * For linux, we don't have to initialize. No-op. >+ * >+ * @return >+ * 0 - Success >+ * nonzero - Error. >+ *********************************************************/ >+int initForSocketCalls() >+{ >+ return ( 0 ); >+} >+ >+ >+/** >+ ********************************************************* >+ * >+ * @brief >+ * set a given handle for child process inheritance >+ * >+ * @note >+ * for linux, this is not needed. No-op. >+ * >+ * @return >+ * 0 - Error >+ * nonzero - Success >+ *********************************************************/ >+int setHandleInherited(HANDLE handle) >+{ >+ return ( 1 ) ; >+} >+ >+ >+/** >+ ********************************************************* >+ * >+ * @brief >+ * return indicator whether a given socket is valid or not >+ * >+ * @return >+ * nonzero - Valid >+ * zero - Invalid >+ *********************************************************/ >+int isSocketValid(SOCKET sock) >+{ >+ return (sock >= 0) ; >+} >+ >+ >+/** >+ ********************************************************* >+ * >+ * @brief >+ * print out info about a given socket request >+ * >+ * @return >+ * 0 - always >+ * IPV4-ONLY >+ *********************************************************/ >+int printSocketRequest(SOCKET sock, struct sockaddr_in *pRequester) >+{ >+ printf("Incoming connection request on socket %d from 0x%x \n", >+ sock, >+ (pRequester->sin_addr.s_addr)) ; >+ return 0 ; >+ >+} >+ >+ >+ >+/** >+ ********************************************************* >+ * >+ * @brief >+ * Read from a given sock and place the incoming data >+ * into the given buffer >+ * >+ * @return >+ * negative - Error in receiving >+ * zero - Socket has been closed >+ * positive - Successfully read. The number of bytes received. >+ *********************************************************/ >+int readFromSocket(SOCKET sock, >+ char *buffer, >+ int bufferLength, >+ int *pBytesRead) >+{ >+ int result = 0 ; >+ BOOL tryAgain = FALSE ; >+ >+ do >+ { >+ result = read(sock, buffer, bufferLength); >+ >+ if (result >= 0) >+ { >+ *pBytesRead = result ; >+ /* terminate with a NULL byte for printf purpose */ >+ *(buffer+result) = '\0' ; >+ } >+ else if (errno == EINTR) >+ { >+ /* if we were interrupted by a signal, try again */ >+ tryAgain = TRUE ; >+ } >+ } while (tryAgain == TRUE) ; >+ >+ return ( result ) ; >+} >+ >+ >+/** >+ ********************************************************* >+ * >+ * @brief >+ * close the given socket connection >+ * >+ * @return >+ * 0 - Success >+ * nonzero - Error. >+ *********************************************************/ >+int closeThisSocket(SOCKET sock) >+{ >+ int rc = 0 ; >+ >+ shutdown(sock, 2); >+ rc = close(sock); >+ >+ return ( rc ) ; >+} >+ >+/** >+ ********************************************************* >+ * >+ * @brief >+ * convert the given IP address string from "II.JJ.KK.LL" >+ * format to a four byte data array containting >+ * [II][JJ][KK][LL] as unsigned characters >+ * >+ * @return >+ * 0 success >+ * non-zero failure >+ *********************************************************/ >+int convertIPAddressStringToArrayIPv4M( char *addrStr, unsigned char* addrArray ) >+{ >+ struct in_addr addr; >+ int rc; >+ unsigned long tmpAddr; >+ >+ >+ rc = inet_aton( addrStr, &addr ); >+ if ( rc == 0 ) >+ { >+ /* The string wasn't recognized as a valid IP address */ >+ return -1; >+ } >+ tmpAddr = htonl(addr.s_addr); /* Translate the address to network byte order */ >+ >+ addrArray[0]=(unsigned char)(tmpAddr>>24 & 0x000000ff); >+ addrArray[1]=(unsigned char)(tmpAddr>>16 & 0x000000ff); >+ addrArray[2]=(unsigned char)(tmpAddr>>8 & 0x000000ff); >+ addrArray[3]=(unsigned char)(tmpAddr); >+ >+ return 0; >+} >+ >+/** >+ ********************************************************* >+ * >+ * @brief >+ * convert the given IP address unsigned long value >+ * to "II.JJ.KK.LL" format. The string returned will >+ * have been allocated using tptp_malloc and should >+ * be freed by the caller using tptp_free >+ * >+ * @return >+ * 0 success >+ * non-zero failure >+ *********************************************************/ >+int convertIPAddressUlongToStringIPv4M( unsigned long addr, char **addrStr ) >+{ >+ char* tempAddrStr; >+ struct in_addr saddr; >+ >+ saddr.s_addr = ntohl( addr ); >+ tempAddrStr = inet_ntoa( saddr ); >+ if ( tempAddrStr == NULL ) >+ { >+ /* addr wasn't recognized as a valid IP address */ >+ return -1; >+ } >+ >+ /* The size here (16) is three digits for each element, plus three dots, plus a NULL */ >+ *addrStr = tptp_malloc( 16 ); >+ if ( *addrStr == NULL ) >+ { >+ return TPTP_SYS_NO_MEM; >+ } >+ >+ strcpy( *addrStr, tempAddrStr ); >+ >+ return 0; >+} >+ >+/** IPV4-ONLY */ >+void extractAddressFromSockAddr(struct sockaddr_in *connection, unsigned char *address) >+{ >+ unsigned long tmpAddr; >+ >+ tmpAddr = htonl(connection->sin_addr.s_addr); /* Translate the address to network byte order */ >+ >+ address[0]=(unsigned char)(tmpAddr>>24 & 0x000000ff); >+ address[1]=(unsigned char)(tmpAddr>>16 & 0x000000ff); >+ address[2]=(unsigned char)(tmpAddr>>8 & 0x000000ff); >+ address[3]=(unsigned char)(tmpAddr); >+} >+ >+ >+#endif // end-of-Linux-specific >Index: src-native-new/bin/kill_script.sh >=================================================================== >RCS file: src-native-new/bin/kill_script.sh >diff -N src-native-new/bin/kill_script.sh >--- /dev/null 1 Jan 1970 00:00:00 -0000 >+++ src-native-new/bin/kill_script.sh 1 Jan 1970 00:00:00 -0000 >@@ -0,0 +1,6 @@ >+#!/bin/sh >+ >+PROCESSCONTROLLER_PID=`ps -ef | grep tptpProcessController | grep -v "grep" | cut -f6 -d " "` >+kill -9 $PROCESSCONTROLLER_PID >+ACSERVER_PID=`ps -ef | grep ACServer | grep -v "grep" | cut -f6 -d " "` >+kill -9 $ACSERVER_PID >Index: src-native-new/src/shared/TPTPUtil/TPTPOSCalls_apple.c >=================================================================== >RCS file: src-native-new/src/shared/TPTPUtil/TPTPOSCalls_apple.c >diff -N src-native-new/src/shared/TPTPUtil/TPTPOSCalls_apple.c >--- /dev/null 1 Jan 1970 00:00:00 -0000 >+++ src-native-new/src/shared/TPTPUtil/TPTPOSCalls_apple.c 1 Jan 1970 00:00:00 -0000 >@@ -0,0 +1,271 @@ >+/******************************************************************************* >+ * Copyright (c) 2005, 2007 Intel Corporation. >+ * All rights reserved. This program and the accompanying materials >+ * are made available under the terms of the Eclipse Public License v1.0 >+ * which accompanies this distribution, and is available at >+ * http://www.eclipse.org/legal/epl-v10.html >+ * >+ * Contributors: >+ * Hoang M Nguyen, Intel - TPTP OS Calls Linux specific Implementation >+ * $Id: TPTPOSCalls_apple.c,v 1.1.2.1 2008/11/10 19:32:16 pklicnik Exp $ >+ *******************************************************************************/ >+ >+ >+#ifdef __APPLE__ // Linux-specific >+ >+ >+#include <stdio.h> >+ >+#include "TPTPOSCalls.h" >+#include <string.h> >+ >+ >+#include <uuid/uuid.h> >+#include <dlfcn.h> >+ >+ >+const char OS_SPECIFIC_NAME_SEPARATOR = '/' ; >+ >+ >+ >+/** >+ ********************************************************* >+ * >+ * @brief >+ * Return a global unique id string (GUID or UUID) >+ * >+ * @note >+ * This requires to compile with "libuuid.so" library >+ * or "-luuid" option. >+ * >+ *********************************************************/ >+ >+char * getGlobalUniqueId() >+{ >+ char * pTokenStr = NULL ; >+ >+ unsigned char token[16] ; >+ >+ char buffer[37] ; >+ >+ uuid_generate(token) ; >+ >+ uuid_unparse(token, buffer) ; >+ >+ pTokenStr = strdup(buffer) ; >+ >+ return ( pTokenStr ) ; >+} >+ >+/** >+ ********************************************************* >+ * >+ * @brief >+ * convenient way to compare string ignoring case >+ * and is still platform independent. >+ * >+ *********************************************************/ >+ >+int compareIgnoreCase(const char *pStr1, const char *pStr2) >+{ >+ return ( strcasecmp(pStr1, pStr2) ) ; >+} >+ >+ >+ >+/** >+ ********************************************************* >+ * >+ * @brief >+ * load the given module >+ * >+ *********************************************************/ >+ >+void * loadTheModule(const char *pLibName) >+{ >+ char buffer[1024] ; >+ >+ strcpy(buffer, "lib") ; >+ strcat(buffer, pLibName) ; >+ strcat(buffer, ".so") ; >+ >+ return ( dlopen( buffer, RTLD_LAZY ) ); >+} >+ >+ >+/** >+ ********************************************************* >+ * >+ * @brief >+ * Start a new running thread and execute the given function >+ * in that running thread. >+ * >+ * @return >+ * 0 - Success >+ * Nonzero - Error >+ * >+ *********************************************************/ >+ >+int startNewThread(RUN_FUNC_TYPE pFunc, void * pParmBlock, TID *pThreadId, HANDLE *pThreadHandle) >+{ >+ int rc = 0 ; >+ >+ rc = pthread_create(pThreadId, NULL, pFunc, pParmBlock); >+ /* Clear pThreadHandle as it is only used for Windows version of this function. */ >+ *pThreadHandle = 0; /* Use 0 rather than NULL to stop compiler warning. */ >+ >+ if (rc != 0) >+ rc = 1 ; >+ >+ return ( rc ) ; >+} >+ >+ >+/** >+ ********************************************************* >+ * >+ * @brief >+ * Indicate that thread resources can be reclaimed when the thread terminates. >+ * >+ * @return >+ * 0 - Success >+ * Nonzero - Error >+ * >+ *********************************************************/ >+ >+int detachThread(TID threadId, HANDLE threadHandle) >+{ >+ return pthread_detach (threadId); >+} >+ >+/** >+ ********************************************************* >+ * >+ * @brief >+ * Start a new running thread, execute the given function >+ * in that running thread, detach from the thread. >+ * >+ * @return >+ * 0 - Success >+ * Nonzero - Error >+ * >+ *********************************************************/ >+ >+int tptpStartThread(RUN_FUNC_TYPE pFunc, void * pParamBlock, TID *pThreadId, HANDLE *pThreadHandle) >+{ >+ int rc = startNewThread (pFunc, pParamBlock, pThreadId, pThreadHandle); >+ >+ if (!rc) detachThread (*pThreadId, *pThreadHandle); >+ >+ return ( rc ) ; >+} >+ >+ >+/** >+ ********************************************************* >+ * >+ * @brief >+ * Return the process id of the current running process >+ * >+ *********************************************************/ >+ >+PID getCurrentlyRunningProcessId() >+{ >+ return ( getpid() ) ; >+} >+ >+/** >+ ********************************************************* >+ * >+ * @brief >+ * Return the executable name of the current running process. >+ * Caller must free the allocated memory for the name string returned. >+ * >+ *********************************************************/ >+ >+char *getExecutableName() >+{ >+ char *exeName = NULL; >+ char procFileName[128]; >+ char cmdLine[_MAX_PATH]; >+ FILE *hFile = NULL; >+ int num = 0; >+ >+ /* Get the name of the executable for this process from the /proc >+ * file structure. The file /proc/<pid>/cmdline contains the cmdline >+ * arguments as null terminated strings. So reading the first element >+ * of that file gives us the executable name (i.e., argv[0]). >+ */ >+ sprintf(procFileName, "/proc/%d/cmdline",getpid()); >+ hFile = fopen(procFileName,"r"); >+ if (hFile) >+ { >+ num = fread(cmdLine, _MAX_PATH, 1, hFile); >+ if (!ferror(hFile)) >+ { >+ /*Make sure a null is at the end of whatever we read*/ >+ cmdLine[_MAX_PATH-1] = '\0'; >+ exeName = (char *)tptp_malloc(strlen(cmdLine) +1); >+ strcpy(exeName, cmdLine); >+ return exeName; >+ } >+ } >+ >+ /* if error occurred trying to get the name, just return 'unknown' */ >+ exeName = (char *)tptp_malloc(strlen("unknown") +1); >+ strcpy(exeName, "unknown"); >+ return exeName; >+} >+ >+/** >+ ********************************************************* >+ * >+ * @brief >+ * Return the process id of the current running process >+ * >+ *********************************************************/ >+ >+PID getCurrentlyRunningThreadId() >+{ >+ /* On Linux the Process ID is the thread ID */ >+ return ( getpid() ) ; >+} >+ >+/** >+ ********************************************************* >+ * >+ * @brief >+ * Print out the current system error message >+ * >+ *********************************************************/ >+void printCurrentSysError() >+{ >+ printf("errno(%d) error_message(%s) \n", errno, strerror(errno)); >+} >+ >+ >+/** >+ ********************************************************* >+ * >+ * @brief >+ * Put the current thread in sleep mode >+ * for a given amount of time (in milliseconds) >+ * >+ *********************************************************/ >+void tptpSleep(int milliseconds) >+{ >+ long seconds = milliseconds / 1000; >+ long remainder_in_micro_seconds = (milliseconds % 1000) * 1000; >+ >+ if (seconds != 0) >+ sleep(seconds); >+ >+ if (remainder_in_micro_seconds != 0) >+ usleep(remainder_in_micro_seconds); >+} >+ >+ >+#endif // end-of-Linux-specific >+ >+ >+
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Raw
Actions:
View
Attachments on
bug 68111
:
55369
|
56192
|
87834
|
97731
| 117488 |
117489
|
136113
|
136140