Merging branches with master, adding model-net sampling

CONTRIBUTORS.md

+TODO: add contributors here

codes/codes-callback.h

@@ -7,6 +7,10 @@
 #ifndef CODES_CALLBACK_H
 #define CODES_CALLBACK_H
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #include <assert.h>
 #include "codes/lp-msg.h"
 
@@ -83,6 +87,10 @@ struct codes_cb_params {
         assert(_esize >= (_cb_info_ptr)->cb_ret_offset + sizeof(_ret_type)); \
     } while (0)
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* end of include guard: CODES_CALLBACK_H */
 
 /*

codes/codes-jobmap.h

@@ -20,6 +20,10 @@
 #ifndef CODES_JOBMAP_H
 #define CODES_JOBMAP_H
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /** type markers and parameter defs for jobmaps **/
 
 enum codes_jobmap_type {
@@ -80,6 +84,10 @@ int codes_jobmap_get_num_jobs(struct codes_jobmap_ctx const * c);
 
 int codes_jobmap_get_num_ranks(int job_id, struct codes_jobmap_ctx const * c);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif
 
 /*

codes/codes-mapping-context.h

@@ -13,6 +13,10 @@
 #ifndef CODES_MAPPING_CONTEXT_H
 #define CODES_MAPPING_CONTEXT_H
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #include <stdbool.h>
 #include <ross.h>
 
@@ -101,6 +105,10 @@ char const * codes_mctx_get_annotation(
         char const * dest_lp_name,
         tw_lpid sender_id);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* end of include guard: CODES_MAPPING_CONTEXT_H */
 
 /*

codes/codes-workload.h

@@ -12,6 +12,10 @@
 #ifndef CODES_WORKLOAD_H
 #define CODES_WORKLOAD_H
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #include <ross.h>
 #include "configuration.h"
 
@@ -326,6 +330,10 @@ void codes_workload_add_method(struct codes_workload_method const * method);
  * will shut down automatically once they have issued their last event.
  */
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* CODES_WORKLOAD_H */
 
 /*

codes/codes.h

@@ -8,6 +8,10 @@
 #ifndef CODES_H
 #define CODES_H
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #include <ross.h>
 #include <assert.h>
 
@@ -90,6 +94,10 @@ static inline void codes_local_latency_reverse(tw_lp *lp)
     return;
 }
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* CODES_H */
 
 /*

codes/codes_mapping.h

@@ -7,6 +7,14 @@
 /* SUMMARY:
  * CODES custom mapping file for ROSS
  */
+
+#ifndef CODES_MAPPING_H
+#define CODES_MAPPING_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #include "configuration.h"
 #include "codes.h"
 #include "lp-type-lookup.h"
@@ -220,6 +228,12 @@ int codes_mapping_get_anno_cid_by_name(char const * annotation);
 int codes_mapping_get_anno_cid_by_lpid(tw_lpid id);
 char const * codes_mapping_get_anno_name_by_cid(int cid);
 
+#ifdef __cplusplus
+}
+#endif
+
+#endif
+
 /*
  * Local variables:
  *  c-indent-level: 4

codes/configuration.h

@@ -7,6 +7,10 @@
 #ifndef __CONFIGURATION_H__
 #define __CONFIGURATION_H__
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #include <stddef.h>
 #include <inttypes.h>
 #include <mpi.h>
@@ -249,6 +253,10 @@ extern ConfigHandle config;
 
 extern config_lpgroups_t lpconf;
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif
 
 /*

codes/jenkins-hash.h

@@ -7,6 +7,10 @@
 #ifndef __JENKINS_HASH__
 #define __JENKINS_HASH__
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #include <sys/types.h>
 #include <stdint.h>
 
@@ -39,6 +43,10 @@ void bj_hashlittle2(
  */
 #define bj_hashmask(n) (bj_hashsize(n)-1)
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif
 
 /*

codes/local-storage-model.h

@@ -7,6 +7,10 @@
 #ifndef __LS_MODEL__
 #define __LS_MODEL__
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #include <ross.h>
 
 #include "codes-callback.h"
@@ -110,6 +114,10 @@ void lsm_configure(void);
 
 #define LSM_DEBUG 0
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif
 
 /*

codes/lp-io.h

@@ -7,6 +7,10 @@
 #ifndef LP_IO_H
 #define LP_IO_H
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #include <ross.h>
 
 typedef char* lp_io_handle;
@@ -33,6 +37,10 @@ static inline char* lp_io_handle_to_dir(lp_io_handle handle)
     return(strdup(handle));
 }
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* LP_IO_H */
 
 /*

codes/lp-msg.h

@@ -7,6 +7,10 @@
 #ifndef LP_MSG_H
 #define LP_MSG_H
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #include "ross.h"
 
 /* It is good practice to always include the src LPID, a unique message
@@ -24,6 +28,10 @@ typedef struct msg_header_s {
 /* data structure utilities */
 void msg_set_header(int magic, int event_type, tw_lpid src, msg_header *h);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* end of include guard: LP_MSG_H */
 
 /*

codes/lp-type-lookup.h

@@ -8,6 +8,10 @@
 #ifndef LP_TYPE_LOOKUP_H
 #define LP_TYPE_LOOKUP_H
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #include "ross.h"
 
 /* look up the lp type registered through lp_type_register. Mostly used
@@ -17,6 +21,10 @@ const tw_lptype* lp_type_lookup(const char* name);
 /* register an LP with CODES/ROSS */
 void lp_type_register(const char* name, const tw_lptype* type);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* LP_TYPE_LOOKUP_H */
 
 /*

codes/model-net-inspect.h

@@ -10,6 +10,10 @@
 #ifndef MODEL_NET_INSPECT_H
 #define MODEL_NET_INSPECT_H
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /* ALL FUNCTIONS
  * anno is the annotation specified in the configuration (NULL -> no
  * annotation), while ignore_annotations is a flag controlling whether
@@ -37,6 +41,10 @@ int model_net_torus_get_flat_id(
         const int * dim_lens,
         const int * dim_ids);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* end of include guard: MODEL_NET_INSPECT_H */
 
 /*

codes/model-net-lp.h

@@ -13,6 +13,10 @@
 #ifndef MODEL_NET_LP_H  
 #define MODEL_NET_LP_H
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #include <ross.h>
 #include "codes/lp-msg.h"
 #include "model-net.h"
@@ -126,6 +130,10 @@ typedef struct model_net_wrap_msg {
     } msg;
 } model_net_wrap_msg;
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* end of include guard: MODEL_NET_LP_H */
 
 /*

codes/model-net-method.h

@@ -7,6 +7,10 @@
 #ifndef MODELNET_METHOD_H
 #define MODELNET_METHOD_H
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #include <ross.h>
 
 // forward decl of model_net_method since we currently have a circular include
@@ -63,6 +67,10 @@ struct model_net_method
 
 extern struct model_net_method * method_array[];
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* MODELNET_METHOD_H */
 
 /*

codes/model-net-sched.h

@@ -9,6 +9,10 @@
 #ifndef MODEL_NET_SCHED_H
 #define MODEL_NET_SCHED_H
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #include <ross.h>
 #include "model-net.h"
 
@@ -195,6 +199,10 @@ void model_net_sched_set_default_params(mn_sched_params *sched_params);
 
 extern char * sched_names[];
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* end of include guard: MODEL_NET_SCHED_H */
 
 /*

codes/model-net.h

@@ -7,6 +7,10 @@
 #ifndef MODELNET_H
 #define MODELNET_H
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #include <ross.h>
 #include <codes/lp-type-lookup.h>
 #include <codes/configuration.h>
@@ -397,6 +401,11 @@ void model_net_print_stats(tw_lpid lpid, mn_stats mn_stats_array[]);
 
 /* find model-net statistics */
 mn_stats* model_net_find_stats(char const * category, mn_stats mn_stats_array[]);
+
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* MODELNET_H */
 
 /*

codes/net/dragonfly.h

@@ -7,6 +7,10 @@
 #ifndef DRAGONFLY_H
 #define DRAGONFLY_H
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #include <ross.h>
 
 typedef struct terminal_message terminal_message;
@@ -92,6 +96,10 @@ struct terminal_message
    tw_lpid next_stop;
 };
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* end of include guard: DRAGONFLY_H */
 
 /*

codes/net/loggp.h

@@ -7,6 +7,10 @@
 #ifndef LOGGP_H
 #define LOGGP_H
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #include "../model-net-sched.h"
 
 /* types of events that will constitute triton requests */
@@ -45,6 +49,10 @@ struct loggp_message
     tw_stime recv_time_saved;
 };
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* end of include guard: LOGGP_H */
 
 /*