RTOS/rtems
1
0
Fork 0
forked from Imagelibrary/rtems
Code Pull Requests Activity

score: Avoid Giant lock in _Objects_Id_to_name()

Browse Source 
This prevents a deadlock situation in the capture engine.
This commit is contained in:
Sebastian Huber
2015-05-12 10:53:47 +02:00
parent be0366bb62
commit 47c9c083ed
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
cpukit/score/src/objectidtoname.c
View File

@@ -31,6 +31,7 @@ Objects_Name_or_id_lookup_errors _Objects_Id_to_name (
Objects_Information *information; Objects_Information *information;
Objects_Control *the_object = (Objects_Control *) 0; Objects_Control *the_object = (Objects_Control *) 0;
Objects_Locations ignored_location; Objects_Locations ignored_location;
ISR_lock_Context lock_context;
/* /*
* Caller is trusted for name != NULL. * Caller is trusted for name != NULL.
@@ -56,11 +57,16 @@ Objects_Name_or_id_lookup_errors _Objects_Id_to_name (
return OBJECTS_INVALID_ID; return OBJECTS_INVALID_ID;
#endif #endif
the_object = _Objects_Get( information, tmpId, &ignored_location ); the_object = _Objects_Get_isr_disable(
information,
tmpId,
&ignored_location,
&lock_context
);
if ( !the_object ) if ( !the_object )
return OBJECTS_INVALID_ID; return OBJECTS_INVALID_ID;
*name = the_object->name; *name = the_object->name;
_Objects_Put( the_object ); _ISR_lock_ISR_enable( &lock_context );
return OBJECTS_NAME_OR_ID_LOOKUP_SUCCESSFUL; return OBJECTS_NAME_OR_ID_LOOKUP_SUCCESSFUL;
} }