X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/1555ef43eee251e5892a2f7fd49bc96e99d68fef..51c23076e2b42ff07dc167dea1cb0e3a4ab3cf68:/src/xbt/ex.cpp diff --git a/src/xbt/ex.cpp b/src/xbt/ex.cpp index 0c11397a21..add5c21d91 100644 --- a/src/xbt/ex.cpp +++ b/src/xbt/ex.cpp @@ -1,49 +1,12 @@ /* ex - Exception Handling */ -/* Copyright (c) 2005-2015. The SimGrid Team. - * All rights reserved. */ +/* Copyright (c) 2005-2018. The SimGrid Team. All rights reserved. */ -/* Copyright (c) 2002-2004 Ralf S. Engelschall */ -/* Copyright (c) 2002-2004 The OSSP Project */ -/* Copyright (c) 2002-2004 Cable & Wireless */ -/* 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 code is inspirated from the OSSP version (as retrieved back in 2004)*/ -/* It was heavily modified to fit the SimGrid framework. */ - -/* The OSSP version has the following copyright notice: -** OSSP ex - Exception Handling -** Copyright (c) 2002-2004 Ralf S. Engelschall -** Copyright (c) 2002-2004 The OSSP Project -** Copyright (c) 2002-2004 Cable & Wireless -** -** This file is part of OSSP ex, an exception handling library -** which can be found at http://www.ossp.org/pkg/lib/ex/. -** -** Permission to use, copy, modify, and distribute this software for -** any purpose with or without fee is hereby granted, provided that -** the above copyright notice and this permission notice appear in all -** copies. -** -** THIS SOFTWARE IS PROVIDED `AS IS'' AND ANY EXPRESSED OR IMPLIED -** WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -** MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. -** IN NO EVENT SHALL THE AUTHORS AND COPYRIGHT HOLDERS AND THEIR -** CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF -** USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND -** ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -** OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT -** OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF -** SUCH DAMAGE. - */ - -/* The extensions made for the SimGrid project can either be distributed */ -/* under the same license, or under the LGPL v2.1 */ - -#include -#include +#include +#include #include #include "src/internal_config.h" /* execinfo when available */ @@ -53,52 +16,24 @@ #include "xbt/log.hpp" #include "xbt/backtrace.h" #include "xbt/backtrace.hpp" -#include "xbt/str.h" -#include "xbt/synchro_core.h" #include "src/xbt_modinter.h" /* backtrace initialization headers */ -#include "src/xbt/ex_interface.h" -#include "simgrid/sg_config.h" /* Configuration mechanism of SimGrid */ - -#include "simgrid/simix.h" /* SIMIX_process_self_get_name() */ - +#include "simgrid/sg_config.hpp" /* Configuration mechanism of SimGrid */ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(xbt_ex, xbt, "Exception mechanism"); -xbt_ex::~xbt_ex() {} +// DO NOT define ~xbt_ex() in ex.hpp. +// Defining it here ensures that xbt_ex is defined only in libsimgrid, but not in libsimgrid-java. +// Doing otherwise naturally breaks things (at least on freebsd with clang). -/* Change raw libc symbols to file names and line numbers */ -void xbt_setup_backtrace(xbt_backtrace_location_t** loc, std::size_t count, - char** res); +xbt_ex::~xbt_ex() = default; -void xbt_backtrace_display(xbt_backtrace_location_t* loc, std::size_t count) +void _xbt_throw(char* message, xbt_errcat_t errcat, int value, const char* file, int line, const char* func) { -#ifdef HAVE_BACKTRACE - std::vector backtrace = - simgrid::xbt::resolveBacktrace(loc, count); - if (backtrace.empty()) { - fprintf(stderr, "(backtrace not set)\n"); - return; - } - fprintf(stderr, "Backtrace (displayed in process %s):\n", SIMIX_process_self_get_name()); - for (std::string const& s : backtrace) - fprintf(stderr, "---> %s\n", s.c_str()); -#else - XBT_ERROR("No backtrace on this arch"); -#endif -} - -void xbt_throw( - char* message, xbt_errcat_t errcat, int value, - const char* file, int line, const char* func) -{ - xbt_ex e(message); - free(message); + xbt_ex e(simgrid::xbt::ThrowPoint(file, line, func), message); + xbt_free(message); e.category = errcat; e.value = value; - e.file = file; - e.line = line; - e.func = func; throw e; } @@ -140,129 +75,8 @@ const char *xbt_ex_catname(xbt_errcat_t cat) return "io error"; case vm_error: return "vm error"; + default: + return "INVALID ERROR"; } return "INVALID ERROR"; } - -#ifdef SIMGRID_TEST -#include -#include "xbt/ex.h" -#include - -XBT_TEST_SUITE("xbt_ex", "Exception Handling"); - -XBT_TEST_UNIT("controlflow", test_controlflow, "basic nested control flow") -{ - xbt_ex_t ex; - int n = 1; - - xbt_test_add("basic nested control flow"); - - try { - if (n != 1) - xbt_test_fail("M1: n=%d (!= 1)", n); - n++; - try { - if (n != 2) - xbt_test_fail("M2: n=%d (!= 2)", n); - n++; - THROWF(unknown_error, 0, "something"); - } - catch (xbt_ex& ex) { - if (n != 3) - xbt_test_fail("M3: n=%d (!= 3)", n); - n++; - } - n++; - try { - if (n != 5) - xbt_test_fail("M2: n=%d (!= 5)", n); - n++; - THROWF(unknown_error, 0, "something"); - } - catch(xbt_ex& ex){ - if (n != 6) - xbt_test_fail("M3: n=%d (!= 6)", n); - n++; - throw; - n++; - } - xbt_test_fail("MX: n=%d (shouldn't reach this point)", n); - } - catch(xbt_ex& e) { - if (n != 7) - xbt_test_fail("M4: n=%d (!= 7)", n); - n++; - } - if (n != 8) - xbt_test_fail("M5: n=%d (!= 8)", n); -} - -XBT_TEST_UNIT("value", test_value, "exception value passing") -{ - try { - THROWF(unknown_error, 2, "toto"); - } - catch (xbt_ex& ex) { - xbt_test_add("exception value passing"); - if (ex.category != unknown_error) - xbt_test_fail("category=%d (!= 1)", (int)ex.category); - if (ex.value != 2) - xbt_test_fail("value=%d (!= 2)", ex.value); - if (strcmp(ex.what(), "toto")) - xbt_test_fail("message=%s (!= toto)", ex.what()); - } -} - -XBT_TEST_UNIT("variables", test_variables, "variable value preservation") -{ - xbt_ex_t ex; - int r1; - int XBT_ATTRIB_UNUSED r2; - int v1; - int v2; - - r1 = r2 = v1 = v2 = 1234; - try { - r2 = 5678; - v2 = 5678; - THROWF(unknown_error, 0, "toto"); - } - catch(xbt_ex& e) { - xbt_test_add("variable preservation"); - if (r1 != 1234) - xbt_test_fail("r1=%d (!= 1234)", r1); - if (v1 != 1234) - xbt_test_fail("v1=%d (!= 1234)", v1); - /* r2 is allowed to be destroyed because not volatile */ - if (v2 != 5678) - xbt_test_fail("v2=%d (!= 5678)", v2); - } -} - -XBT_TEST_UNIT("cleanup", test_cleanup, "cleanup handling") -{ - int v1; - int c; - - xbt_test_add("cleanup handling"); - - v1 = 1234; - c = 0; - try { - v1 = 5678; - THROWF(1, 2, "blah"); - } - catch (xbt_ex& ex) { - if (v1 != 5678) - xbt_test_fail("v1 = %d (!= 5678)", v1); - c = 1; - if (v1 != 5678) - xbt_test_fail("v1 = %d (!= 5678)", v1); - if (!(ex.category == 1 && ex.value == 2 && !strcmp(ex.what(), "blah"))) - xbt_test_fail("unexpected exception contents"); - } - if (!c) - xbt_test_fail("xbt_ex_free not executed"); -} -#endif /* SIMGRID_TEST */