Fix build of PythonCCS

Author: evan-charmworks

doc/converse/manual.rst

@@ -2135,7 +2135,7 @@ CCS: Client-Side
 A CCS client connects to a CCS server, asks a server PE to execute a
 pre-registered handler, and receives the response data. The CCS client
 may be written in any language (see CCS network protocol, below), but a
-C interface (files “ccs-client.c” and “ccs-client.h”) and Java interface
+C interface (files "ccs-client.C" and "ccs-client.h") and Java interface
 (file “CcsServer.java”) are available in the charm include directory.
 
 The C routines use the skt_abort error-reporting strategy; see

src/ck-core/debug-charm.C

@@ -27,14 +27,12 @@
 //#include "queueing.h"
 #include <unistd.h>
 
-
+#include "ck.h"
+CkpvDeclare(DebugEntryTable, _debugEntryTable);
 
 #if CMK_CHARMDEBUG && CMK_CCS_AVAILABLE && !defined(_WIN32)
 
-#include "ck.h"
-
 CkpvDeclare(int, skipBreakpoint); /* This is a counter of how many breakpoints we should skip */
-CkpvDeclare(DebugEntryTable, _debugEntryTable);
 CpdPersistentChecker persistentCheckerUselessClass;
 
 void resetAllCRC();

src/conv-ccs/ccs-client.h

@@ -5,6 +5,7 @@
 #ifndef __CCS_CLIENT_H_
 #define __CCS_CLIENT_H_
 
+#define CMK_NOT_USE_CONVERSE 1
 #include "sockRoutines.h"
 #include "ccs-auth.h"
 

src/conv-core/CMakeLists.txt

@@ -1,6 +1,7 @@
 
 add_library(ccs-client ../conv-ccs/ccs-client.C ../conv-ccs/ccs-client.h)
 target_include_directories(ccs-client PRIVATE ../util)
+configure_file(../conv-ccs/ccs-client.h ${CMAKE_BINARY_DIR}/include/ COPYONLY)
 
 add_library(memory-default memory.C)
 target_compile_definitions(memory-default PRIVATE -DCMK_MEMORY_BUILD_DEFAULT)

src/libs/ck-libs/pythonCCS/Makefile

@@ -1,4 +1,4 @@
-CDIR=../../../..
+include ../common.mk
 -include $(CDIR)/include/conv-mach-opt.mak
 OPTS=-g -Wall
 CHARMC=$(CDIR)/bin/charmc $(OPTS)
@@ -33,7 +33,7 @@ PythonCCS.o: PythonCCS.C $(HEADDEP)
 	$(CHARMC) -c $(FLAGS) PythonCCS.C
 
 PythonCCS-client.o: PythonCCS-client.C $(HEADDEP)
-	$(CHARMC) -c $(FLAGS) PythonCCS-client.C
+	$(CHARMC) -seq -c $(FLAGS) PythonCCS-client.C
 
 PythonCCS.decl.h PythonCCS.def.h: PythonCCS.ci
 	$(CHARMXI) PythonCCS.ci

src/libs/ck-libs/pythonCCS/PythonCCS-client.h

@@ -14,12 +14,14 @@
    PythonIterator needs to be coherent across client and server.
 */
 
-#include "converse.h"
+#include <stdint.h>
 #include <stdlib.h>
 #include <string.h>
 #include <stdio.h>
 #include <netinet/in.h>
 
+typedef uint32_t CmiUInt4;
+
 /* This class is empty, and should be reimplemented by the user */
 class PythonIterator {
   /* _It is strongly suggested to avoid pointers_, in which case none of the

src/scripts/configure.ac

@@ -2684,7 +2684,7 @@ fi
 fi
 
 #### test if Python headers are installed ####
-PYTHON_VERSION=`python -V 2>&1 | awk {'print $2'} | awk -F. {'print $1"."$2'}`
+PYTHON_VERSION=`python2 -V 2>&1 | awk {'print $2'} | awk -F. {'print $1"."$2'}`
 cat > $t <<EOT
 #include "python${PYTHON_VERSION}/Python.h"
 #include "python${PYTHON_VERSION}/compile.h"

tests/charm++/python/Makefile

@@ -1,8 +1,9 @@
 -include ../../common.mk
 CHARMDIR = ../../..
+-include $(CHARMDIR)/include/conv-mach-opt.mak
 CHARMC = $(CHARMDIR)/bin/charmc $(OPTS)
 INCL = -I/usr/include/python/
-LIBS = -lpthread -lutil -ldl -lm -lpython2.5
+LIBS = -lpthread -lutil -ldl -lm -lpython$(CMK_BUILD_PYTHON)
 INCLC = -I$(CHARMDIR)/include/
 MODULES = -module PythonCCS -module charmdebug_python
 PYMODULE = $(CHARMDIR)/lib/libmodulePythonCCS.a
@@ -19,7 +20,7 @@ server.decl.h: server.ci $(PYMODULE) $(CHARMDIR)/bin/charmxi
 	$(CHARMC) $<
 
 client: client.C
-	g++ $(INCLC) $(OPTS) -o $@ $^ $(PYMODULE)
+	$(CHARMC) -seq $(INCLC) $(OPTS) -o $@ $^ $(PYMODULE) -lccs-client
 
 clean:
 	rm -f *.decl.h *.def.h *.o server client charmrun *~

tests/charm++/python/client.C

@@ -1,6 +1,5 @@
 #include <stdlib.h>
 #include "ccs-client.h"
-#include "ccs-client.c"
 #include "PythonCCS-client.h"
 #include <string.h>
 #include <string>
@@ -60,12 +59,15 @@ int main (int argc, char** argv) {
 
   if (useGroups > 0) {
     MyIterator *myIter = new MyIterator(htonl(4));
-    printf("size: %d (%d)\n",myIter->size(),sizeof(*myIter));
-    wrapper = new PythonExecute((char*)code.c_str(), "metodo", myIter);
-    pythonString = "CpdPythonGroup";
+    printf("size: %d (%zu)\n",myIter->size(),sizeof(*myIter));
+    static char s_metodo[] = "metodo";
+    wrapper = new PythonExecute(const_cast<char*>(code.c_str()), s_metodo, myIter);
+    static char s_CpdPythonGroup[] = "CpdPythonGroup";
+    pythonString = s_CpdPythonGroup;
   } else {
-    wrapper = new PythonExecute((char*)code.c_str());
-    pythonString = "pyCode";
+    wrapper = new PythonExecute(const_cast<char*>(code.c_str()));
+    static char s_pyCode[] = "pyCode";
+    pythonString = s_pyCode;
   }
 
   wrapper->setHighLevel(true);

tests/charm++/python/server.C

@@ -72,7 +72,7 @@ MyArray::MyArray () {mynumber = thisIndex+1000;}
 
 MyArray::MyArray (CkMigrateMessage *msg) {}
 
-void MyArray::run(CkCallback &cb) {
+void MyArray::run(const CkCallback &cb) {
 //  CkPrintf("[%d] in run %d\n",thisIndex,mynumber);
    double _startTime = CmiWallTimer();