Fix #474, Add timecb global mutex

The mutex to protect the timer callback (timecb) resource table was missing.
nasa · May 19, 2020 · eda6210 · eda6210
1 parent c2bcebb
commit eda6210
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 0 deletions.
diff --git a/src/os/posix/src/os-impl-idmap.c b/src/os/posix/src/os-impl-idmap.c
@@ -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;
@@ -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,

diff --git a/src/os/rtems/src/os-impl-idmap.c b/src/os/rtems/src/os-impl-idmap.c
@@ -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;
@@ -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,

diff --git a/src/os/vxworks/src/os-impl-idmap.c b/src/os/vxworks/src/os-impl-idmap.c
@@ -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);
@@ -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 },