X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/a243b4c3535f516d05259cac06963c422d4aadc0..6e8589d6a8476d3d6dd2453d933ed9759cd215b0:/src/include/simgrid/platf_interface.h diff --git a/src/include/simgrid/platf_interface.h b/src/include/simgrid/platf_interface.h index 7091f049e8..2e031133b2 100644 --- a/src/include/simgrid/platf_interface.h +++ b/src/include/simgrid/platf_interface.h @@ -1,6 +1,6 @@ /* platf_interface.h - Internal interface to the SimGrid platforms */ -/* Copyright (c) 2004-2007, 2009-2012. The SimGrid Team. +/* Copyright (c) 2004-2007, 2009-2015. The SimGrid Team. * All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it @@ -12,6 +12,8 @@ #include "simgrid/platf.h" /* public interface */ #include "xbt/RngStream.h" +SG_BEGIN_DECL() + /* Module management functions */ XBT_PUBLIC(void) sg_platf_init(void); XBT_PUBLIC(void) sg_platf_exit(void); @@ -41,27 +43,14 @@ typedef void (*sg_platf_mstorage_cb_t)(sg_platf_mstorage_cbarg_t); /* ***************************************** */ /* TUTORIAL: New TAG */ -#ifdef __cplusplus -extern "C" { -#endif - typedef void (*sg_platf_gpu_cb_t)(sg_platf_gpu_cbarg_t); XBT_PUBLIC(void) sg_platf_gpu_add_cb(sg_platf_gpu_cb_t); /* ***************************************** */ -XBT_PUBLIC(void) sg_platf_host_add_cb(sg_platf_host_cb_t); -XBT_PUBLIC(void) sg_platf_host_link_add_cb(sg_platf_host_link_cb_t); -XBT_PUBLIC(void) sg_platf_router_add_cb(sg_platf_router_cb_t); XBT_PUBLIC(void) sg_platf_link_add_cb(sg_platf_link_cb_t); -XBT_PUBLIC(void) sg_platf_peer_add_cb(sg_platf_peer_cb_t fct); XBT_PUBLIC(void) sg_platf_cluster_add_cb(sg_platf_cluster_cb_t fct); -XBT_PUBLIC(void) sg_platf_cabinet_add_cb(sg_platf_cabinet_cb_t fct); XBT_PUBLIC(void) sg_platf_postparse_add_cb(void_f_void_t fct); -XBT_PUBLIC(void) sg_platf_AS_begin_add_cb(sg_platf_AS_cb_t fct); -XBT_PUBLIC(void) sg_platf_AS_end_add_cb(sg_platf_AS_cb_t fct); -XBT_PUBLIC(void) sg_platf_prop_add_cb(sg_platf_prop_cb_t fct); -XBT_PUBLIC(void) sg_platf_route_add_cb(sg_platf_route_cb_t); XBT_PUBLIC(void) sg_platf_ASroute_add_cb(sg_platf_route_cb_t); XBT_PUBLIC(void) sg_platf_bypassRoute_add_cb(sg_platf_route_cb_t); XBT_PUBLIC(void) sg_platf_bypassASroute_add_cb(sg_platf_route_cb_t); @@ -69,15 +58,7 @@ XBT_PUBLIC(void) sg_platf_bypassASroute_add_cb(sg_platf_route_cb_t); XBT_PUBLIC(void) sg_platf_trace_add_cb(sg_platf_trace_cb_t); XBT_PUBLIC(void) sg_platf_trace_connect_add_cb(sg_platf_trace_connect_cb_t); -XBT_PUBLIC(void) sg_platf_storage_add_cb(sg_platf_storage_cb_t fct); -XBT_PUBLIC(void) sg_platf_mstorage_add_cb(sg_platf_mstorage_cb_t fct); -XBT_PUBLIC(void) sg_platf_storage_type_add_cb(sg_platf_storage_type_cb_t fct); -XBT_PUBLIC(void) sg_platf_mount_add_cb(sg_platf_mount_cb_t fct); - -#ifdef __cplusplus -} -#endif -/** \brief Pick the right models for CPU, net and workstation, and call their model_init_preparse +/** \brief Pick the right models for CPU, net and host, and call their model_init_preparse * * Must be called within parsing/creating the environment (after the s, if any, and before or friends such as ) */ @@ -87,4 +68,6 @@ XBT_PUBLIC(void) surf_config_models_setup(void); XBT_PUBLIC(void) sg_platf_rng_stream_init(unsigned long seed[6]); XBT_PUBLIC(RngStream) sg_platf_rng_stream_get(const char* id); +SG_END_DECL() + #endif /* SG_PLATF_INTERFACE_H */