Commit bd0052a7 authored by Misbah Mubarak's avatar Misbah Mubarak
Browse files

Merge branch 'model-net-inst' into 'master'

adding NULLs to model_net_method structs

See merge request !55
parents 9fbdc45a 783359de
...@@ -2547,7 +2547,9 @@ struct model_net_method express_mesh_method = ...@@ -2547,7 +2547,9 @@ struct model_net_method express_mesh_method =
NULL,//(event_f)local_sample_fn, NULL,//(event_f)local_sample_fn,
NULL,//(revent_f)local_sample_rc_fn, NULL,//(revent_f)local_sample_rc_fn,
(init_f)local_sample_init, (init_f)local_sample_init,
NULL//(final_f)local_sample_fin, NULL,//(final_f)local_sample_fin,
NULL, // for ROSS instrumentation
NULL // for ROSS instrumentation
}; };
struct model_net_method express_mesh_router_method = struct model_net_method express_mesh_router_method =
...@@ -2567,7 +2569,9 @@ struct model_net_method express_mesh_router_method = ...@@ -2567,7 +2569,9 @@ struct model_net_method express_mesh_router_method =
NULL,//(event_f)local_rsample_fn, NULL,//(event_f)local_rsample_fn,
NULL,//(revent_f)local_rsample_rc_fn, NULL,//(revent_f)local_rsample_rc_fn,
(init_f)local_rsample_init, (init_f)local_rsample_init,
NULL//(final_f)local_rsample_fin, NULL,//(final_f)local_rsample_fin,
NULL, // for ROSS instrumentation
NULL // for ROSS instrumentation
}; };
} }
...@@ -160,7 +160,9 @@ struct model_net_method loggp_method = ...@@ -160,7 +160,9 @@ struct model_net_method loggp_method =
.mn_sample_fn = NULL, .mn_sample_fn = NULL,
.mn_sample_rc_fn = NULL, .mn_sample_rc_fn = NULL,
.mn_sample_init_fn = NULL, .mn_sample_init_fn = NULL,
.mn_sample_fini_fn = NULL .mn_sample_fini_fn = NULL,
.mn_model_stat_register = NULL, // for ROSS instrumentation
.mn_get_model_stat_types = NULL // for ROSS instrumentation
}; };
static void loggp_init( static void loggp_init(
......
...@@ -2186,7 +2186,9 @@ struct model_net_method NETWORK_method = ...@@ -2186,7 +2186,9 @@ struct model_net_method NETWORK_method =
NULL,//(event_f)local_sample_fn, NULL,//(event_f)local_sample_fn,
NULL,//(revent_f)local_sample_rc_fn, NULL,//(revent_f)local_sample_rc_fn,
(init_f)local_sample_init, (init_f)local_sample_init,
NULL//(final_f)local_sample_fin, NULL,//(final_f)local_sample_fin,
NULL, // for ROSS instrumentation
NULL // for ROSS instrumentation
}; };
struct model_net_method NETWORK_router_method = struct model_net_method NETWORK_router_method =
...@@ -2206,7 +2208,9 @@ struct model_net_method NETWORK_router_method = ...@@ -2206,7 +2208,9 @@ struct model_net_method NETWORK_router_method =
NULL,//(event_f)local_rsample_fn, NULL,//(event_f)local_rsample_fn,
NULL,//(revent_f)local_rsample_rc_fn, NULL,//(revent_f)local_rsample_rc_fn,
(init_f)local_rsample_init, (init_f)local_rsample_init,
NULL//(final_f)local_rsample_fin, NULL,//(final_f)local_rsample_fin,
NULL, // for ROSS instrumentation
NULL // for ROSS instrumentation
}; };
} }
...@@ -125,7 +125,9 @@ struct model_net_method simplenet_method = ...@@ -125,7 +125,9 @@ struct model_net_method simplenet_method =
.mn_sample_fn = NULL, .mn_sample_fn = NULL,
.mn_sample_rc_fn = NULL, .mn_sample_rc_fn = NULL,
.mn_sample_init_fn = NULL, .mn_sample_init_fn = NULL,
.mn_sample_fini_fn = NULL .mn_sample_fini_fn = NULL,
.mn_model_stat_register = NULL, // for ROSS instrumentation
.mn_get_model_stat_types = NULL // for ROSS instrumentation
}; };
static void sn_init( static void sn_init(
......
...@@ -155,7 +155,9 @@ struct model_net_method simplep2p_method = ...@@ -155,7 +155,9 @@ struct model_net_method simplep2p_method =
.mn_sample_fn = NULL, .mn_sample_fn = NULL,
.mn_sample_rc_fn = NULL, .mn_sample_rc_fn = NULL,
.mn_sample_init_fn = NULL, .mn_sample_init_fn = NULL,
.mn_sample_fini_fn = NULL .mn_sample_fini_fn = NULL,
.mn_model_stat_register = NULL, // for ROSS instrumentation
.mn_get_model_stat_types = NULL // for ROSS instrumentation
}; };
static void sp_init( static void sp_init(
......
...@@ -2018,7 +2018,9 @@ struct model_net_method torus_method = ...@@ -2018,7 +2018,9 @@ struct model_net_method torus_method =
.mn_sample_fn = NULL, .mn_sample_fn = NULL,
.mn_sample_rc_fn = NULL, .mn_sample_rc_fn = NULL,
.mn_sample_init_fn = NULL, .mn_sample_init_fn = NULL,
.mn_sample_fini_fn = NULL .mn_sample_fini_fn = NULL,
.mn_model_stat_register = NULL, // for ROSS instrumentation
.mn_get_model_stat_types = NULL // for ROSS instrumentation
}; };
/* user-facing modelnet functions */ /* user-facing modelnet functions */
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment