From cc2da83df25402a015e058c475ed44a82fe18900 Mon Sep 17 00:00:00 2001 From: Martin Quinson Date: Tue, 25 Jul 2023 00:53:44 +0200 Subject: [PATCH] Fix make distcheck --- MANIFEST.in | 2 +- include/simgrid/activity_set.h | 31 +++++++++++++++++++++++++++++++ tools/cmake/DefinePackages.cmake | 2 +- 3 files changed, 33 insertions(+), 2 deletions(-) create mode 100644 include/simgrid/activity_set.h diff --git a/MANIFEST.in b/MANIFEST.in index 0b78a8e0ef..5a99b931c2 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -1912,7 +1912,7 @@ include examples/smpi/replay_multiple_manual_deploy/CMakeLists.txt include examples/smpi/smpi_s4u_masterworker/CMakeLists.txt include examples/sthread/CMakeLists.txt include include/simgrid/Exception.hpp -include include/simgrid/activityset.h +include include/simgrid/activity_set.h include include/simgrid/actor.h include include/simgrid/barrier.h include include/simgrid/chrono.hpp diff --git a/include/simgrid/activity_set.h b/include/simgrid/activity_set.h new file mode 100644 index 0000000000..9028407bfc --- /dev/null +++ b/include/simgrid/activity_set.h @@ -0,0 +1,31 @@ +/* Copyright (c) 2018-2023. 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 INCLUDE_SIMGRID_ACTIVITY_SET_H +#define INCLUDE_SIMGRID_ACTIVITY_SET_H + +#include +#include /* ssize_t */ + +/* C interface */ +SG_BEGIN_DECL + +XBT_PUBLIC sg_activity_set_t sg_activity_set_init(); +XBT_PUBLIC void sg_activity_set_push(sg_activity_set_t as, sg_activity_t acti); +XBT_PUBLIC void sg_activity_set_erase(sg_activity_set_t as, sg_activity_t acti); +XBT_PUBLIC size_t sg_activity_set_size(sg_activity_set_t as); +XBT_PUBLIC int sg_activity_set_empty(sg_activity_set_t as); + +XBT_PUBLIC sg_activity_t sg_activity_set_test_any(sg_activity_set_t as); +XBT_PUBLIC void sg_activity_set_wait_all(sg_activity_set_t as); +/** Returns true if it terminated successfully (or false on timeout) */ +XBT_PUBLIC int sg_activity_set_wait_all_for(sg_activity_set_t as, double timeout); +XBT_PUBLIC sg_activity_t sg_activity_set_wait_any(sg_activity_set_t as); +XBT_PUBLIC sg_activity_t sg_activity_set_wait_any_for(sg_activity_set_t as, double timeout); +XBT_PUBLIC void sg_activity_set_delete(sg_activity_set_t as); + +SG_END_DECL + +#endif /* INCLUDE_SIMGRID_ACTIVITY_SET_H */ diff --git a/tools/cmake/DefinePackages.cmake b/tools/cmake/DefinePackages.cmake index 54562848b9..073f393a9d 100644 --- a/tools/cmake/DefinePackages.cmake +++ b/tools/cmake/DefinePackages.cmake @@ -649,7 +649,7 @@ set(MC_SIMGRID_MC_SRC src/mc/explo/simgrid_mc.cpp) set(headers_to_install include/simgrid/actor.h - include/simgrid/activityset.h + include/simgrid/activity_set.h include/simgrid/barrier.h include/simgrid/comm.h include/simgrid/engine.h -- 2.20.1