| Message ID | 51d9d87a-655f-41d1-87fe-ecf5a43fb30d@default (mailing list archive) |
|---|---|
| State | Rejected |
| Delegated to: | Hal Rosenstock |
| Headers | show |
On 6/19/2013 6:30 AM, Line Holen wrote: A couple of nits below: > Signed-off-by: Line Holen <Line.Holen@oracle.com> > > --- > > diff --git a/opensm/osm_sm_state_mgr.c b/opensm/osm_sm_state_mgr.c > index 11defdd..e2cabd6 100644 > --- a/opensm/osm_sm_state_mgr.c > +++ b/opensm/osm_sm_state_mgr.c > @@ -157,7 +157,7 @@ static void sm_state_mgr_start_polling(osm_sm_t * sm) > cl_status = cl_timer_start(&sm->polling_timer, timeout); > if (cl_status != CL_SUCCESS) > OSM_LOG(sm->p_log, OSM_LOG_ERROR, "ERR 3210: " > - "Failed to start timer\n"); > + "Failed to start polling timer\n"); > > OSM_LOG_EXIT(sm->p_log); > } > @@ -201,8 +201,8 @@ void osm_sm_state_mgr_polling_callback(IN void *context) > * osm_sm_state_mgr_process with signal OSM_SM_SIGNAL_POLLING_TIMEOUT > */ > sm->retry_number++; > - OSM_LOG(sm->p_log, OSM_LOG_VERBOSE, "Retry number:%d\n", > - sm->retry_number); > + OSM_LOG(sm->p_log, OSM_LOG_VERBOSE, "State %d, Retry number:%d\n", > + sm->p_subn->sm_state, sm->retry_number); SM State rather than just State would be better and why not use osm_get_sm_mgr_state_str so: OSM_LOG(sm->p_log, OSM_LOG_VERBOSE, "SM state %d (%s), Retry number:%d\n", sm->p_subn->sm_state, osm_get_sm_mgr_state_str(sm->p_subn->sm_state), sm->retry_number); ? -- Hal > > if (sm->retry_number >= sm->p_subn->opt.polling_retry_number) { > OSM_LOG(sm->p_log, OSM_LOG_DEBUG, > @@ -219,7 +219,7 @@ void osm_sm_state_mgr_polling_callback(IN void *context) > cl_status = cl_timer_start(&sm->polling_timer, timeout); > if (cl_status != CL_SUCCESS) > OSM_LOG(sm->p_log, OSM_LOG_ERROR, "ERR 3211: " > - "Failed to restart timer\n"); > + "Failed to restart polling timer\n"); > > Exit: > OSM_LOG_EXIT(sm->p_log); > @@ -414,8 +414,8 @@ ib_api_status_t osm_sm_state_mgr_process(osm_sm_t * sm, > * handover from it. > */ > OSM_LOG(sm->p_log, OSM_LOG_VERBOSE, > - "Forcing heavy sweep. " > - "Received OSM_SM_SIGNAL_HANDOVER or OSM_SM_SIGNAL_POLLING_TIMEOUT\n"); > + "Forcing heavy sweep. Received signal %s\n", > + osm_get_sm_mgr_signal_str(signal)); > /* Force set_client_rereg_on_sweep, we don't know what the other > * SM may have configure/done on the fabric. > */ > -- To unsubscribe from this list: send the line "unsubscribe linux-rdma" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On 06/19/13 20:20, Hal Rosenstock wrote: > On 6/19/2013 6:30 AM, Line Holen wrote: > > A couple of nits below: > >> Signed-off-by: Line Holen<Line.Holen@oracle.com> >> >> --- >> >> diff --git a/opensm/osm_sm_state_mgr.c b/opensm/osm_sm_state_mgr.c >> index 11defdd..e2cabd6 100644 >> --- a/opensm/osm_sm_state_mgr.c >> +++ b/opensm/osm_sm_state_mgr.c >> @@ -157,7 +157,7 @@ static void sm_state_mgr_start_polling(osm_sm_t * sm) >> cl_status = cl_timer_start(&sm->polling_timer, timeout); >> if (cl_status != CL_SUCCESS) >> OSM_LOG(sm->p_log, OSM_LOG_ERROR, "ERR 3210: " >> - "Failed to start timer\n"); >> + "Failed to start polling timer\n"); >> >> OSM_LOG_EXIT(sm->p_log); >> } >> @@ -201,8 +201,8 @@ void osm_sm_state_mgr_polling_callback(IN void *context) >> * osm_sm_state_mgr_process with signal OSM_SM_SIGNAL_POLLING_TIMEOUT >> */ >> sm->retry_number++; >> - OSM_LOG(sm->p_log, OSM_LOG_VERBOSE, "Retry number:%d\n", >> - sm->retry_number); >> + OSM_LOG(sm->p_log, OSM_LOG_VERBOSE, "State %d, Retry number:%d\n", >> + sm->p_subn->sm_state, sm->retry_number); > SM State rather than just State would be better and why not use osm_get_sm_mgr_state_str so: > > OSM_LOG(sm->p_log, OSM_LOG_VERBOSE, "SM state %d (%s), Retry number:%d\n", > sm->p_subn->sm_state, osm_get_sm_mgr_state_str(sm->p_subn->sm_state), > sm->retry_number); > > ? I agree, this is better. v2 coming shortly. Line > > -- Hal > >> >> if (sm->retry_number>= sm->p_subn->opt.polling_retry_number) { >> OSM_LOG(sm->p_log, OSM_LOG_DEBUG, >> @@ -219,7 +219,7 @@ void osm_sm_state_mgr_polling_callback(IN void *context) >> cl_status = cl_timer_start(&sm->polling_timer, timeout); >> if (cl_status != CL_SUCCESS) >> OSM_LOG(sm->p_log, OSM_LOG_ERROR, "ERR 3211: " >> - "Failed to restart timer\n"); >> + "Failed to restart polling timer\n"); >> >> Exit: >> OSM_LOG_EXIT(sm->p_log); >> @@ -414,8 +414,8 @@ ib_api_status_t osm_sm_state_mgr_process(osm_sm_t * sm, >> * handover from it. >> */ >> OSM_LOG(sm->p_log, OSM_LOG_VERBOSE, >> - "Forcing heavy sweep. " >> - "Received OSM_SM_SIGNAL_HANDOVER or OSM_SM_SIGNAL_POLLING_TIMEOUT\n"); >> + "Forcing heavy sweep. Received signal %s\n", >> + osm_get_sm_mgr_signal_str(signal)); >> /* Force set_client_rereg_on_sweep, we don't know what the other >> * SM may have configure/done on the fabric. >> */ >> > -- > To unsubscribe from this list: send the line "unsubscribe linux-rdma" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html -- To unsubscribe from this list: send the line "unsubscribe linux-rdma" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/opensm/osm_sm_state_mgr.c b/opensm/osm_sm_state_mgr.c index 11defdd..e2cabd6 100644 --- a/opensm/osm_sm_state_mgr.c +++ b/opensm/osm_sm_state_mgr.c @@ -157,7 +157,7 @@ static void sm_state_mgr_start_polling(osm_sm_t * sm) cl_status = cl_timer_start(&sm->polling_timer, timeout); if (cl_status != CL_SUCCESS) OSM_LOG(sm->p_log, OSM_LOG_ERROR, "ERR 3210: " - "Failed to start timer\n"); + "Failed to start polling timer\n"); OSM_LOG_EXIT(sm->p_log); } @@ -201,8 +201,8 @@ void osm_sm_state_mgr_polling_callback(IN void *context) * osm_sm_state_mgr_process with signal OSM_SM_SIGNAL_POLLING_TIMEOUT */ sm->retry_number++; - OSM_LOG(sm->p_log, OSM_LOG_VERBOSE, "Retry number:%d\n", - sm->retry_number); + OSM_LOG(sm->p_log, OSM_LOG_VERBOSE, "State %d, Retry number:%d\n", + sm->p_subn->sm_state, sm->retry_number); if (sm->retry_number >= sm->p_subn->opt.polling_retry_number) { OSM_LOG(sm->p_log, OSM_LOG_DEBUG, @@ -219,7 +219,7 @@ void osm_sm_state_mgr_polling_callback(IN void *context) cl_status = cl_timer_start(&sm->polling_timer, timeout); if (cl_status != CL_SUCCESS) OSM_LOG(sm->p_log, OSM_LOG_ERROR, "ERR 3211: " - "Failed to restart timer\n"); + "Failed to restart polling timer\n"); Exit: OSM_LOG_EXIT(sm->p_log); @@ -414,8 +414,8 @@ ib_api_status_t osm_sm_state_mgr_process(osm_sm_t * sm, * handover from it. */ OSM_LOG(sm->p_log, OSM_LOG_VERBOSE, - "Forcing heavy sweep. " - "Received OSM_SM_SIGNAL_HANDOVER or OSM_SM_SIGNAL_POLLING_TIMEOUT\n"); + "Forcing heavy sweep. Received signal %s\n", + osm_get_sm_mgr_signal_str(signal)); /* Force set_client_rereg_on_sweep, we don't know what the other * SM may have configure/done on the fabric. */
Signed-off-by: Line Holen <Line.Holen@oracle.com> --- -- To unsubscribe from this list: send the line "unsubscribe linux-rdma" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html