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.

Sign up for GitHub

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

Jump to bottom

Fix #474, Add timecb global mutex #475

Merged
merged 2 commits into from
May 26, 2020
Merged

Fix #474, Add timecb global mutex #475

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c2bcebb
Merge pull request #458 from nasa/integration-candidate
astrogeco May 13, 2020
eda6210
Fix #474, Add timecb global mutex
jphickey May 19, 2020
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
2 changes: 2 additions & 0 deletions src/os/posix/src/os-impl-idmap.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ static POSIX_GlobalLock_t OS_count_sem_table_mut;
static POSIX_GlobalLock_t OS_stream_table_mut;
static POSIX_GlobalLock_t OS_dir_table_mut;
static POSIX_GlobalLock_t OS_timebase_table_mut;
static POSIX_GlobalLock_t OS_timecb_table_mut;
static POSIX_GlobalLock_t OS_module_table_mut;
static POSIX_GlobalLock_t OS_filesys_table_mut;
static POSIX_GlobalLock_t OS_console_mut;
Expand All @@ -57,6 +58,7 @@ static POSIX_GlobalLock_t * const MUTEX_TABLE[] =
[OS_OBJECT_TYPE_OS_STREAM] = &OS_stream_table_mut,
[OS_OBJECT_TYPE_OS_DIR] = &OS_dir_table_mut,
[OS_OBJECT_TYPE_OS_TIMEBASE] = &OS_timebase_table_mut,
[OS_OBJECT_TYPE_OS_TIMECB] = &OS_timecb_table_mut,
[OS_OBJECT_TYPE_OS_MODULE] = &OS_module_table_mut,
[OS_OBJECT_TYPE_OS_FILESYS] = &OS_filesys_table_mut,
[OS_OBJECT_TYPE_OS_CONSOLE] = &OS_console_mut,
Expand Down
2 changes: 2 additions & 0 deletions src/os/rtems/src/os-impl-idmap.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ rtems_id OS_count_sem_table_sem;
rtems_id OS_stream_table_mut;
rtems_id OS_dir_table_mut;
rtems_id OS_timebase_table_mut;
rtems_id OS_timecb_table_mut;
rtems_id OS_module_table_mut;
rtems_id OS_filesys_table_mut;
rtems_id OS_console_mut;
Expand All @@ -60,6 +61,7 @@ static rtems_id * const MUTEX_TABLE[] =
[OS_OBJECT_TYPE_OS_STREAM] = &OS_stream_table_mut,
[OS_OBJECT_TYPE_OS_DIR] = &OS_dir_table_mut,
[OS_OBJECT_TYPE_OS_TIMEBASE] = &OS_timebase_table_mut,
[OS_OBJECT_TYPE_OS_TIMECB] = &OS_timecb_table_mut,
[OS_OBJECT_TYPE_OS_MODULE] = &OS_module_table_mut,
[OS_OBJECT_TYPE_OS_FILESYS] = &OS_filesys_table_mut,
[OS_OBJECT_TYPE_OS_CONSOLE] = &OS_console_mut,
Expand Down
2 changes: 2 additions & 0 deletions src/os/vxworks/src/os-impl-idmap.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ VX_MUTEX_SEMAPHORE(OS_count_sem_table_mut_mem);
VX_MUTEX_SEMAPHORE(OS_stream_table_mut_mem);
VX_MUTEX_SEMAPHORE(OS_dir_table_mut_mem);
VX_MUTEX_SEMAPHORE(OS_timebase_table_mut_mem);
VX_MUTEX_SEMAPHORE(OS_timecb_table_mut_mem);
VX_MUTEX_SEMAPHORE(OS_module_table_mut_mem);
VX_MUTEX_SEMAPHORE(OS_filesys_table_mut_mem);
VX_MUTEX_SEMAPHORE(OS_console_mut_mem);
Expand All @@ -60,6 +61,7 @@ VxWorks_GlobalMutex_t VX_MUTEX_TABLE[] =
[OS_OBJECT_TYPE_OS_STREAM] = { .mem = OS_stream_table_mut_mem },
[OS_OBJECT_TYPE_OS_DIR] = { .mem = OS_dir_table_mut_mem },
[OS_OBJECT_TYPE_OS_TIMEBASE] = { .mem = OS_timebase_table_mut_mem },
[OS_OBJECT_TYPE_OS_TIMECB] = { .mem = OS_timecb_table_mut_mem },
[OS_OBJECT_TYPE_OS_MODULE] = { .mem = OS_module_table_mut_mem },
[OS_OBJECT_TYPE_OS_FILESYS] = { .mem = OS_filesys_table_mut_mem },
[OS_OBJECT_TYPE_OS_CONSOLE] = { .mem = OS_console_mut_mem },
Expand Down