X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/931c72e9293d64a1797a6187dd0e744408c23d59..047872771f0685df5ad0db3422b3333e26696330:/src/xbt/ex.cpp diff --git a/src/xbt/ex.cpp b/src/xbt/ex.cpp index 2ba06986dd..280c279f6a 100644 --- a/src/xbt/ex.cpp +++ b/src/xbt/ex.cpp @@ -1,103 +1,39 @@ /* 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 */ #include "xbt/ex.h" +#include #include "xbt/log.h" #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); - -void xbt_backtrace_display(xbt_backtrace_location_t* loc, std::size_t count) -{ -#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 -} +xbt_ex::~xbt_ex() = default; -void xbt_throw( - char* message, xbt_errcat_t errcat, int value, - const char* file, int line, const char* func) +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; } @@ -139,13 +75,16 @@ 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 +#include XBT_TEST_SUITE("xbt_ex", "Exception Handling"); @@ -216,7 +155,7 @@ XBT_TEST_UNIT("variables", test_variables, "variable value preservation") { xbt_ex_t ex; int r1; - int XBT_ATTRIB_UNUSED r2; + XBT_ATTRIB_UNUSED int r2; int v1; int v2; @@ -257,10 +196,10 @@ XBT_TEST_UNIT("cleanup", test_cleanup, "cleanup handling") c = 1; if (v1 != 5678) xbt_test_fail("v1 = %d (!= 5678)", v1); - if (!(ex.category == 1 && ex.value == 2 && !strcmp(ex.what(), "blah"))) + if (not(ex.category == 1 && ex.value == 2 && not strcmp(ex.what(), "blah"))) xbt_test_fail("unexpected exception contents"); } - if (!c) + if (not c) xbt_test_fail("xbt_ex_free not executed"); } #endif /* SIMGRID_TEST */