/** 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;
xbt::ThrowPoint const& throw_point() const { return throwpoint_; }
/** Allow to carry a value (used by testany/waitany) */
- int get_value() const { return value_; }
- void set_value(int value) { value_ = value; }
+ ssize_t get_value() const { return value_; }
+ void set_value(ssize_t value) { value_ = value; }
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));
}
private:
xbt::ThrowPoint throwpoint_;
- int value_ = 0;
+ ssize_t value_ = 0;
};
#define DECLARE_SIMGRID_EXCEPTION(AnyException, ...) \
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);
-using TimeoutError XBT_ATTRIB_DEPRECATED_v328("Please use simgrid::TimeoutException") = TimeoutException;
-
/** Exception raised when a host fails */
DECLARE_SIMGRID_EXCEPTION(HostFailureException);
};
} // namespace simgrid
-
-using xbt_ex XBT_ATTRIB_DEPRECATED_v328("Please use simgrid::Exception") = simgrid::Exception;
-
#endif