Skip to content

Relax mutex earlier in FT_Invocation_Endpoint_Selector::select_*() #1

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

Merged
leonardvimond merged 1 commit into from
Feb 25, 2016
Merged

Relax mutex earlier in FT_Invocation_Endpoint_Selector::select_*() #1

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
87 changes: 50 additions & 37 deletions TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Invocation_Endpoint_Selectors.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,25 +49,32 @@ TAO_FT_Invocation_Endpoint_Selector::select_primary (
TAO::Profile_Transport_Resolver *r,
ACE_Time_Value *max_wait_time)
{
// Set lock, as forward_profiles might be deleted concurrently.
ACE_MT (ACE_GUARD_RETURN (TAO_SYNCH_MUTEX,
guard,
const_cast <TAO_SYNCH_MUTEX &> (r->stub ()->profile_lock ()),
false));

// Grab the forwarded list
TAO_MProfile *prof_list =
const_cast<TAO_MProfile *> (r->stub ()->forward_profiles ());

TAO_MProfile &basep = r->stub ()->base_profiles ();
TAO_MProfile *prof_list;
TAO_MProfile prof_list_aux;

if (prof_list ==0)
{
prof_list = &basep;
// No need to hold stub lock any more. We needed it only to use
// forward_profiles.
guard.release ();
}
// Retrieve the list of profiles to be used.
// Set lock, as forward_profiles might be deleted concurrently.
{
ACE_MT (ACE_GUARD_RETURN (TAO_SYNCH_MUTEX,
guard,
const_cast <TAO_SYNCH_MUTEX &> (r->stub ()->profile_lock ()),
false));

// Grab the forwarded list
TAO_MProfile *forward_prof_list =
const_cast<TAO_MProfile *> (r->stub ()->forward_profiles ());

if (forward_prof_list == 0)
{
TAO_MProfile &basep = r->stub ()->base_profiles ();
prof_list = &basep;
}
else
{
prof_list_aux.set(*forward_prof_list);
prof_list = &prof_list_aux;
}
}

if (prof_list == 0)
return false;
Expand Down Expand Up @@ -107,26 +114,32 @@ TAO_FT_Invocation_Endpoint_Selector::select_secondary (
TAO::Profile_Transport_Resolver *r,
ACE_Time_Value *max_wait_time)
{
// Set lock, as forward_profiles might be deleted concurrently.
ACE_MT (ACE_GUARD_RETURN (TAO_SYNCH_MUTEX,
guard,
const_cast <TAO_SYNCH_MUTEX &> (r->stub ()->profile_lock ()),
false));

// Grab the forwarded list
TAO_MProfile *prof_list =
const_cast<TAO_MProfile *> (r->stub ()->forward_profiles ());

TAO_MProfile &basep =
r->stub ()->base_profiles ();
TAO_MProfile *prof_list;
TAO_MProfile prof_list_aux;

if (prof_list ==0)
{
prof_list = &basep;
// No need to hold stub lock any more. We needed it only to use
// forward_profiles.
guard.release ();
}
// Retrieve the list of profiles to be used.
// Set lock, as forward_profiles might be deleted concurrently.
{
ACE_MT (ACE_GUARD_RETURN (TAO_SYNCH_MUTEX,
guard,
const_cast <TAO_SYNCH_MUTEX &> (r->stub ()->profile_lock ()),
false));

// Grab the forwarded list
TAO_MProfile *forward_prof_list =
const_cast<TAO_MProfile *> (r->stub ()->forward_profiles ());

if (forward_prof_list == 0)
{
TAO_MProfile &basep = r->stub ()->base_profiles ();
prof_list = &basep;
}
else
{
prof_list_aux.set(*forward_prof_list);
prof_list = &prof_list_aux;
}
}

if (prof_list == 0)
return false;
Expand Down