Fixed the Python ctypes interface by moving several MPWide functions into extern "C" blocks. Swig code content is now obsolete and should be removed soon.

Author: djgroen

MPWide.cpp

@@ -111,9 +111,12 @@ struct init_tmp {
   static double pacing_rate = 100*1024*1024; //Pacing rate per stream. This is the maximum throughput in bytes/sec possible for each stream.
   static useconds_t pacing_sleeptime = useconds_t(1000000/(pacing_rate/(1.0*tcpbuf_ssize))); //Sleep time for SendRecvs in microseconds.
 
+
+extern "C" {
   double MPW_getPacingRate() {
     return pacing_rate;
   }
+
   void MPW_setPacingRate(double rate) {
     if(rate == -1) {
       pacing_rate = -1;
@@ -125,6 +128,7 @@ struct init_tmp {
       LOG_INFO("Pacing enabled, rate = " << pacing_rate << " => delay = " << pacing_sleeptime << " us.");
     }
   }
+}
 
   /* autotunePacingRate selects an appropriate pacing rate depending on the number of streams selected. */
   static void autotunePacingRate()
@@ -540,6 +544,14 @@ int MPW_CreatePath(std::string host, int server_side_base_port, int streams_in_p
   return path_id;
 }
 
+extern "C" {
+int MPW_CreatePath_c (char* host, int server_side_base_port, int streams_in_path) {
+    return MPW_CreatePath(host, server_side_base_port, streams_in_path);
+  }
+}
+
+
+
 /* Remove a stream from a path. */
 void EraseStream(int stream) {
   delete client[stream];
@@ -597,21 +609,25 @@ int MPW_DestroyPath(int path) {
   return 0;
 }
 
-/* Path-based Send and Recv operations*/
-int MPW_DSendRecv(char* sendbuf, long long int sendsize, char* recvbuf, long long int maxrecvsize, int path) {
-  return MPW_DSendRecv(sendbuf, sendsize, recvbuf, maxrecvsize, paths[path]->streams, paths[path]->num_streams);
-}
+extern "C" {
 
-int MPW_SendRecv(char* sendbuf, long long int sendsize, char* recvbuf, long long int recvsize, int path) {
-  return MPW_SendRecv(sendbuf, sendsize, recvbuf, recvsize,  paths[path]->streams, paths[path]->num_streams);
-}
+  /* Path-based Send and Recv operations*/
+  int MPW_DSendRecv(char* sendbuf, long long int sendsize, char* recvbuf, long long int maxrecvsize, int path) {
+    return MPW_DSendRecv(sendbuf, sendsize, recvbuf, maxrecvsize, paths[path]->streams, paths[path]->num_streams);
+  }
 
-int MPW_Send(char* sendbuf, long long int sendsize, int path) {
-  return MPW_SendRecv(sendbuf, sendsize, NULL, 0, paths[path]->streams, paths[path]->num_streams);
-}
+  int MPW_SendRecv(char* sendbuf, long long int sendsize, char* recvbuf, long long int recvsize, int path) {
+    return MPW_SendRecv(sendbuf, sendsize, recvbuf, recvsize,  paths[path]->streams, paths[path]->num_streams);
+  }
+
+  int MPW_Send(char* sendbuf, long long int sendsize, int path) {
+    return MPW_SendRecv(sendbuf, sendsize, NULL, 0, paths[path]->streams, paths[path]->num_streams);
+  }
+
+  int MPW_Recv(char* recvbuf, long long int recvsize, int path) {
+    return MPW_SendRecv(NULL, 0, recvbuf, recvsize,  paths[path]->streams, paths[path]->num_streams);
+  }
 
-int MPW_Recv(char* recvbuf, long long int recvsize, int path) {
-  return MPW_SendRecv(NULL, 0, recvbuf, recvsize,  paths[path]->streams, paths[path]->num_streams);
 }
 
 

MPWide.h

@@ -44,12 +44,14 @@ int MPW_CreatePath(std::string host, int server_side_base_port, int num_streams)
 // Return 0 on success (negative on failure).
 int MPW_DestroyPath(int path);
 
-int MPW_Send(char* sendbuf, long long int sendsize, int path);
-int MPW_Recv(char* recvbuf, long long int recvsize, int path);
-int MPW_SendRecv(char* sendbuf, long long int sendsize, char* recvbuf, long long int recvsize, int path);
-// returns the size of the newly received data. 
-int MPW_DSendRecv(char* sendbuf, long long int sendsize, char* recvbuf, long long int maxrecvsize, int path);
 
+extern "C" {
+  int MPW_Send(char* sendbuf, long long int sendsize, int path);
+  int MPW_Recv(char* recvbuf, long long int recvsize, int path);
+  int MPW_SendRecv(char* sendbuf, long long int sendsize, char* recvbuf, long long int recvsize, int path);
+  // returns the size of the newly received data. 
+  int MPW_DSendRecv(char* sendbuf, long long int sendsize, char* recvbuf, long long int maxrecvsize, int path);
+}
 
 /* Initialize MPWide. */
 int MPW_Init(std::string* url, int* server_side_ports, int* client_side_ports, int num_channels);
@@ -106,11 +108,15 @@ void MPW_Wait(int NBE_id);
 
 #if MPW_PacingMode == 1
 /* Get and set rates for pacing data. */
-double MPW_getPacingRate();
-void   MPW_setPacingRate(double rate);
+extern "C" {
+  double MPW_getPacingRate();
+  void   MPW_setPacingRate(double rate);
+}
 #endif
 
 extern "C" {
+  int MPW_CreatePath_c (char* host, int server_side_base_port, int streams_in_path);
+
   int MPW_Init_c (char** url, int* ports, int numsockets); 
   int MPW_Init1_c (char* url, int port);
   void MPW_SendRecv1_c (char* sendbuf, long long int sendsize, char* recvbuf, long long int recvsize, int base_channel);

python/MPWTest.py

@@ -43,7 +43,7 @@
 if len(sys.argv)>5:
     winsize = int(sys.argv[5])
 
-path_id = MPWide.MPW_CreatePath(host,16256,size);
+path_id = MPWide.MPW_CreatePath_c(host,16256,size);
 
 msglen = bufsize*1024 
 

python/README

@@ -1 +1,11 @@
-run `sh compile.sh` to regenerate the Python interface code.
+The Python interface now relies on the Python ctypes module. Compilation is no longer necessary (we dropped swig), and many of the other files here now are redundant (they may be taken out soon).
+
+To test it just run on the server machine:
+
+python MPWTest.py 0
+
+and on the client machine:
+
+python MPWTest.py <ip address or hostname of the server>
+
+Make sure the firewall is properly open though :).