From 68bf973c759c6eef597da8349276be4b60a6d124 Mon Sep 17 00:00:00 2001 From: Arnaud Giersch Date: Mon, 12 Feb 2018 22:12:23 +0100 Subject: [PATCH] Kill function declarations without definitions. --- include/simgrid/modelchecker.h | 4 +--- include/simgrid/msg.h | 1 - include/simgrid/plugins/file_system.h | 4 +--- include/simgrid/plugins/live_migration.h | 3 +-- include/simgrid/simix.h | 8 +------- src/bindings/java/jmsg_storage.h | 5 +---- src/bindings/lua/lua_private.hpp | 4 +--- src/include/surf/surf.hpp | 8 -------- src/instr/instr_private.hpp | 1 - src/mc/mc_unw.hpp | 3 +-- src/simix/ActorImpl.hpp | 3 +-- src/simix/smx_synchro_private.hpp | 4 +--- src/smpi/include/private.hpp | 6 +----- src/xbt/mmalloc/mmprivate.h | 5 +---- teshsuite/msg/app-bittorrent/peer.h | 3 +-- teshsuite/msg/app-chainsend/iterator.h | 6 +----- 16 files changed, 13 insertions(+), 55 deletions(-) diff --git a/include/simgrid/modelchecker.h b/include/simgrid/modelchecker.h index c5f59c3499..5ccaed2997 100644 --- a/include/simgrid/modelchecker.h +++ b/include/simgrid/modelchecker.h @@ -1,6 +1,6 @@ /* simgrid/modelchecker.h - Formal Verification made possible in SimGrid */ -/* Copyright (c) 2008-2017. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2008-2018. 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. */ @@ -49,7 +49,6 @@ XBT_PUBLIC(void) MC_ignore(void *addr, size_t size); XBT_PUBLIC(void) MC_ignore_heap(void* address, size_t size); XBT_PUBLIC(void) MC_unignore_heap(void* address, size_t size); -XBT_PUBLIC(void) MC_ignore_local_variable(const char* var_name, const char* frame); XBT_PUBLIC(void) MC_ignore_global_variable(const char* var_name); #else @@ -65,7 +64,6 @@ XBT_PUBLIC(void) MC_ignore_global_variable(const char* var_name); #define MC_ignore_heap(a,s) ((void)0) #define MC_remove_ignore_heap(a,s) ((void)0) -#define MC_ignore_local_variable(n,f) ((void)0) #define MC_ignore_global_variable(v) ((void)0) #endif diff --git a/include/simgrid/msg.h b/include/simgrid/msg.h index be2b3f057a..131a7bb5e9 100644 --- a/include/simgrid/msg.h +++ b/include/simgrid/msg.h @@ -282,7 +282,6 @@ XBT_PUBLIC(void) MSG_task_set_bytes_amount(msg_task_t task, double bytes_amount) XBT_PUBLIC(double) MSG_task_get_remaining_communication(msg_task_t task); -XBT_PUBLIC(int) MSG_task_is_latency_bounded(msg_task_t task); XBT_PUBLIC(double) MSG_task_get_bytes_amount(msg_task_t task); XBT_PUBLIC(msg_error_t) MSG_task_receive_ext(msg_task_t* task, const char* alias, double timeout, msg_host_t host); diff --git a/include/simgrid/plugins/file_system.h b/include/simgrid/plugins/file_system.h index 4d7390dec4..41363fd1ce 100644 --- a/include/simgrid/plugins/file_system.h +++ b/include/simgrid/plugins/file_system.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2017. The SimGrid Team. +/* Copyright (c) 2017-2018. The SimGrid Team. * All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it @@ -30,8 +30,6 @@ XBT_PUBLIC(void) sg_file_unlink(sg_file_t fd); XBT_PUBLIC(int) sg_file_rcopy(sg_file_t file, sg_host_t host, const char* fullpath); XBT_PUBLIC(int) sg_file_rmove(sg_file_t file, sg_host_t host, const char* fullpath); -XBT_PUBLIC(void*) sg_storage_get_data(sg_storage_t storage); -XBT_PUBLIC(void) sg_storage_set_data(sg_storage_t storage, void* data); XBT_PUBLIC(sg_size_t) sg_storage_get_size_free(sg_storage_t st); XBT_PUBLIC(sg_size_t) sg_storage_get_size_used(sg_storage_t st); XBT_PUBLIC(sg_size_t) sg_storage_get_size(sg_storage_t st); diff --git a/include/simgrid/plugins/live_migration.h b/include/simgrid/plugins/live_migration.h index 7f32c4fde9..3a5107af29 100644 --- a/include/simgrid/plugins/live_migration.h +++ b/include/simgrid/plugins/live_migration.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2017. The SimGrid Team. +/* Copyright (c) 2017-2018. The SimGrid Team. * All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it @@ -18,7 +18,6 @@ XBT_PUBLIC(void) sg_vm_start_dirty_page_tracking(sg_vm_t vm); XBT_PUBLIC(void) sg_vm_stop_dirty_page_tracking(sg_vm_t vm); XBT_PUBLIC(double) sg_vm_lookup_computed_flops(sg_vm_t vm); XBT_PUBLIC(void) sg_vm_migrate(sg_vm_t vm, sg_host_t dst_pm); -XBT_PUBLIC(int) sg_vm_is_migratable(sg_vm_t vm); XBT_PUBLIC(void) sg_vm_set_dirty_page_intensity(sg_vm_t vm, double intensity); XBT_PUBLIC(double) sg_vm_get_dirty_page_intensity(sg_vm_t vm); XBT_PUBLIC(void) sg_vm_set_working_set_memory(sg_vm_t vm, sg_size_t size); diff --git a/include/simgrid/simix.h b/include/simgrid/simix.h index 7ac87fb902..56c2f33d04 100644 --- a/include/simgrid/simix.h +++ b/include/simgrid/simix.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2007-2017. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2007-2018. 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. */ @@ -149,8 +149,6 @@ XBT_PUBLIC(void) SIMIX_process_detach(); /*********************************** Host *************************************/ XBT_PUBLIC(void) SIMIX_host_off(sg_host_t host, smx_actor_t issuer); -XBT_PUBLIC(void) SIMIX_host_self_set_data(void *data); -XBT_PUBLIC(void*) SIMIX_host_self_get_data(); /********************************* Process ************************************/ XBT_PUBLIC(int) SIMIX_process_count(); @@ -169,9 +167,6 @@ XBT_PUBLIC(void) SIMIX_comm_set_copy_data_callback(void (*callback) (smx_activit XBT_PUBLIC(void) SIMIX_comm_copy_pointer_callback(smx_activity_t comm, void* buff, size_t buff_size); XBT_PUBLIC(void) SIMIX_comm_copy_buffer_callback(smx_activity_t comm, void* buff, size_t buff_size); -XBT_PUBLIC(smx_activity_t) SIMIX_comm_get_send_match(smx_mailbox_t mbox, int (*match_fun)(void*, void*), void* data); -XBT_PUBLIC(int) SIMIX_comm_has_send_match(smx_mailbox_t mbox, int (*match_fun)(void*, void*), void* data); -XBT_PUBLIC(int) SIMIX_comm_has_recv_match(smx_mailbox_t mbox, int (*match_fun)(void*, void*), void* data); XBT_PUBLIC(void) SIMIX_comm_finish(smx_activity_t synchro); /******************************************************************************/ @@ -184,7 +179,6 @@ XBT_PUBLIC(void) SIMIX_comm_finish(smx_activity_t synchro); XBT_PUBLIC(void) simcall_call(smx_actor_t process); /******************************* Host simcalls ********************************/ -XBT_PUBLIC(void) simcall_host_set_data(sg_host_t host, void *data); XBT_PUBLIC(smx_activity_t) simcall_execution_start(const char* name, double flops_amount, double priority, double bound, sg_host_t host); XBT_PUBLIC(smx_activity_t) diff --git a/src/bindings/java/jmsg_storage.h b/src/bindings/java/jmsg_storage.h index ea6dc3651e..4d715dce7c 100644 --- a/src/bindings/java/jmsg_storage.h +++ b/src/bindings/java/jmsg_storage.h @@ -1,6 +1,6 @@ /* Java bindings of the Storage API. */ -/* Copyright (c) 2012-2017. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2012-2018. 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. */ @@ -31,9 +31,6 @@ jobject jstorage_ref(JNIEnv * env, jobject jstorage); /** Release a ref onto the java instance */ void jstorage_unref(JNIEnv * env, jobject jstorage); -/** Get the name of a java instance. */ -const char *jstorage_get_name(jobject jstorage, JNIEnv * env); - /* Implement the Java API */ JNIEXPORT jobject JNICALL Java_org_simgrid_msg_Storage_getByName(JNIEnv* env, jclass cls, jstring jname); diff --git a/src/bindings/lua/lua_private.hpp b/src/bindings/lua/lua_private.hpp index abcfd7070f..9b6110f1a2 100644 --- a/src/bindings/lua/lua_private.hpp +++ b/src/bindings/lua/lua_private.hpp @@ -1,4 +1,4 @@ -/* Copyright (c) 2010-2017. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2010-2018. 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. */ @@ -17,8 +17,6 @@ void sglua_register_host_functions(lua_State* L); msg_host_t sglua_check_host(lua_State* L, int index); void sglua_register_platf_functions(lua_State* L); - -const char* sglua_get_msg_error(msg_error_t err); } #define lua_ensure(...) _XBT_IF_ONE_ARG(_lua_ensure_ARG1, _lua_ensure_ARGN, __VA_ARGS__)(__VA_ARGS__) diff --git a/src/include/surf/surf.hpp b/src/include/surf/surf.hpp index a645e3a4b6..ad88665a7a 100644 --- a/src/include/surf/surf.hpp +++ b/src/include/surf/surf.hpp @@ -112,14 +112,6 @@ XBT_PUBLIC(int) surf_model_running_action_set_size(surf_model_t model); */ XBT_PUBLIC(void) surf_cpu_action_set_bound(surf_action_t action, double bound); -/** - * @brief [brief description] - * @details [long description] - * - * @param action The surf network action - */ -XBT_PUBLIC(double) surf_network_action_get_latency_limited(surf_action_t action); - /** @} */ /**************************************/ diff --git a/src/instr/instr_private.hpp b/src/instr/instr_private.hpp index 4d48b2dc23..9f2041ede3 100644 --- a/src/instr/instr_private.hpp +++ b/src/instr/instr_private.hpp @@ -227,7 +227,6 @@ XBT_PRIVATE void TRACE_surf_host_set_utilization(const char* resource, const cha double delta); XBT_PRIVATE void TRACE_surf_link_set_utilization(const char* resource, const char* category, double value, double now, double delta); -XBT_PUBLIC(void) TRACE_surf_resource_utilization_alloc(); /* instr_paje.c */ extern XBT_PRIVATE std::set trivaNodeTypes; diff --git a/src/mc/mc_unw.hpp b/src/mc/mc_unw.hpp index 7eeec0a0a3..f776a95cca 100644 --- a/src/mc/mc_unw.hpp +++ b/src/mc/mc_unw.hpp @@ -1,4 +1,4 @@ -/* Copyright (c) 2015-2017. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2015-2018. 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. */ @@ -74,7 +74,6 @@ public: static unw_addr_space_t createUnwindAddressSpace(); }; -void MC_dump_stack_unw(FILE* file, unw_cursor_t cursor); void dumpStack(FILE* file, unw_cursor_t cursor); void dumpStack(FILE* file, pid_t pid); } diff --git a/src/simix/ActorImpl.hpp b/src/simix/ActorImpl.hpp index ecc4156602..735335eaa7 100644 --- a/src/simix/ActorImpl.hpp +++ b/src/simix/ActorImpl.hpp @@ -1,4 +1,4 @@ -/* Copyright (c) 2007-2017. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2007-2018. 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. */ @@ -146,7 +146,6 @@ XBT_PRIVATE void SIMIX_process_empty_trash(); XBT_PRIVATE void SIMIX_process_yield(smx_actor_t self); XBT_PRIVATE void SIMIX_process_exception_terminate(xbt_ex_t * e); XBT_PRIVATE void SIMIX_process_change_host(smx_actor_t process, sg_host_t dest); -XBT_PRIVATE void SIMIX_process_set_data(smx_actor_t process, void *data); XBT_PRIVATE smx_actor_t SIMIX_process_get_by_name(const char* name); XBT_PRIVATE void SIMIX_process_auto_restart_set(smx_actor_t process, int auto_restart); diff --git a/src/simix/smx_synchro_private.hpp b/src/simix/smx_synchro_private.hpp index 0ba8d40431..ed15fd105e 100644 --- a/src/simix/smx_synchro_private.hpp +++ b/src/simix/smx_synchro_private.hpp @@ -1,4 +1,4 @@ -/* Copyright (c) 2012-2017. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2012-2018. 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. */ @@ -26,9 +26,7 @@ struct s_smx_sem_t { simgrid::simix::SynchroList sleeping; /* list of sleeping processes */ }; -XBT_PRIVATE void SIMIX_post_synchro(smx_activity_t synchro); XBT_PRIVATE void SIMIX_synchro_stop_waiting(smx_actor_t process, smx_simcall_t simcall); -XBT_PRIVATE void SIMIX_synchro_destroy(smx_activity_t synchro); XBT_PRIVATE void SIMIX_synchro_finish(smx_activity_t synchro); XBT_PRIVATE smx_cond_t SIMIX_cond_init(); diff --git a/src/smpi/include/private.hpp b/src/smpi/include/private.hpp index b74967f124..ae78bcbeb1 100644 --- a/src/smpi/include/private.hpp +++ b/src/smpi/include/private.hpp @@ -1,4 +1,4 @@ -/* Copyright (c) 2007-2017. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2007-2018. 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. */ @@ -427,16 +427,12 @@ XBT_PRIVATE smpi_privatization_region_t smpi_init_global_memory_segment_process( #if HAVE_PAPI typedef std::vector> papi_counter_t; XBT_PRIVATE papi_counter_t& smpi_process_papi_counters(); -XBT_PRIVATE int smpi_process_papi_event_set(); #endif extern std::unordered_map location2speedup; -// TODO: Move this to the right location (if we keep this...) -void smpi_add_process(simgrid::s4u::ActorPtr actor); /** @brief Returns the last call location (filename, linenumber). Process-specific. */ extern "C" { -XBT_PUBLIC(smpi_trace_call_location_t*) smpi_process_get_call_location(); XBT_PUBLIC(smpi_trace_call_location_t*) smpi_trace_get_call_location(); } diff --git a/src/xbt/mmalloc/mmprivate.h b/src/xbt/mmalloc/mmprivate.h index 7d2a2e7235..389b55b907 100644 --- a/src/xbt/mmalloc/mmprivate.h +++ b/src/xbt/mmalloc/mmprivate.h @@ -1,6 +1,6 @@ /* Declarations for `mmalloc' and friends. */ -/* Copyright (c) 2010-2017. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2010-2018. 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. */ @@ -306,9 +306,6 @@ static inline int mmalloc_get_increment(malloc_info* heapinfo) { XBT_PRIVATE int malloc_use_mmalloc(void); -XBT_PRIVATE int mmalloc_exec_using_mm(int argc, const char** argv); -XBT_PRIVATE void mmalloc_ensure_using_mm(int argc, const char** argv); - XBT_PRIVATE size_t mmalloc_get_bytes_used_remote(size_t heaplimit, const malloc_info* heapinfo); SG_END_DECL() diff --git a/teshsuite/msg/app-bittorrent/peer.h b/teshsuite/msg/app-bittorrent/peer.h index a3ac6bf11d..7c1361abc7 100644 --- a/teshsuite/msg/app-bittorrent/peer.h +++ b/teshsuite/msg/app-bittorrent/peer.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2012-2016. The SimGrid Team. +/* Copyright (c) 2012-2018. The SimGrid Team. * All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it @@ -51,7 +51,6 @@ void seed_loop(peer_t peer, double deadline); peer_t peer_init(int id, int seed); void peer_free(peer_t peer); -char* print_bitfield(unsigned int bitfield); int has_finished(unsigned int bitfield); void handle_message(peer_t peer, msg_task_t task); diff --git a/teshsuite/msg/app-chainsend/iterator.h b/teshsuite/msg/app-chainsend/iterator.h index 76ea952b05..4fa5415d0d 100644 --- a/teshsuite/msg/app-chainsend/iterator.h +++ b/teshsuite/msg/app-chainsend/iterator.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2012-2014. The SimGrid Team. +/* Copyright (c) 2012-2018. The SimGrid Team. * All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it @@ -22,14 +22,10 @@ typedef struct xbt_dynar_iterator_struct xbt_dynar_iterator_s; /* Iterator methods */ xbt_dynar_iterator_t xbt_dynar_iterator_new(xbt_dynar_t list, xbt_dynar_t (*criteria_fn)(int)); -void xbt_dynar_iterator_reset(xbt_dynar_iterator_t it); -void xbt_dynar_iterator_seek(xbt_dynar_iterator_t it, int pos); void* xbt_dynar_iterator_next(xbt_dynar_iterator_t it); void xbt_dynar_iterator_delete(xbt_dynar_iterator_t it); /* Iterator generators */ xbt_dynar_t forward_indices_list(int size); -xbt_dynar_t reverse_indices_list(int size); -xbt_dynar_t random_indices_list(int size); #endif /* ITERATOR_H */ -- 2.20.1