From 55d640483c1100d9340418c3fb96390087f5e7c4 Mon Sep 17 00:00:00 2001 From: Edward Welbourne Date: Wed, 3 Oct 2018 14:05:24 +0200 Subject: Update 3rdparty valgrind headers to Valgrind 3.13.0 The version we're using is at least seven years old. Let's try staying up to date ... Change-Id: I450a2fc37c22740fe554a81b471bf0fad340498e Reviewed-by: Thiago Macieira --- src/testlib/3rdparty/callgrind_p.h | 60 +++++++++++++------------------------- 1 file changed, 21 insertions(+), 39 deletions(-) (limited to 'src/testlib/3rdparty/callgrind_p.h') diff --git a/src/testlib/3rdparty/callgrind_p.h b/src/testlib/3rdparty/callgrind_p.h index 10d79318c4..e971283616 100644 --- a/src/testlib/3rdparty/callgrind_p.h +++ b/src/testlib/3rdparty/callgrind_p.h @@ -13,7 +13,7 @@ This file is part of callgrind, a valgrind tool for cache simulation and call tree tracing. - Copyright (C) 2003-2007 Josef Weidendorfer. All rights reserved. + Copyright (C) 2003-2017 Josef Weidendorfer. All rights reserved. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions @@ -49,7 +49,7 @@ ---------------------------------------------------------------- Notice that the above BSD-style license applies to this one file - (vgprof.h) only. The entire rest of Valgrind is licensed under + (callgrind.h) only. The entire rest of Valgrind is licensed under the terms of the GNU General Public License, version 2. See the COPYING file in the source distribution for details. @@ -82,53 +82,38 @@ typedef } Vg_CallgrindClientRequest; /* Dump current state of cost centers, and zero them afterwards */ -#define CALLGRIND_DUMP_STATS \ - {unsigned int _qzz_res; \ - VALGRIND_DO_CLIENT_REQUEST(_qzz_res, 0, \ - VG_USERREQ__DUMP_STATS, \ - 0, 0, 0, 0, 0); \ - } +#define CALLGRIND_DUMP_STATS \ + VALGRIND_DO_CLIENT_REQUEST_STMT(VG_USERREQ__DUMP_STATS, \ + 0, 0, 0, 0, 0) /* Dump current state of cost centers, and zero them afterwards. The argument is appended to a string stating the reason which triggered the dump. This string is written as a description field into the profile data dump. */ -#define CALLGRIND_DUMP_STATS_AT(pos_str) \ - {unsigned int _qzz_res; \ - VALGRIND_DO_CLIENT_REQUEST(_qzz_res, 0, \ - VG_USERREQ__DUMP_STATS_AT, \ - pos_str, 0, 0, 0, 0); \ - } +#define CALLGRIND_DUMP_STATS_AT(pos_str) \ + VALGRIND_DO_CLIENT_REQUEST_STMT(VG_USERREQ__DUMP_STATS_AT, \ + pos_str, 0, 0, 0, 0) /* Zero cost centers */ -#define CALLGRIND_ZERO_STATS \ - {unsigned int _qzz_res; \ - VALGRIND_DO_CLIENT_REQUEST(_qzz_res, 0, \ - VG_USERREQ__ZERO_STATS, \ - 0, 0, 0, 0, 0); \ - } +#define CALLGRIND_ZERO_STATS \ + VALGRIND_DO_CLIENT_REQUEST_STMT(VG_USERREQ__ZERO_STATS, \ + 0, 0, 0, 0, 0) /* Toggles collection state. The collection state specifies whether the happening of events should be noted or if they are to be ignored. Events are noted by increment of counters in a cost center */ -#define CALLGRIND_TOGGLE_COLLECT \ - {unsigned int _qzz_res; \ - VALGRIND_DO_CLIENT_REQUEST(_qzz_res, 0, \ - VG_USERREQ__TOGGLE_COLLECT, \ - 0, 0, 0, 0, 0); \ - } +#define CALLGRIND_TOGGLE_COLLECT \ + VALGRIND_DO_CLIENT_REQUEST_STMT(VG_USERREQ__TOGGLE_COLLECT, \ + 0, 0, 0, 0, 0) /* Start full callgrind instrumentation if not already switched on. When cache simulation is done, it will flush the simulated cache; - this will lead to an artifical cache warmup phase afterwards with + this will lead to an artificial cache warmup phase afterwards with cache misses which would not have happened in reality. */ -#define CALLGRIND_START_INSTRUMENTATION \ - {unsigned int _qzz_res; \ - VALGRIND_DO_CLIENT_REQUEST(_qzz_res, 0, \ - VG_USERREQ__START_INSTRUMENTATION, \ - 0, 0, 0, 0, 0); \ - } +#define CALLGRIND_START_INSTRUMENTATION \ + VALGRIND_DO_CLIENT_REQUEST_STMT(VG_USERREQ__START_INSTRUMENTATION, \ + 0, 0, 0, 0, 0) /* Stop full callgrind instrumentation if not already switched off. This flushes Valgrinds translation cache, and does no additional @@ -137,11 +122,8 @@ typedef Use this to bypass Callgrind aggregation for uninteresting code parts. To start Callgrind in this mode to ignore the setup phase, use the option "--instr-atstart=no". */ -#define CALLGRIND_STOP_INSTRUMENTATION \ - {unsigned int _qzz_res; \ - VALGRIND_DO_CLIENT_REQUEST(_qzz_res, 0, \ - VG_USERREQ__STOP_INSTRUMENTATION, \ - 0, 0, 0, 0, 0); \ - } +#define CALLGRIND_STOP_INSTRUMENTATION \ + VALGRIND_DO_CLIENT_REQUEST_STMT(VG_USERREQ__STOP_INSTRUMENTATION, \ + 0, 0, 0, 0, 0) #endif /* __CALLGRIND_H */ -- cgit v1.2.3