A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rework how host-to-host comms are managed
[simgrid.git]
/
include
/
simgrid
/
Exception.hpp
diff --git
a/include/simgrid/Exception.hpp
b/include/simgrid/Exception.hpp
index
613c527
..
304295a
100644
(file)
--- a/
include/simgrid/Exception.hpp
+++ b/
include/simgrid/Exception.hpp
@@
-1,4
+1,4
@@
-/* Copyright (c) 2018-202
1
. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2018-202
2
. 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. */
/* 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. */
@@
-81,8
+81,8
@@
public:
/** Ancestor class of all SimGrid exception */
class Exception : public std::runtime_error {
public:
/** Ancestor class of all SimGrid exception */
class Exception : public std::runtime_error {
public:
- Exception(
const simgrid::xbt::ThrowPoint
& throwpoint, const std::string& message)
- : std::runtime_error(message), throwpoint_(
throwpoint
)
+ Exception(
simgrid::xbt::ThrowPoint&
& throwpoint, const std::string& message)
+ : std::runtime_error(message), throwpoint_(
std::move(throwpoint)
)
{
}
Exception(const Exception&) = default;
{
}
Exception(const Exception&) = default;
@@
-92,18
+92,21
@@
public:
/** Return the information about where the exception was thrown */
xbt::ThrowPoint const& throw_point() const { return throwpoint_; }
/** Return the information about where the exception was thrown */
xbt::ThrowPoint const& throw_point() const { return throwpoint_; }
+ /** Allow to carry a value (used by testany/waitany) */
+ ssize_t get_value() const { return value_; }
+ void set_value(ssize_t value) { value_ = value; }
+
std::string resolve_backtrace() const { return throwpoint_.backtrace_.resolve(); }
std::string resolve_backtrace() const { return throwpoint_.backtrace_.resolve(); }
- virtual void rethrow_nested(const simgrid::xbt::ThrowPoint& throwpoint, const std::string& message) const
+ XBT_ATTRIB_NORETURN virtual void rethrow_nested(simgrid::xbt::ThrowPoint&& throwpoint,
+ const std::string& message) const
{
{
- std::throw_with_nested(Exception(
throwpoint
, message));
+ std::throw_with_nested(Exception(
std::move(throwpoint)
, message));
}
}
- /** Allow to carry a value (used by waitall/waitany) */
- int value = 0;
-
private:
xbt::ThrowPoint throwpoint_;
private:
xbt::ThrowPoint throwpoint_;
+ ssize_t value_ = 0;
};
#define DECLARE_SIMGRID_EXCEPTION(AnyException, ...) \
};
#define DECLARE_SIMGRID_EXCEPTION(AnyException, ...) \
@@
-112,17
+115,16
@@
private:
using Exception::Exception; \
__VA_ARGS__ \
~AnyException() override; \
using Exception::Exception; \
__VA_ARGS__ \
~AnyException() override; \
- void rethrow_nested(const simgrid::xbt::ThrowPoint& throwpoint, const std::string& message) const override \
+ XBT_ATTRIB_NORETURN void rethrow_nested(simgrid::xbt::ThrowPoint&& throwpoint, \
+ const std::string& message) const override \
{ \
{ \
- std::throw_with_nested(AnyException(
throwpoint, message));
\
+ std::throw_with_nested(AnyException(
std::move(throwpoint), message));
\
} \
}
/** Exception raised when a timeout elapsed */
DECLARE_SIMGRID_EXCEPTION(TimeoutException);
} \
}
/** Exception raised when a timeout elapsed */
DECLARE_SIMGRID_EXCEPTION(TimeoutException);
-using TimeoutError XBT_ATTRIB_DEPRECATED_v328("Please use simgrid::TimeoutException") = TimeoutException;
-
/** Exception raised when a host fails */
DECLARE_SIMGRID_EXCEPTION(HostFailureException);
/** Exception raised when a host fails */
DECLARE_SIMGRID_EXCEPTION(HostFailureException);
@@
-192,7
+194,4
@@
private:
};
} // namespace simgrid
};
} // namespace simgrid
-
-using xbt_ex XBT_ATTRIB_DEPRECATED_v328("Please use simgrid::Exception") = simgrid::Exception;
-
#endif
#endif