From c05339428d64488dac5a51e900da3d9c2400a077 Mon Sep 17 00:00:00 2001 From: Arnaud Giersch Date: Mon, 14 May 2012 14:47:43 +0200 Subject: [PATCH] Remove old cruft. --- buildtools/Cmake/DefinePackages.cmake | 1 - src/include/simix/context.h | 43 --------------------------- src/simix/smx_context.c | 1 - src/simix/smx_context_base.c | 1 - src/simix/smx_context_thread.c | 1 - src/simix/smx_private.h | 1 - src/surf/surf_config.c | 1 - 7 files changed, 49 deletions(-) delete mode 100644 src/include/simix/context.h diff --git a/buildtools/Cmake/DefinePackages.cmake b/buildtools/Cmake/DefinePackages.cmake index 8d22b462f1..41c3f365b6 100644 --- a/buildtools/Cmake/DefinePackages.cmake +++ b/buildtools/Cmake/DefinePackages.cmake @@ -59,7 +59,6 @@ set(EXTRA_DIST src/include/xbt/xbt_os_time.h src/include/mc/datatypes.h src/include/mc/mc.h - src/include/simix/context.h src/msg/msg_private.h src/msg/msg_mailbox.h src/simdag/private.h diff --git a/src/include/simix/context.h b/src/include/simix/context.h deleted file mode 100644 index eaa0bfcf0a..0000000000 --- a/src/include/simix/context.h +++ /dev/null @@ -1,43 +0,0 @@ -/* Copyright (c) 2009, 2010. The SimGrid Team. - * All rights reserved. */ - -/* This program is free software; you can redistribute it and/or modify it - * under the terms of the license (GNU LGPL) which comes with this package. */ - -#ifndef XBT_CONTEXT_H -#define XBT_CONTEXT_H - -#include "xbt/misc.h" /* XBT_PUBLIC(), SG_BEGIN_DECL() and SG_END_DECL() definitions */ -#include "xbt/function_types.h" /* function pointer types declarations */ -#include "xbt_modinter.h" /* xbt_context_init() and xbt_context_exit() declarations */ -#include "simgrid/simix.h" - -SG_BEGIN_DECL() - -typedef struct s_xbt_context *xbt_context_t; - - -XBT_PUBLIC(xbt_context_t) xbt_context_new(const char *name, - xbt_main_func_t code, - void_f_pvoid_t startup_func, - void *startup_arg, - void_pfn_smxprocess_t cleanup_func, - smx_process_t process, - int argc, char *argv[]); - -XBT_PUBLIC(void) xbt_context_kill(xbt_context_t context); - -XBT_PUBLIC(void) xbt_context_start(xbt_context_t context); - -XBT_PUBLIC(void) xbt_context_yield(void); - -XBT_PUBLIC(void) xbt_context_schedule(xbt_context_t context); - -void xbt_context_empty_trash(void); - -void xbt_context_stop(int exit_code); - -void xbt_context_free(xbt_context_t context); - -SG_END_DECL() -#endif /* !XBT_CONTEXT_H */ diff --git a/src/simix/smx_context.c b/src/simix/smx_context.c index f1588b6242..f0ec02fdd6 100644 --- a/src/simix/smx_context.c +++ b/src/simix/smx_context.c @@ -11,7 +11,6 @@ #include "xbt/swag.h" #include "xbt/xbt_os_thread.h" #include "smx_private.h" -#include "simix/context.h" #include "gras_config.h" XBT_LOG_NEW_DEFAULT_SUBCATEGORY(simix_context, simix, diff --git a/src/simix/smx_context_base.c b/src/simix/smx_context_base.c index 616f669a2b..56efcf1403 100644 --- a/src/simix/smx_context_base.c +++ b/src/simix/smx_context_base.c @@ -9,7 +9,6 @@ #include "xbt/function_types.h" #include "simgrid/simix.h" -#include "simix/context.h" #include "smx_private.h" XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(bindings); diff --git a/src/simix/smx_context_thread.c b/src/simix/smx_context_thread.c index 1af1170c71..c8260dbcb6 100644 --- a/src/simix/smx_context_thread.c +++ b/src/simix/smx_context_thread.c @@ -12,7 +12,6 @@ #include "xbt/swag.h" #include "xbt/xbt_os_thread.h" #include "xbt_modinter.h" /* prototype of os thread module's init/exit in XBT */ -#include "simix/context.h" XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(simix_context); diff --git a/src/simix/smx_private.h b/src/simix/smx_private.h index b19e966584..2e3ca93616 100644 --- a/src/simix/smx_private.h +++ b/src/simix/smx_private.h @@ -23,7 +23,6 @@ #include "smx_network_private.h" #include "smx_smurf_private.h" #include "smx_synchro_private.h" -#include "simix/context.h" /* Define only for SimGrid benchmarking purposes */ #undef TIME_BENCH diff --git a/src/surf/surf_config.c b/src/surf/surf_config.c index 7de2320bee..e2cbb45457 100644 --- a/src/surf/surf_config.c +++ b/src/surf/surf_config.c @@ -11,7 +11,6 @@ #include "xbt/str.h" #include "surf/surf_private.h" #include "surf/surf_routing.h" /* COORD_HOST_LEVEL and COORD_ASR_LEVEL */ -#include "simix/context.h" XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_config, surf, "About the configuration of surf (and the rest of the simulation)"); -- 2.20.1