Fix cimpler issues

Change-Id: I5bd8ffda63820260eaecb58061e903ccabafe567

Makefile.am

@@ -41,6 +41,8 @@ include $(top_srcdir)/src/Makefile.subdir
 include $(top_srcdir)/tests/Makefile.subdir
 include $(top_srcdir)/doc/Makefile.subdir
 
+LDADD += -lcgraph
+
 if USE_DEBUG
 AM_CPPFLAGS += -g
 AM_CFLAGS   += -g

codes/model-net-lp.h

@@ -31,6 +31,7 @@ extern "C" {
 #include "net/simplep2p.h"
 #include "net/torus.h"
 #include "net/express-mesh.h"
+#include "net/network-graph.h"
 
 extern int model_net_base_magic;
 
@@ -140,6 +141,7 @@ typedef struct model_net_wrap_msg {
         sp_message              m_sp2p;  // simplep2p
         nodes_message           m_torus; // torus
         em_message              m_em; // express-mesh
+        network_graph_message   m_ng; // express-mesh
         // add new ones here
     } msg;
 } model_net_wrap_msg;

codes/model-net.h

@@ -74,6 +74,8 @@ typedef struct mn_stats mn_stats;
     X(LOGGP,     "modelnet_loggp",     "loggp",     &loggp_method)\
     X(EXPRESS_MESH, "modelnet_express_mesh", "express_mesh", &express_mesh_method)\
     X(EXPRESS_MESH_ROUTER, "modelnet_express_mesh_router", "express_mesh_router", &express_mesh_router_method)\
+    X(NETWORK_GRAPH, "modelnet_network_graph", "network_graph", &network_graph_method)\
+    X(NETWORK_GRAPH_ROUTER, "modelnet_network_graph_router", "network_graph_router", &network_graph_router_method)\
     X(DRAGONFLY_PLUS, "modelnet_dragonfly_plus", "dragonfly_plus", &dragonfly_plus_method)\
     X(DRAGONFLY_PLUS_ROUTER, "modelnet_dragonfly_plus_router", "dragonfly_plus_router", &dragonfly_plus_router_method)\
     X(MAX_NETS,  NULL,                 NULL,        NULL)

src/Makefile.subdir

@@ -99,6 +99,7 @@ nobase_include_HEADERS = \
 	codes/net/slimfly.h \
 	codes/net/fattree.h \
 	codes/net/loggp.h \
+	codes/net/network-graph.h \
 	codes/net/simplenet-upd.h \
 	codes/net/simplep2p.h \
 	codes/net/express-mesh.h \
@@ -166,6 +167,7 @@ src_libcodes_la_SOURCES =  \
 	src/networks/model-net/dragonfly-plus.C \
 	src/networks/model-net/slimfly.c \
 	src/networks/model-net/fattree.c \
+	src/networks/model-net/network-graph.c \
 	src/networks/model-net/loggp.c \
 	src/networks/model-net/simplep2p.c \
 	src/networks/model-net/model-net-lp.c \

src/networks/model-net/model-net-lp.c

@@ -385,6 +385,10 @@ void model_net_base_configure(){
         offsetof(model_net_wrap_msg, msg.m_em);
     msg_offsets[EXPRESS_MESH_ROUTER] =
         offsetof(model_net_wrap_msg, msg.m_em);
+    msg_offsets[NETWORK_GRAPH] =
+        offsetof(model_net_wrap_msg, msg.m_ng);
+    msg_offsets[NETWORK_GRAPH_ROUTER] =
+        offsetof(model_net_wrap_msg, msg.m_ng);
 
     // perform the configuration(s)
     // This part is tricky, as we basically have to look up all annotations that
@@ -406,7 +410,7 @@ void model_net_base_configure(){
                     }
                 }
                 if (a == num_params){
-                    // found a new annotation
+                    // found a new annotatio
                     annos[num_params++] = amap->annotations[n].ptr;
                 }
             }

src/networks/model-net/model-net.c

@@ -32,6 +32,10 @@ extern struct model_net_method dragonfly_custom_router_method;
 extern struct model_net_method loggp_method;
 extern struct model_net_method express_mesh_method;
 extern struct model_net_method express_mesh_router_method;
+extern struct model_net_method express_mesh_method;
+extern struct model_net_method express_mesh_router_method;
+extern struct model_net_method network_graph_method;
+extern struct model_net_method network_graph_router_method;
 
 #define X(a,b,c,d) b,
 char * model_net_lp_config_names[] = {