cpp/libzmq
1
0
Fork 0
mirror of https://github.com/zeromq/libzmq synced 2025-03-28 21:13:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #9 from axelriet/more_norm_fixes

Browse Source 
More small NORM fixes. Still not working 100%
This commit is contained in:
Axel Rietschin 2023-12-11 18:32:24 -08:00 committed by GitHub
commit 706f35ad6f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/norm_engine.cpp
View File

@ -293,7 +293,7 @@ void zmq::norm_engine_t::plug (io_thread_t */*io_thread_*/,
threadArgs->norm_instance_handle = norm_instance;
norm_descriptor_handle = add_fd (wrapper_read_fd);
#else
fd_t normDescriptor = NormGetDescriptor (norm_instance);
fd_t normDescriptor = (fd_t) NormGetDescriptor (norm_instance);
norm_descriptor_handle = add_fd (normDescriptor);
#endif
// Set POLLIN for notification of pending NormEvents
@ -421,7 +421,7 @@ void zmq::norm_engine_t::in_event ()
#ifdef ZMQ_USE_NORM_SOCKET_WRAPPER
int rc = recv (wrapper_read_fd, reinterpret_cast<char *> (&event),
sizeof (event), 0);
errno_assert (rc == sizeof (event));
errno_assert (rc == sizeof (event)); // This fires sometimes???
#else
if (!NormGetNextEvent (norm_instance, &event)) {
// NORM has died before we unplugged?!
@ -460,14 +460,21 @@ void zmq::norm_engine_t::in_event ()
NormRxStreamState *rxState =
(NormRxStreamState *) NormObjectGetUserData (event.object);
if (NULL != rxState) {
// We are unconditionally deleting the object,
// don't leave a dangling pointer behind.
NormObjectSetUserData (event.object, nullptr);
// Remove the state from the list it's in
// This is now unnecessary since deletion takes care of list removal
// but in the interest of being clear ...
NormRxStreamState::List *list = rxState->AccessList ();
if (NULL != list)
if (NULL != list) {
list->Remove (*rxState);
}
#ifndef NDEBUG
memset (rxState, 0, sizeof (NormRxStreamState));
#endif
delete rxState;
}
delete rxState;
}
break;
}