From 5d308c961af3ea5f561363d2e42b157e8d02b202 Mon Sep 17 00:00:00 2001 From: pini Date: Tue, 7 Dec 2010 10:13:47 +0000 Subject: [PATCH] Removed some old and unused filed from SMPI. git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@9049 48e7efb5-ca39-0410-a469-dd3cf9ba447f --- buildtools/Cmake/DefinePackages.cmake | 2 -- src/smpi/smpi_coll.c | 1 - src/smpi/smpi_coll_private.h | 9 ----- src/smpi/smpi_pmpi.c | 1 - src/smpi/smpi_util.c | 51 --------------------------- 5 files changed, 64 deletions(-) delete mode 100644 src/smpi/smpi_coll_private.h delete mode 100644 src/smpi/smpi_util.c diff --git a/buildtools/Cmake/DefinePackages.cmake b/buildtools/Cmake/DefinePackages.cmake index 1c8f54c59e..5738bc24f2 100644 --- a/buildtools/Cmake/DefinePackages.cmake +++ b/buildtools/Cmake/DefinePackages.cmake @@ -87,7 +87,6 @@ set(EXTRA_DIST src/simix/synchro_private.h src/smpi/private.h - src/smpi/smpi_coll_private.h src/smpi/smpi_mpi_dt_private.h src/smpi/README src/mk_supernovae.pl @@ -112,7 +111,6 @@ set(SMPI_SRC src/smpi/smpi_f77.c src/smpi/smpi_comm.c src/smpi/smpi_group.c - src/smpi/smpi_util.c src/smpi/smpi_coll.c src/smpi/smpi_mpi_dt.c ) diff --git a/src/smpi/smpi_coll.c b/src/smpi/smpi_coll.c index b3c9b3ae27..57c3600a26 100644 --- a/src/smpi/smpi_coll.c +++ b/src/smpi/smpi_coll.c @@ -11,7 +11,6 @@ #include #include "private.h" -#include "smpi_coll_private.h" XBT_LOG_NEW_DEFAULT_SUBCATEGORY(smpi_coll, smpi, "Logging specific to SMPI (coll)"); diff --git a/src/smpi/smpi_coll_private.h b/src/smpi/smpi_coll_private.h deleted file mode 100644 index d0c3022741..0000000000 --- a/src/smpi/smpi_coll_private.h +++ /dev/null @@ -1,9 +0,0 @@ -/* smpi_coll_private.h -- functions of smpi_coll.c that are exported to other SMPI modules. */ - -/* 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. */ - -#include "private.h" diff --git a/src/smpi/smpi_pmpi.c b/src/smpi/smpi_pmpi.c index 67499281b2..b8d53b5ddc 100644 --- a/src/smpi/smpi_pmpi.c +++ b/src/smpi/smpi_pmpi.c @@ -5,7 +5,6 @@ * under the terms of the license (GNU LGPL) which comes with this package. */ #include "private.h" -#include "smpi_coll_private.h" #include "smpi_mpi_dt_private.h" XBT_LOG_NEW_DEFAULT_SUBCATEGORY(smpi_pmpi, smpi, diff --git a/src/smpi/smpi_util.c b/src/smpi/smpi_util.c deleted file mode 100644 index 16b711733d..0000000000 --- a/src/smpi/smpi_util.c +++ /dev/null @@ -1,51 +0,0 @@ -/* Copyright (c) 2007, 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. */ - -#include "private.h" - -XBT_LOG_NEW_DEFAULT_SUBCATEGORY(smpi_util, smpi, - "Logging specific to SMPI (utilities)"); - -/* -int smpi_gettimeofday(struct timeval *tv, struct timezone *tz) -{ - double now; - int retval; - smpi_bench_end(); - retval = 0; - if (NULL == tv) { - retval = -1; - } else { - now = SIMIX_get_clock(); - tv->tv_sec = now; - tv->tv_usec = ((now - (double) tv->tv_sec) * 1000000.0); - } - smpi_bench_begin(); - return retval; -} - -unsigned int smpi_sleep(unsigned int seconds) -{ - smx_host_t host; - smx_action_t action; - - smpi_bench_end(); - host = SIMIX_host_self(); - action = SIMIX_req_action_sleep(host, (double)seconds); - smpi_process_wait_action(action); - SIMIX_req_action_destroy(action); - smpi_bench_begin(); - return 0; -} - -void smpi_exit(int status) -{ - smpi_bench_end(); - smpi_process_finalize(); - SIMIX_req_process_kill(SIMIX_process_self()); - return; -} -*/ -- 2.20.1