ccs communication working

Author: ritvikrao

charm4py/charm.py

@@ -153,6 +153,9 @@ def __init__(self):
         # TODO: maybe implement this buffer in c++
         self.future_get_buffer = {}
 
+        #registered methods for ccs
+        self.ccs_methods = {}
+
     def __init_profiling__(self):
         # these are attributes used only in profiling mode
         # list of Chare types that are registered and used internally by the runtime
@@ -1094,14 +1097,21 @@ def LBTurnInstrumentOff(self):
 
     #functions for ccs 
     def CcsRegisterHandler(self, handlername, handler):
+        self.ccs_methods[handlername] = handler
         self.lib.CcsRegisterHandler(handlername, handler)
 
     def CcsIsRemoteRequest(self):
-        self.lib.CcsIsRemoteRequest()
+        self.lib.isRemoteRequest()
 
     def CcsSendReply(self, message):
         self.lib.CcsSendReply(message)
 
+    def callHandler(self, handlername, data):
+        if handlername in self.ccs_methods:
+            self.ccs_methods[handlername](data)
+        else:
+            raise Charm4PyError('Handler ' + handlername + ' not registered')
+
 
 
 class CharmRemote(Chare):

charm4py/charmlib/charmlib_cython.pyx

@@ -316,44 +316,27 @@ cdef object times = [0.0] * 3 # track time in [charm reduction callbacks, custom
 cdef bytes localMsg = b'L:' + (b' ' * sizeof(int))
 cdef char* localMsg_ptr = <char*>localMsg
 
-#cdef const int CmiReservedHeaderSize = getCmiReservedHeaderSize()
+#cdef const int CmiReservedHeaderSize s= getCmiReservedHeaderSize()
 
 cdef struct remoteMsg:
-  char[CmiReservedHeaderSize] reservedHeader
-  #char[32] reservedHeader
-  CcsImplHeader header
-  void* data
-
-cdef void recvRemoteMessage(void *msg):
-
-    cdef void *shiftedMsg = msg + CmiReservedHeaderSize
-    cdef remoteMsg *incomingMsgPtr = <remoteMsg*> shiftedMsg
-    cdef remoteMsg incomingMsg = dereference(incomingMsgPtr)
-    cdef char *handler_name = incomingMsg.header.handler
-
-    cdef object handler 
-    cdef bytes payload 
-    # call correct handler
-
-    cdef int payload_length = (<unsigned char *>incomingMsg.header.len.data)[0] | \
-                          (<unsigned char *>incomingMsg.header.len.data)[1] << 8 | \
-                          (<unsigned char *>incomingMsg.header.len.data)[2] << 16 | \
-                          (<unsigned char *>incomingMsg.header.len.data)[3] << 24
-    if payload_length <= 0:
-      print("Error: Payload Length is <= 0")
-      return 
-    
-    payload = bytes(<char*>incomingMsg.data, payload_length)
+  int a
+  int b
+  char handler_name[32] # we know it can't be longer
+  char data[1024] #assume generous length at end
+
+cdef void recvRemoteMessage(void *msg) noexcept:
 
+    cdef void *shiftedMsg = msg + CmiReservedHeaderSize #move past reserved header
+    cdef remoteMsg* incomingMsgPtr = <remoteMsg*> shiftedMsg
+    cdef int handler_length = incomingMsgPtr.a
+    cdef int data_length = incomingMsgPtr.b
 
-    python_handlername = handler_name.decode('utf-8')
-    handler_func = _ccs_handlers.get(python_handlername)
-    if handler_func is None:
-      print(f"Error: Could not find handler assocaited with name : {python_handlername}")
-      return 
+    # turn char arrays into strings
+
+    handler_name = incomingMsgPtr.handler_name[:handler_length].decode('utf-8')
+    data = incomingMsgPtr.data[:data_length].decode('utf-8')
 
-    handler_func(payload)
-    return 
+    charm.callHandler(handler_name, data)
 
 
 class CharmLib(object):
@@ -872,14 +855,12 @@ class CharmLib(object):
   def CcsRegisterHandler(self, str handlername, object handler):
     cdef bytes handler_bytes = handlername.encode("utf-8")
     cdef const char* c_handlername = handler_bytes
-
-    _ccs_handlers[handlername] = handler 
     CcsRegisterHandlerExt(c_handlername, <void *>recvRemoteMessage)
 
   def isRemoteRequest(self):
     return bool(CcsIsRemoteRequest())
 
-  def CcsSendReply(str message):
+  def CcsSendReply(self, str message):
     cdef bytes message_bytes = message.encode("utf-8")
     cdef const char* replyData = message_bytes
 

examples/ccs/ccs_server.py

@@ -1,25 +1,24 @@
 from charm4py import charm, Chare, Array, Future, Reducer, Group
 
+def handler(msg):
+    print("CCS Ping handler called on " + str(charm.myPe()))
+    answer = "Hello to sender " + str(msg) + "from PE " + str(charm.myPe())
+    # send the answer back to the client
+    charm.CcsSendReply(answer)
+
 class RegisterPerChare(Chare):
 
-    def register(self, return_future):
+    def register(self, return_future, handler):
         charm.CcsRegisterHandler("ping2", handler)
         charm.CcsRegisterHandler("ping", handler)
         self.reduce(return_future, Reducer.nop)
 
-def handler(msg):
-    if charm.CcsIsRemoteRequest():
-        answer = "Hello to sender " + msg.payload + "from PE " + str(charm.myPe())
-        # send the answer back to the client
-        print("CCS Ping handler called on " + str(charm.myPe()))
-        charm.CcsSendReply(answer)
-
 def main(args):
     # No need to initialize converse, because charm.start does this
     # just register the handler
     reg_wait = Future()
     registers = Group(RegisterPerChare)
-    registers.register(reg_wait)
+    registers.register(reg_wait, handler)
     reg_wait.get()
     print("CCS Handlers registered . Waiting for net requests...")