Skip to content

Commit ac99b9b

Browse files
committed
variable renaming
1 parent 84605e1 commit ac99b9b

File tree

2 files changed

+7
-4
lines changed

2 files changed

+7
-4
lines changed

charm4py/charmlib/charmlib_cython.pyx

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -319,17 +319,17 @@ cdef char* localMsg_ptr = <char*>localMsg
319319
#cdef const int CmiReservedHeaderSize s= getCmiReservedHeaderSize()
320320

321321
cdef struct remoteMsg:
322-
int a
323-
int b
322+
int header_length
323+
int data_length
324324
char handler_name[32] # we know it can't be longer
325325
char data[1024] #assume generous length at end
326326

327327
cdef void recvRemoteMessage(void *msg) noexcept:
328328

329329
cdef void *shiftedMsg = msg + CmiReservedHeaderSize #move past reserved header
330330
cdef remoteMsg* incomingMsgPtr = <remoteMsg*> shiftedMsg
331-
cdef int handler_length = incomingMsgPtr.a
332-
cdef int data_length = incomingMsgPtr.b
331+
cdef int handler_length = incomingMsgPtr.header_length
332+
cdef int data_length = incomingMsgPtr.data_length
333333

334334
# turn char arrays into strings
335335

setup.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -263,9 +263,11 @@ class _renameInstalled(_install_lib):
263263
def __init__(self, *args, **kwargs):
264264
_install_lib.__init__(self, *args, **kwargs)
265265

266+
266267
def install(self):
267268
log.info("Renaming libraries")
268269
outfiles = _install_lib.install(self)
270+
'''
269271
for file in outfiles:
270272
if "c_object_store" in file and system == "darwin":
271273
direc = os.path.dirname(file)
@@ -285,6 +287,7 @@ def install(self):
285287
install_name_command += "/charmlib_cython.*.so"
286288
log.info(install_name_command)
287289
os.system(install_name_command)
290+
'''
288291
return outfiles
289292

290293

0 commit comments

Comments
 (0)