Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ea7c2851 authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge tag 'perf-core-for-mingo-20160506' of... 

Merge tag 'perf-core-for-mingo-20160506' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux

 into perf/core

Pull perf/core improvements and fixes from Arnaldo Carvalho de Melo:

User visible changes:

- Fix ordering of kernel/user entries in 'caller' mode, where the kernel and
  user parts were being correctly inverted but kept in place wrt each other,
  i.e. 'callee' (k1, k2, u3, u4) became 'caller' (k2, k1, u4, u3) when it
  should be 'caller' (u4, u3, k2, k1) (Chris Phlipot)

- In 'perf trace' don't print the raw arg syscall args for a syscall that has
  no arguments, like gettid(). This was happening because just checking if
  the syscall args list is NULL may mean that there are no args (e.g.: gettid)
  or that there is no tracepoint info (e.g.: clone) (Arnaldo Carvalho de Melo)

- Add extra output of counter values with 'perf stat -vv' (Andi Kleen)

Infrastructure changes:

- Expose callchain db export via the python API (Chris Phlipot)

Code reorganization:

- Move some more syscall arg beautifiers from the 'perf trace' main file to
  separate files in tools/perf/trace/beauty/, to reduce the main file line
  count (Arnaldo Carvalho de Melo)

Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parents c0edb746 d5d71e86

tools/perf/builtin-stat.c

+8 −0
Original line number Diff line number Diff line
@@ -298,6 +298,14 @@ static int read_counter(struct perf_evsel *counter) 
					return -1;

				}

			}



			if (verbose > 1) {

				fprintf(stat_config.output,

					"%s: %d: %" PRIu64 " %" PRIu64 " %" PRIu64 "\n",

						perf_evsel__name(counter),

						cpu,

						count->val, count->ena, count->run);

			}

		}

	}

tools/perf/builtin-trace.c

+10 −155
Original line number Diff line number Diff line
@@ -40,7 +40,6 @@ 


#include <libaudit.h> /* FIXME: Still needed for audit_errno_to_name */

#include <stdlib.h>

#include <linux/futex.h>

#include <linux/err.h>

#include <linux/seccomp.h>

#include <linux/filter.h>
@@ -401,49 +400,6 @@ static size_t syscall_arg__scnprintf_flock(char *bf, size_t size, 


#define SCA_FLOCK syscall_arg__scnprintf_flock



static size_t syscall_arg__scnprintf_futex_op(char *bf, size_t size, struct syscall_arg *arg)

{

	enum syscall_futex_args {

		SCF_UADDR   = (1 << 0),

		SCF_OP	    = (1 << 1),

		SCF_VAL	    = (1 << 2),

		SCF_TIMEOUT = (1 << 3),

		SCF_UADDR2  = (1 << 4),

		SCF_VAL3    = (1 << 5),

	};

	int op = arg->val;

	int cmd = op & FUTEX_CMD_MASK;

	size_t printed = 0;



	switch (cmd) {

#define	P_FUTEX_OP(n) case FUTEX_##n: printed = scnprintf(bf, size, #n);

	P_FUTEX_OP(WAIT);	    arg->mask |= SCF_VAL3|SCF_UADDR2;		  break;

	P_FUTEX_OP(WAKE);	    arg->mask |= SCF_VAL3|SCF_UADDR2|SCF_TIMEOUT; break;

	P_FUTEX_OP(FD);		    arg->mask |= SCF_VAL3|SCF_UADDR2|SCF_TIMEOUT; break;

	P_FUTEX_OP(REQUEUE);	    arg->mask |= SCF_VAL3|SCF_TIMEOUT;	          break;

	P_FUTEX_OP(CMP_REQUEUE);    arg->mask |= SCF_TIMEOUT;			  break;

	P_FUTEX_OP(CMP_REQUEUE_PI); arg->mask |= SCF_TIMEOUT;			  break;

	P_FUTEX_OP(WAKE_OP);							  break;

	P_FUTEX_OP(LOCK_PI);	    arg->mask |= SCF_VAL3|SCF_UADDR2|SCF_TIMEOUT; break;

	P_FUTEX_OP(UNLOCK_PI);	    arg->mask |= SCF_VAL3|SCF_UADDR2|SCF_TIMEOUT; break;

	P_FUTEX_OP(TRYLOCK_PI);	    arg->mask |= SCF_VAL3|SCF_UADDR2;		  break;

	P_FUTEX_OP(WAIT_BITSET);    arg->mask |= SCF_UADDR2;			  break;

	P_FUTEX_OP(WAKE_BITSET);    arg->mask |= SCF_UADDR2;			  break;

	P_FUTEX_OP(WAIT_REQUEUE_PI);						  break;

	default: printed = scnprintf(bf, size, "%#x", cmd);			  break;

	}



	if (op & FUTEX_PRIVATE_FLAG)

		printed += scnprintf(bf + printed, size - printed, "|PRIV");



	if (op & FUTEX_CLOCK_REALTIME)

		printed += scnprintf(bf + printed, size - printed, "|CLKRT");



	return printed;

}



#define SCA_FUTEX_OP  syscall_arg__scnprintf_futex_op



static const char *bpf_cmd[] = {

	"MAP_CREATE", "MAP_LOOKUP_ELEM", "MAP_UPDATE_ELEM", "MAP_DELETE_ELEM",

	"MAP_GET_NEXT_KEY", "PROG_LOAD",
@@ -542,62 +498,6 @@ static size_t syscall_arg__scnprintf_filename(char *bf, size_t size, 


#define SCA_FILENAME syscall_arg__scnprintf_filename



static size_t syscall_arg__scnprintf_open_flags(char *bf, size_t size,

					       struct syscall_arg *arg)

{

	int printed = 0, flags = arg->val;



	if (!(flags & O_CREAT))

		arg->mask |= 1 << (arg->idx + 1); /* Mask the mode parm */



	if (flags == 0)

		return scnprintf(bf, size, "RDONLY");

#define	P_FLAG(n) \

	if (flags & O_##n) { \

		printed += scnprintf(bf + printed, size - printed, "%s%s", printed ? "|" : "", #n); \

		flags &= ~O_##n; \

	}



	P_FLAG(APPEND);

	P_FLAG(ASYNC);

	P_FLAG(CLOEXEC);

	P_FLAG(CREAT);

	P_FLAG(DIRECT);

	P_FLAG(DIRECTORY);

	P_FLAG(EXCL);

	P_FLAG(LARGEFILE);

	P_FLAG(NOATIME);

	P_FLAG(NOCTTY);

#ifdef O_NONBLOCK

	P_FLAG(NONBLOCK);

#elif O_NDELAY

	P_FLAG(NDELAY);

#endif

#ifdef O_PATH

	P_FLAG(PATH);

#endif

	P_FLAG(RDWR);

#ifdef O_DSYNC

	if ((flags & O_SYNC) == O_SYNC)

		printed += scnprintf(bf + printed, size - printed, "%s%s", printed ? "|" : "", "SYNC");

	else {

		P_FLAG(DSYNC);

	}

#else

	P_FLAG(SYNC);

#endif

	P_FLAG(TRUNC);

	P_FLAG(WRONLY);

#undef P_FLAG



	if (flags)

		printed += scnprintf(bf + printed, size - printed, "%s%#x", printed ? "|" : "", flags);



	return printed;

}



#define SCA_OPEN_FLAGS syscall_arg__scnprintf_open_flags



static size_t syscall_arg__scnprintf_pipe_flags(char *bf, size_t size,

						struct syscall_arg *arg)

{
@@ -621,59 +521,6 @@ static size_t syscall_arg__scnprintf_pipe_flags(char *bf, size_t size, 


#define SCA_PIPE_FLAGS syscall_arg__scnprintf_pipe_flags



static size_t syscall_arg__scnprintf_signum(char *bf, size_t size, struct syscall_arg *arg)

{

	int sig = arg->val;



	switch (sig) {

#define	P_SIGNUM(n) case SIG##n: return scnprintf(bf, size, #n)

	P_SIGNUM(HUP);

	P_SIGNUM(INT);

	P_SIGNUM(QUIT);

	P_SIGNUM(ILL);

	P_SIGNUM(TRAP);

	P_SIGNUM(ABRT);

	P_SIGNUM(BUS);

	P_SIGNUM(FPE);

	P_SIGNUM(KILL);

	P_SIGNUM(USR1);

	P_SIGNUM(SEGV);

	P_SIGNUM(USR2);

	P_SIGNUM(PIPE);

	P_SIGNUM(ALRM);

	P_SIGNUM(TERM);

	P_SIGNUM(CHLD);

	P_SIGNUM(CONT);

	P_SIGNUM(STOP);

	P_SIGNUM(TSTP);

	P_SIGNUM(TTIN);

	P_SIGNUM(TTOU);

	P_SIGNUM(URG);

	P_SIGNUM(XCPU);

	P_SIGNUM(XFSZ);

	P_SIGNUM(VTALRM);

	P_SIGNUM(PROF);

	P_SIGNUM(WINCH);

	P_SIGNUM(IO);

	P_SIGNUM(PWR);

	P_SIGNUM(SYS);

#ifdef SIGEMT

	P_SIGNUM(EMT);

#endif

#ifdef SIGSTKFLT

	P_SIGNUM(STKFLT);

#endif

#ifdef SIGSWI

	P_SIGNUM(SWI);

#endif

	default: break;

	}



	return scnprintf(bf, size, "%#x", sig);

}



#define SCA_SIGNUM syscall_arg__scnprintf_signum



#if defined(__i386__) || defined(__x86_64__)

/*

 * FIXME: Make this available to all arches.
@@ -787,12 +634,15 @@ static size_t syscall_arg__scnprintf_getrandom_flags(char *bf, size_t size, 
	  .arg_parm	 = { [arg] = &strarray__##array, }



#include "trace/beauty/eventfd.c"

#include "trace/beauty/pid.c"

#include "trace/beauty/futex_op.c"

#include "trace/beauty/mmap.c"

#include "trace/beauty/mode_t.c"

#include "trace/beauty/msg_flags.c"

#include "trace/beauty/open_flags.c"

#include "trace/beauty/perf_event_open.c"

#include "trace/beauty/pid.c"

#include "trace/beauty/sched_policy.c"

#include "trace/beauty/signum.c"

#include "trace/beauty/socket_type.c"

#include "trace/beauty/waitid_options.c"
@@ -1606,7 +1456,12 @@ static size_t syscall__scnprintf_args(struct syscall *sc, char *bf, size_t size, 
						     "%ld", val);

			}

		}

	} else {

	} else if (IS_ERR(sc->tp_format)) {

		/*

		 * If we managed to read the tracepoint /format file, then we

		 * may end up not having any args, like with gettid(), so only

		 * print the raw args when we didn't manage to read it.

		 */

		int i = 0;



		while (i < 6) {

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

+30 −17
Original line number Diff line number Diff line
@@ -223,11 +223,14 @@ sys.path.append(os.environ['PERF_EXEC_PATH'] + \ 


perf_db_export_mode = True

perf_db_export_calls = False

perf_db_export_callchains = False





def usage():

	print >> sys.stderr, "Usage is: export-to-postgresql.py <database name> [<columns>] [<calls>]"

	print >> sys.stderr, "Usage is: export-to-postgresql.py <database name> [<columns>] [<calls>] [<callchains>]"

	print >> sys.stderr, "where:	columns		'all' or 'branches'"

	print >> sys.stderr, "		calls		'calls' => create calls table"

	print >> sys.stderr, "		calls		'calls' => create calls and call_paths table"

	print >> sys.stderr, "		callchains	'callchains' => create call_paths table"

	raise Exception("Too few arguments")



if (len(sys.argv) < 2):
@@ -245,9 +248,11 @@ if columns not in ("all", "branches"): 


branches = (columns == "branches")



if (len(sys.argv) >= 4):

	if (sys.argv[3] == "calls"):

for i in range(3,len(sys.argv)):

	if (sys.argv[i] == "calls"):

		perf_db_export_calls = True

	elif (sys.argv[i] == "callchains"):

		perf_db_export_callchains = True

	else:

		usage()
@@ -358,14 +363,16 @@ else: 
		'transaction	bigint,'

		'data_src	bigint,'

		'branch_type	integer,'

		'in_tx		boolean)')

		'in_tx		boolean,'

		'call_path_id	bigint)')



if perf_db_export_calls:

if perf_db_export_calls or perf_db_export_callchains:

	do_query(query, 'CREATE TABLE call_paths ('

		'id		bigint		NOT NULL,'

		'parent_id	bigint,'

		'symbol_id	bigint,'

		'ip		bigint)')

if perf_db_export_calls:

	do_query(query, 'CREATE TABLE calls ('

		'id		bigint		NOT NULL,'

		'thread_id	bigint,'
@@ -427,7 +434,7 @@ do_query(query, 'CREATE VIEW comm_threads_view AS ' 
		'(SELECT tid FROM threads WHERE id = thread_id) AS tid'

	' FROM comm_threads')



if perf_db_export_calls:

if perf_db_export_calls or perf_db_export_callchains:

	do_query(query, 'CREATE VIEW call_paths_view AS '

		'SELECT '

			'c.id,'
@@ -443,6 +450,7 @@ if perf_db_export_calls: 
			'(SELECT dso_id FROM symbols WHERE id = p.symbol_id) AS parent_dso_id,'

			'(SELECT dso FROM symbols_view  WHERE id = p.symbol_id) AS parent_dso_short_name'

		' FROM call_paths c INNER JOIN call_paths p ON p.id = c.parent_id')

if perf_db_export_calls:

	do_query(query, 'CREATE VIEW calls_view AS '

		'SELECT '

			'calls.id,'
@@ -540,8 +548,9 @@ dso_file = open_output_file("dso_table.bin") 
symbol_file		= open_output_file("symbol_table.bin")

branch_type_file	= open_output_file("branch_type_table.bin")

sample_file		= open_output_file("sample_table.bin")

if perf_db_export_calls:

if perf_db_export_calls or perf_db_export_callchains:

	call_path_file		= open_output_file("call_path_table.bin")

if perf_db_export_calls:

	call_file		= open_output_file("call_table.bin")



def trace_begin():
@@ -553,8 +562,8 @@ def trace_begin(): 
	comm_table(0, "unknown")

	dso_table(0, 0, "unknown", "unknown", "")

	symbol_table(0, 0, 0, 0, 0, "unknown")

	sample_table(0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0)

	if perf_db_export_calls:

	sample_table(0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0)

	if perf_db_export_calls or perf_db_export_callchains:

		call_path_table(0, 0, 0, 0)



unhandled_count = 0
@@ -570,8 +579,9 @@ def trace_end(): 
	copy_output_file(symbol_file,		"symbols")

	copy_output_file(branch_type_file,	"branch_types")

	copy_output_file(sample_file,		"samples")

	if perf_db_export_calls:

	if perf_db_export_calls or perf_db_export_callchains:

		copy_output_file(call_path_file,	"call_paths")

	if perf_db_export_calls:

		copy_output_file(call_file,		"calls")



	print datetime.datetime.today(), "Removing intermediate files..."
@@ -584,8 +594,9 @@ def trace_end(): 
	remove_output_file(symbol_file)

	remove_output_file(branch_type_file)

	remove_output_file(sample_file)

	if perf_db_export_calls:

	if perf_db_export_calls or perf_db_export_callchains:

		remove_output_file(call_path_file)

	if perf_db_export_calls:

		remove_output_file(call_file)

	os.rmdir(output_dir_name)

	print datetime.datetime.today(), "Adding primary keys"
@@ -598,8 +609,9 @@ def trace_end(): 
	do_query(query, 'ALTER TABLE symbols         ADD PRIMARY KEY (id)')

	do_query(query, 'ALTER TABLE branch_types    ADD PRIMARY KEY (id)')

	do_query(query, 'ALTER TABLE samples         ADD PRIMARY KEY (id)')

	if perf_db_export_calls:

	if perf_db_export_calls or perf_db_export_callchains:

		do_query(query, 'ALTER TABLE call_paths      ADD PRIMARY KEY (id)')

	if perf_db_export_calls:

		do_query(query, 'ALTER TABLE calls           ADD PRIMARY KEY (id)')



	print datetime.datetime.today(), "Adding foreign keys"
@@ -622,10 +634,11 @@ def trace_end(): 
					'ADD CONSTRAINT symbolfk   FOREIGN KEY (symbol_id)    REFERENCES symbols    (id),'

					'ADD CONSTRAINT todsofk    FOREIGN KEY (to_dso_id)    REFERENCES dsos       (id),'

					'ADD CONSTRAINT tosymbolfk FOREIGN KEY (to_symbol_id) REFERENCES symbols    (id)')

	if perf_db_export_calls:

	if perf_db_export_calls or perf_db_export_callchains:

		do_query(query, 'ALTER TABLE call_paths '

					'ADD CONSTRAINT parentfk    FOREIGN KEY (parent_id)    REFERENCES call_paths (id),'

					'ADD CONSTRAINT symbolfk    FOREIGN KEY (symbol_id)    REFERENCES symbols    (id)')

	if perf_db_export_calls:

		do_query(query, 'ALTER TABLE calls '

					'ADD CONSTRAINT threadfk    FOREIGN KEY (thread_id)    REFERENCES threads    (id),'

					'ADD CONSTRAINT commfk      FOREIGN KEY (comm_id)      REFERENCES comms      (id),'
@@ -693,11 +706,11 @@ def branch_type_table(branch_type, name, *x): 
	value = struct.pack(fmt, 2, 4, branch_type, n, name)

	branch_type_file.write(value)



def sample_table(sample_id, evsel_id, machine_id, thread_id, comm_id, dso_id, symbol_id, sym_offset, ip, time, cpu, to_dso_id, to_symbol_id, to_sym_offset, to_ip, period, weight, transaction, data_src, branch_type, in_tx, *x):

def sample_table(sample_id, evsel_id, machine_id, thread_id, comm_id, dso_id, symbol_id, sym_offset, ip, time, cpu, to_dso_id, to_symbol_id, to_sym_offset, to_ip, period, weight, transaction, data_src, branch_type, in_tx, call_path_id, *x):

	if branches:

		value = struct.pack("!hiqiqiqiqiqiqiqiqiqiqiiiqiqiqiqiiiB", 17, 8, sample_id, 8, evsel_id, 8, machine_id, 8, thread_id, 8, comm_id, 8, dso_id, 8, symbol_id, 8, sym_offset, 8, ip, 8, time, 4, cpu, 8, to_dso_id, 8, to_symbol_id, 8, to_sym_offset, 8, to_ip, 4, branch_type, 1, in_tx)

		value = struct.pack("!hiqiqiqiqiqiqiqiqiqiqiiiqiqiqiqiiiBiq", 18, 8, sample_id, 8, evsel_id, 8, machine_id, 8, thread_id, 8, comm_id, 8, dso_id, 8, symbol_id, 8, sym_offset, 8, ip, 8, time, 4, cpu, 8, to_dso_id, 8, to_symbol_id, 8, to_sym_offset, 8, to_ip, 4, branch_type, 1, in_tx, 8, call_path_id)

	else:

		value = struct.pack("!hiqiqiqiqiqiqiqiqiqiqiiiqiqiqiqiqiqiqiqiiiB", 21, 8, sample_id, 8, evsel_id, 8, machine_id, 8, thread_id, 8, comm_id, 8, dso_id, 8, symbol_id, 8, sym_offset, 8, ip, 8, time, 4, cpu, 8, to_dso_id, 8, to_symbol_id, 8, to_sym_offset, 8, to_ip, 8, period, 8, weight, 8, transaction, 8, data_src, 4, branch_type, 1, in_tx)

		value = struct.pack("!hiqiqiqiqiqiqiqiqiqiqiiiqiqiqiqiqiqiqiqiiiBiq", 22, 8, sample_id, 8, evsel_id, 8, machine_id, 8, thread_id, 8, comm_id, 8, dso_id, 8, symbol_id, 8, sym_offset, 8, ip, 8, time, 4, cpu, 8, to_dso_id, 8, to_symbol_id, 8, to_sym_offset, 8, to_ip, 8, period, 8, weight, 8, transaction, 8, data_src, 4, branch_type, 1, in_tx, 8, call_path_id)

	sample_file.write(value)



def call_path_table(cp_id, parent_id, symbol_id, ip, *x):

tools/perf/trace/beauty/futex_op.c

0 → 100644
+44 −0
Original line number Diff line number Diff line 
#include <linux/futex.h>



static size_t syscall_arg__scnprintf_futex_op(char *bf, size_t size, struct syscall_arg *arg)

{

	enum syscall_futex_args {

		SCF_UADDR   = (1 << 0),

		SCF_OP	    = (1 << 1),

		SCF_VAL	    = (1 << 2),

		SCF_TIMEOUT = (1 << 3),

		SCF_UADDR2  = (1 << 4),

		SCF_VAL3    = (1 << 5),

	};

	int op = arg->val;

	int cmd = op & FUTEX_CMD_MASK;

	size_t printed = 0;



	switch (cmd) {

#define	P_FUTEX_OP(n) case FUTEX_##n: printed = scnprintf(bf, size, #n);

	P_FUTEX_OP(WAIT);	    arg->mask |= SCF_VAL3|SCF_UADDR2;		  break;

	P_FUTEX_OP(WAKE);	    arg->mask |= SCF_VAL3|SCF_UADDR2|SCF_TIMEOUT; break;

	P_FUTEX_OP(FD);		    arg->mask |= SCF_VAL3|SCF_UADDR2|SCF_TIMEOUT; break;

	P_FUTEX_OP(REQUEUE);	    arg->mask |= SCF_VAL3|SCF_TIMEOUT;	          break;

	P_FUTEX_OP(CMP_REQUEUE);    arg->mask |= SCF_TIMEOUT;			  break;

	P_FUTEX_OP(CMP_REQUEUE_PI); arg->mask |= SCF_TIMEOUT;			  break;

	P_FUTEX_OP(WAKE_OP);							  break;

	P_FUTEX_OP(LOCK_PI);	    arg->mask |= SCF_VAL3|SCF_UADDR2|SCF_TIMEOUT; break;

	P_FUTEX_OP(UNLOCK_PI);	    arg->mask |= SCF_VAL3|SCF_UADDR2|SCF_TIMEOUT; break;

	P_FUTEX_OP(TRYLOCK_PI);	    arg->mask |= SCF_VAL3|SCF_UADDR2;		  break;

	P_FUTEX_OP(WAIT_BITSET);    arg->mask |= SCF_UADDR2;			  break;

	P_FUTEX_OP(WAKE_BITSET);    arg->mask |= SCF_UADDR2;			  break;

	P_FUTEX_OP(WAIT_REQUEUE_PI);						  break;

	default: printed = scnprintf(bf, size, "%#x", cmd);			  break;

	}



	if (op & FUTEX_PRIVATE_FLAG)

		printed += scnprintf(bf + printed, size - printed, "|PRIV");



	if (op & FUTEX_CLOCK_REALTIME)

		printed += scnprintf(bf + printed, size - printed, "|CLKRT");



	return printed;

}



#define SCA_FUTEX_OP  syscall_arg__scnprintf_futex_op

tools/perf/trace/beauty/open_flags.c

0 → 100644
+56 −0
Original line number Diff line number Diff line 


static size_t syscall_arg__scnprintf_open_flags(char *bf, size_t size,

					       struct syscall_arg *arg)

{

	int printed = 0, flags = arg->val;



	if (!(flags & O_CREAT))

		arg->mask |= 1 << (arg->idx + 1); /* Mask the mode parm */



	if (flags == 0)

		return scnprintf(bf, size, "RDONLY");

#define	P_FLAG(n) \

	if (flags & O_##n) { \

		printed += scnprintf(bf + printed, size - printed, "%s%s", printed ? "|" : "", #n); \

		flags &= ~O_##n; \

	}



	P_FLAG(APPEND);

	P_FLAG(ASYNC);

	P_FLAG(CLOEXEC);

	P_FLAG(CREAT);

	P_FLAG(DIRECT);

	P_FLAG(DIRECTORY);

	P_FLAG(EXCL);

	P_FLAG(LARGEFILE);

	P_FLAG(NOATIME);

	P_FLAG(NOCTTY);

#ifdef O_NONBLOCK

	P_FLAG(NONBLOCK);

#elif O_NDELAY

	P_FLAG(NDELAY);

#endif

#ifdef O_PATH

	P_FLAG(PATH);

#endif

	P_FLAG(RDWR);

#ifdef O_DSYNC

	if ((flags & O_SYNC) == O_SYNC)

		printed += scnprintf(bf + printed, size - printed, "%s%s", printed ? "|" : "", "SYNC");

	else {

		P_FLAG(DSYNC);

	}

#else

	P_FLAG(SYNC);

#endif

	P_FLAG(TRUNC);

	P_FLAG(WRONLY);

#undef P_FLAG



	if (flags)

		printed += scnprintf(bf + printed, size - printed, "%s%#x", printed ? "|" : "", flags);



	return printed;

}



#define SCA_OPEN_FLAGS syscall_arg__scnprintf_open_flags