From d7bc42299b363a112f3b8154e95cd80706cda6d2 Mon Sep 17 00:00:00 2001 From: Arnaud Giersch Date: Tue, 6 Dec 2022 17:03:08 +0100 Subject: [PATCH] Kill unimplemented declarations. --- examples/c/dht-kademlia/message.h | 2 -- include/simgrid/s4u/Engine.hpp | 2 -- include/smpi/smpi.h | 1 - src/bindings/java/JavaContext.hpp | 1 - src/bindings/java/jmsg.hpp | 2 -- src/bindings/java/jmsg_task.h | 1 - src/bindings/java/jtrace.h | 8 -------- src/instr/instr_private.hpp | 8 ++++---- src/mc/mc_private.hpp | 3 --- src/mc/udpor_global.hpp | 3 ++- src/smpi/colls/bcast/bcast-mvapich-smp.cpp | 1 - src/smpi/include/smpi_comm.hpp | 1 - src/smpi/include/smpi_datatype.hpp | 3 --- src/surf/surf_interface.hpp | 1 - 14 files changed, 6 insertions(+), 31 deletions(-) diff --git a/examples/c/dht-kademlia/message.h b/examples/c/dht-kademlia/message.h index 213d9dd34b..567b24770e 100644 --- a/examples/c/dht-kademlia/message.h +++ b/examples/c/dht-kademlia/message.h @@ -23,8 +23,6 @@ typedef s_kademlia_message_t* kademlia_message_t; typedef const s_kademlia_message_t* const_kademlia_message_t; // Task handling functions -kademlia_message_t task_new_find_node(unsigned int sender_id, unsigned int destination_id, sg_mailbox_t mailbox, - const char* hostname); kademlia_message_t new_message(unsigned int sender_id, unsigned int destination_id, answer_t answer, sg_mailbox_t mailbox, const char* hostname); void free_message(void* message); diff --git a/include/simgrid/s4u/Engine.hpp b/include/simgrid/s4u/Engine.hpp index d20ae12114..56af65fe32 100644 --- a/include/simgrid/s4u/Engine.hpp +++ b/include/simgrid/s4u/Engine.hpp @@ -105,8 +105,6 @@ protected: friend kernel::routing::NetZoneImpl; friend kernel::resource::HostImpl; friend kernel::resource::StandardLinkImpl; - void host_register(const std::string& name, Host* host); - void host_unregister(const std::string& name); void netpoint_register(simgrid::kernel::routing::NetPoint* card); void netpoint_unregister(simgrid::kernel::routing::NetPoint* card); void set_netzone_root(const NetZone* netzone); diff --git a/include/smpi/smpi.h b/include/smpi/smpi.h index 468b31e6e3..cf14a3fde8 100644 --- a/include/smpi/smpi.h +++ b/include/smpi/smpi.h @@ -1138,7 +1138,6 @@ MPI_CALL(XBT_PUBLIC int, MPI_Status_c2f, (MPI_Status *c_status, MPI_Fint *f_stat //FIXME: End of all the not yet implemented stuff // smpi functions -XBT_PUBLIC int smpi_global_size(); XBT_PUBLIC MPI_Comm smpi_process_comm_self(); XBT_PUBLIC MPI_Info smpi_process_info_env(); XBT_PUBLIC void* smpi_process_get_user_data(); diff --git a/src/bindings/java/JavaContext.hpp b/src/bindings/java/JavaContext.hpp index 52598c626d..7387c7e9f2 100644 --- a/src/bindings/java/JavaContext.hpp +++ b/src/bindings/java/JavaContext.hpp @@ -42,7 +42,6 @@ public: void run_all(std::vector const& actors) override; }; -XBT_PRIVATE ContextFactory* java_factory(); XBT_PRIVATE void java_main_jprocess(jobject process); } // namespace simgrid::kernel::context diff --git a/src/bindings/java/jmsg.hpp b/src/bindings/java/jmsg.hpp index 49fb4c90dd..255692742a 100644 --- a/src/bindings/java/jmsg.hpp +++ b/src/bindings/java/jmsg.hpp @@ -35,8 +35,6 @@ JNIEXPORT void JNICALL JNICALL Java_org_simgrid_msg_Msg_run(JNIEnv* env, jclass JNIEXPORT void JNICALL Java_org_simgrid_msg_Msg_init(JNIEnv* env, jclass cls, jobjectArray jargs); JNIEXPORT void JNICALL Java_org_simgrid_msg_Msg_energyInit(); -JNIEXPORT void JNICALL Java_org_simgrid_msg_Msg_liveMigrationInit(); -JNIEXPORT void JNICALL Java_org_simgrid_msg_Msg_fileSystemInit(); JNIEXPORT void JNICALL Java_org_simgrid_msg_Msg_loadInit(); JNIEXPORT void JNICALL Java_org_simgrid_msg_Msg_debug(JNIEnv* env, jclass cls, jstring jargs); diff --git a/src/bindings/java/jmsg_task.h b/src/bindings/java/jmsg_task.h index 9384815f84..3b7d064048 100644 --- a/src/bindings/java/jmsg_task.h +++ b/src/bindings/java/jmsg_task.h @@ -57,7 +57,6 @@ JNIEXPORT void JNICALL Java_org_simgrid_msg_Task_dsend(JNIEnv* env, jobject jtas JNIEXPORT void JNICALL Java_org_simgrid_msg_Task_dsendBounded(JNIEnv* env, jobject jtask, jstring jalias, jdouble maxrate); JNIEXPORT jboolean JNICALL Java_org_simgrid_msg_Task_listen(JNIEnv* env, jclass cls, jstring jalias); -JNIEXPORT jint JNICALL Java_org_simgrid_msg_Task_listenFromHost(JNIEnv* env, jclass cls, jstring jalias, jobject jhost); JNIEXPORT jint JNICALL Java_org_simgrid_msg_Task_listenFrom(JNIEnv* env, jclass cls, jstring jalias); SG_END_DECL diff --git a/src/bindings/java/jtrace.h b/src/bindings/java/jtrace.h index 626d40d1d3..3ba9e3eaf8 100644 --- a/src/bindings/java/jtrace.h +++ b/src/bindings/java/jtrace.h @@ -25,8 +25,6 @@ extern "C" { #endif JNIEXPORT void JNICALL Java_org_simgrid_trace_Trace_hostVariableDeclare (JNIEnv *env, jclass cls, jstring jvar); JNIEXPORT void JNICALL Java_org_simgrid_trace_Trace_vmVariableDeclare (JNIEnv *env, jclass cls, jstring jvar); -JNIEXPORT void JNICALL Java_org_simgrid_trace_Trace_hostVariableDeclareWithColor (JNIEnv *env, jclass cls, jstring jvar, - jstring jcolor); JNIEXPORT void JNICALL Java_org_simgrid_trace_Trace_hostVariableSet (JNIEnv *env, jclass cls, jstring js_host, jstring jvar, jdouble value); JNIEXPORT void JNICALL Java_org_simgrid_trace_Trace_vmVariableSet (JNIEnv *env, jclass cls, jstring js_wn, @@ -35,20 +33,14 @@ JNIEXPORT void JNICALL Java_org_simgrid_trace_Trace_hostVariableAdd (JNIEnv *env jstring jvar, jdouble value); JNIEXPORT void JNICALL Java_org_simgrid_trace_Trace_hostVariableSub (JNIEnv *env, jclass cls, jstring js_host, jstring jvar, jdouble value); -JNIEXPORT jobjectArray JNICALL Java_org_simgrid_trace_Trace_getHostVariablesName (JNIEnv *env, jclass cls); JNIEXPORT void JNICALL Java_org_simgrid_trace_Trace_linkVariableDeclare (JNIEnv *env, jclass cls, jstring jvar); JNIEXPORT void JNICALL Java_org_simgrid_trace_Trace_linkVariableDeclareWithColor (JNIEnv *env, jclass cls, jstring jvar, jstring jcolor); JNIEXPORT void JNICALL Java_org_simgrid_trace_Trace_linkVariableSet (JNIEnv *env, jclass cls, jstring jlink, jstring jvar, jdouble jvalue); -JNIEXPORT void JNICALL Java_org_simgrid_trace_Trace_linkVariableAdd (JNIEnv *env, jclass cls, jstring jlink, - jstring jvar, jdouble jvalue); -JNIEXPORT void JNICALL Java_org_simgrid_trace_Trace_linkVariableSub (JNIEnv *env, jclass cls, jstring jlink, - jstring jvar, jdouble jvalue); JNIEXPORT void JNICALL Java_org_simgrid_trace_Trace_linkSrcDstVariableSet (JNIEnv *env, jclass cls, jstring jsrc, jstring jdst, jstring jvar, jdouble jvalue); -JNIEXPORT jobjectArray JNICALL Java_org_simgrid_trace_Trace_getLinkVariablesName (JNIEnv *env, jclass cls); JNIEXPORT void JNICALL Java_org_simgrid_trace_Trace_hostStateDeclare(JNIEnv * env, jclass cls, jstring js); JNIEXPORT void JNICALL Java_org_simgrid_trace_Trace_hostStateDeclareValue (JNIEnv *env, jclass cls, jstring js_state, diff --git a/src/instr/instr_private.hpp b/src/instr/instr_private.hpp index e3116555c8..6538be1f7c 100644 --- a/src/instr/instr_private.hpp +++ b/src/instr/instr_private.hpp @@ -68,20 +68,20 @@ public: // NoOpTI: init, finalize, test, wait, barrier class NoOpTIData : public TIData { - explicit NoOpTIData(const std::string&, double); // disallow this constructor inherited from TIData - public: using TIData::TIData; + explicit NoOpTIData(const std::string&, double) = delete; // disallow this constructor inherited from TIData + std::string print() override { return get_name(); } std::string display_size() override { return "NA"; } }; // CPuTI: compute, sleep (+ waitAny and waitall out of laziness) class CpuTIData : public TIData { - explicit CpuTIData(const std::string&); // disallow this constructor inherited from TIData - public: using TIData::TIData; + explicit CpuTIData(const std::string&) = delete; // disallow this constructor inherited from TIData + std::string print() override { std::stringstream stream; diff --git a/src/mc/mc_private.hpp b/src/mc/mc_private.hpp index b3168d11f9..86f47a63cb 100644 --- a/src/mc/mc_private.hpp +++ b/src/mc/mc_private.hpp @@ -18,9 +18,6 @@ namespace simgrid::mc { XBT_PRIVATE void find_object_address(std::vector const& maps, simgrid::mc::ObjectInformation* result); -XBT_PRIVATE -bool snapshot_equal(const Snapshot* s1, const Snapshot* s2); - } // namespace simgrid::mc #endif diff --git a/src/mc/udpor_global.hpp b/src/mc/udpor_global.hpp index 60a6eb0947..4cd45d9e78 100644 --- a/src/mc/udpor_global.hpp +++ b/src/mc/udpor_global.hpp @@ -10,6 +10,8 @@ #include #include +/* TODO: many method declared in this module are not implemented */ + namespace simgrid::mc { class UnfoldingEvent; @@ -74,7 +76,6 @@ public: bool isImmediateConflict1(UnfoldingEvent* evt, UnfoldingEvent* otherEvt) const; bool conflictWithConfig(UnfoldingEvent* event, Configuration const& config) const; - /* TODO: implement */ bool operator==(const UnfoldingEvent&) const { return false; }; void print() const; diff --git a/src/smpi/colls/bcast/bcast-mvapich-smp.cpp b/src/smpi/colls/bcast/bcast-mvapich-smp.cpp index 50ea2ae39e..d19298c42e 100644 --- a/src/smpi/colls/bcast/bcast-mvapich-smp.cpp +++ b/src/smpi/colls/bcast/bcast-mvapich-smp.cpp @@ -48,7 +48,6 @@ extern int mv2_pipelined_zcpy_knomial_factor; extern int bcast_segment_size; extern int mv2_inter_node_knomial_factor; extern int mv2_intra_node_knomial_factor; -extern int mv2_bcast_two_level_system_size; #define INTRA_NODE_ROOT 0 #define MPIR_Pipelined_Bcast_Zcpy_MV2 bcast__mpich diff --git a/src/smpi/include/smpi_comm.hpp b/src/smpi/include/smpi_comm.hpp index dcab19ec98..e25dcd3b35 100644 --- a/src/smpi/include/smpi_comm.hpp +++ b/src/smpi/include/smpi_comm.hpp @@ -88,7 +88,6 @@ public: static int keyval_create(MPI_Comm_copy_attr_function* copy_fn, MPI_Comm_delete_attr_function* delete_fn, int* keyval, void* extra_state); static int keyval_free(int* keyval); - static void keyval_cleanup(); void add_rma_win(MPI_Win win); void remove_rma_win(MPI_Win win); diff --git a/src/smpi/include/smpi_datatype.hpp b/src/smpi/include/smpi_datatype.hpp index fbf6a29c12..eff0282b88 100644 --- a/src/smpi/include/smpi_datatype.hpp +++ b/src/smpi/include/smpi_datatype.hpp @@ -154,9 +154,6 @@ public: virtual int clone(MPI_Datatype* type); virtual void serialize(const void* noncontiguous, void* contiguous, int count); virtual void unserialize(const void* contiguous, void* noncontiguous, int count, MPI_Op op); - static int keyval_create(MPI_Type_copy_attr_function* copy_fn, MPI_Type_delete_attr_function* delete_fn, int* keyval, - void* extra_state); - static int keyval_free(int* keyval); int pack(const void* inbuf, int incount, void* outbuf, int outcount, int* position, const Comm* comm); int unpack(const void* inbuf, int insize, int* position, void* outbuf, int outcount, const Comm* comm); int get_contents(int max_integers, int max_addresses, int max_datatypes, int* array_of_integers, diff --git a/src/surf/surf_interface.hpp b/src/surf/surf_interface.hpp index 87bee13be9..ba29b70cd4 100644 --- a/src/surf/surf_interface.hpp +++ b/src/surf/surf_interface.hpp @@ -75,7 +75,6 @@ static inline int double_equals(double value1, double value2, double precision) */ XBT_PUBLIC void surf_cpu_model_init_Cas01(); -XBT_ATTRIB_DEPRECATED_v337 ("Please use surf_disk_model_init_S19()") XBT_PUBLIC void surf_disk_model_init_default(); XBT_PUBLIC void surf_disk_model_init_S19(); /** @ingroup SURF_models -- 2.20.1