Commit 6302aad4 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 

Ingo, a man of few words, writes:
  "perf fixes:

   misc perf tooling fixes"

* 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  perf record: Use unmapped IP for inline callchain cursors
  perf python: Use -Wno-redundant-decls to build with PYTHON=python3
  perf report: Don't try to map ip to invalid map
  perf script python: Fix export-to-sqlite.py sample columns
  perf script python: Fix export-to-postgresql.py occasional failure
parents 9dcd936c c1883f10

tools/perf/scripts/python/export-to-postgresql.py

+9 −0
Original line number Diff line number Diff line
@@ -204,14 +204,23 @@ from ctypes import * 
libpq = CDLL("libpq.so.5")

PQconnectdb = libpq.PQconnectdb

PQconnectdb.restype = c_void_p

PQconnectdb.argtypes = [ c_char_p ]

PQfinish = libpq.PQfinish

PQfinish.argtypes = [ c_void_p ]

PQstatus = libpq.PQstatus

PQstatus.restype = c_int

PQstatus.argtypes = [ c_void_p ]

PQexec = libpq.PQexec

PQexec.restype = c_void_p

PQexec.argtypes = [ c_void_p, c_char_p ]

PQresultStatus = libpq.PQresultStatus

PQresultStatus.restype = c_int

PQresultStatus.argtypes = [ c_void_p ]

PQputCopyData = libpq.PQputCopyData

PQputCopyData.restype = c_int

PQputCopyData.argtypes = [ c_void_p, c_void_p, c_int ]

PQputCopyEnd = libpq.PQputCopyEnd

PQputCopyEnd.restype = c_int

PQputCopyEnd.argtypes = [ c_void_p, c_void_p ]



sys.path.append(os.environ['PERF_EXEC_PATH'] + \

tools/perf/scripts/python/export-to-sqlite.py

+5 −1
Original line number Diff line number Diff line
@@ -440,7 +440,11 @@ def branch_type_table(*x): 


def sample_table(*x):

	if branches:

		bind_exec(sample_query, 18, x)

		for xx in x[0:15]:

			sample_query.addBindValue(str(xx))

		for xx in x[19:22]:

			sample_query.addBindValue(str(xx))

		do_query_(sample_query)

	else:

		bind_exec(sample_query, 22, x)

tools/perf/util/machine.c

+5 −3
Original line number Diff line number Diff line
@@ -2286,7 +2286,8 @@ static int append_inlines(struct callchain_cursor *cursor, 
	if (!symbol_conf.inline_name || !map || !sym)

		return ret;



	addr = map__rip_2objdump(map, ip);

	addr = map__map_ip(map, ip);

	addr = map__rip_2objdump(map, addr);



	inline_node = inlines__tree_find(&map->dso->inlined_nodes, addr);

	if (!inline_node) {
@@ -2312,7 +2313,7 @@ static int unwind_entry(struct unwind_entry *entry, void *arg) 
{

	struct callchain_cursor *cursor = arg;

	const char *srcline = NULL;

	u64 addr;

	u64 addr = entry->ip;



	if (symbol_conf.hide_unresolved && entry->sym == NULL)

		return 0;
@@ -2324,6 +2325,7 @@ static int unwind_entry(struct unwind_entry *entry, void *arg) 
	 * Convert entry->ip from a virtual address to an offset in

	 * its corresponding binary.

	 */

	if (entry->map)

		addr = map__map_ip(entry->map, entry->ip);



	srcline = callchain_srcline(entry->map, entry->sym, addr);

tools/perf/util/setup.py

+1 −1
Original line number Diff line number Diff line
@@ -35,7 +35,7 @@ class install_lib(_install_lib): 


cflags = getenv('CFLAGS', '').split()

# switch off several checks (need to be at the end of cflags list)

cflags += ['-fno-strict-aliasing', '-Wno-write-strings', '-Wno-unused-parameter' ]

cflags += ['-fno-strict-aliasing', '-Wno-write-strings', '-Wno-unused-parameter', '-Wno-redundant-decls' ]

if cc != "clang":

    cflags += ['-Wno-cast-function-type' ]

CRA Git | Maintained and supported by SUSTech CRA and CCSE