Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Cleanup Multithread code #245

Merged
merged 1 commit into from
May 18, 2021
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 8 additions & 24 deletions include/uxr/client/profile/multithread/multithread.h
Original file line number Diff line number Diff line change
Expand Up @@ -52,32 +52,16 @@ typedef struct uxrMutex
#endif // ifdef WIN32
} uxrMutex;

/**
* @brief
* TODO
*/
UXRDLLAPI uxrMutex* uxr_get_stream_mutex_from_id(
struct uxrSession* session,
uxrStreamId stream_id);

/**
* @brief
* TODO
*/
UXRDLLAPI void uxr_init_lock(
uxrMutex* mutex);

/**
* @brief
* TODO
*/
UXRDLLAPI void uxr_lock(
uxrMutex* mutex);

/**
* @brief
* TODO
*/
UXRDLLAPI void uxr_unlock(
uxrMutex* mutex);

Expand All @@ -98,18 +82,18 @@ UXRDLLAPI void uxr_unlock(
#define UXR_UNLOCK_STREAM_ID(session, stream_id) uxr_unlock(uxr_get_stream_mutex_from_id(session, stream_id))

#define UXR_LOCK_ALL_INPUT_STREAMS(session) \
for (uint8_t i = 0; i < session->streams.input_best_effort_size; \
++i){ uxr_lock(&session->streams.input_best_effort[i].mutex); } \
for (uint8_t i = 0; i < session->streams.input_reliable_size; ++i){ uxr_lock( \
&session->streams.input_reliable[i].mutex); \
for (uint8_t i = 0; i < session->streams.input_best_effort_size; ++i){ \
uxr_lock(&session->streams.input_best_effort[i].mutex); } \
for (uint8_t i = 0; i < session->streams.input_reliable_size; ++i){ \
uxr_lock(&session->streams.input_reliable[i].mutex); \
}

#define UXR_UNLOCK_ALL_INPUT_STREAMS(session) \
for (uint8_t i = 0; i < session->streams.input_best_effort_size; ++i){ uxr_unlock( \
&session->streams.input_best_effort[i].mutex); \
for (uint8_t i = 0; i < session->streams.input_best_effort_size; ++i){ \
uxr_unlock( &session->streams.input_best_effort[i].mutex); \
} \
for (uint8_t i = 0; i < session->streams.input_reliable_size; ++i){ uxr_unlock( \
&session->streams.input_reliable[i].mutex); \
for (uint8_t i = 0; i < session->streams.input_reliable_size; ++i){ \
uxr_unlock( &session->streams.input_reliable[i].mutex); \
}


Expand Down