Merge branch 'perf/parse-events-4' of git://github.com/fweisbec/tracing into perf/core

# trace-cmd version

EP_VERSION = 1

EP_PATCHLEVEL = 1

EP_EXTRAVERSION = 0

# file format version

FILE_VERSION = 6

MAKEFLAGS += --no-print-directory

# Makefiles suck: This macro sets a default value of $(2) for the

# variable named by $(1), unless the variable has been set by

# environment or command line. This is necessary for CC and AR

# because make sets default values, so the simpler ?= approach

# won't work as expected.

define allow-override

  $(if $(or $(findstring environment,$(origin $(1))),\

            $(findstring command line,$(origin $(1)))),,\

    $(eval $(1) = $(2)))

endef

# Allow setting CC and AR, or setting CROSS_COMPILE as a prefix.

$(call allow-override,CC,$(CROSS_COMPILE)gcc)

$(call allow-override,AR,$(CROSS_COMPILE)ar)

EXT = -std=gnu99

INSTALL = install

# Use DESTDIR for installing into a different root directory.

# This is useful for building a package. The program will be

# installed in this directory as if it was the root directory.

# Then the build tool can move it later.

DESTDIR ?=

DESTDIR_SQ = '$(subst ','\'',$(DESTDIR))'

prefix ?= /usr/local

bindir_relative = bin

bindir = $(prefix)/$(bindir_relative)

man_dir = $(prefix)/share/man

man_dir_SQ = '$(subst ','\'',$(man_dir))'

html_install = $(prefix)/share/kernelshark/html

html_install_SQ = '$(subst ','\'',$(html_install))'

img_install = $(prefix)/share/kernelshark/html/images

img_install_SQ = '$(subst ','\'',$(img_install))'

export man_dir man_dir_SQ html_install html_install_SQ INSTALL

export img_install img_install_SQ

export DESTDIR DESTDIR_SQ

# copy a bit from Linux kbuild

ifeq ("$(origin V)", "command line")

  VERBOSE = $(V)

endif

ifndef VERBOSE

  VERBOSE = 0

endif

ifeq ("$(origin O)", "command line")

  BUILD_OUTPUT := $(O)

endif

ifeq ($(BUILD_SRC),)

ifneq ($(BUILD_OUTPUT),)

define build_output

	$(if $(VERBOSE:1=),@)$(MAKE) -C $(BUILD_OUTPUT) 	\

	BUILD_SRC=$(CURDIR) -f $(CURDIR)/Makefile $1

endef

saved-output := $(BUILD_OUTPUT)

BUILD_OUTPUT := $(shell cd $(BUILD_OUTPUT) && /bin/pwd)

$(if $(BUILD_OUTPUT),, \

     $(error output directory "$(saved-output)" does not exist))

all: sub-make

gui: force

	$(call build_output, all_cmd)

$(filter-out gui,$(MAKECMDGOALS)): sub-make

sub-make: force

	$(call build_output, $(MAKECMDGOALS))

# Leave processing to above invocation of make

skip-makefile := 1

endif # BUILD_OUTPUT

endif # BUILD_SRC

# We process the rest of the Makefile if this is the final invocation of make

ifeq ($(skip-makefile),)

srctree		:= $(if $(BUILD_SRC),$(BUILD_SRC),$(CURDIR))

objtree		:= $(CURDIR)

src		:= $(srctree)

obj		:= $(objtree)

export prefix bindir src obj

# Shell quotes

bindir_SQ = $(subst ','\'',$(bindir))

bindir_relative_SQ = $(subst ','\'',$(bindir_relative))

LIB_FILE = libtraceevent.a libtraceevent.so

CONFIG_INCLUDES = 

CONFIG_LIBS	=

CONFIG_FLAGS	=

VERSION		= $(EP_VERSION)

PATCHLEVEL	= $(EP_PATCHLEVEL)

EXTRAVERSION	= $(EP_EXTRAVERSION)

OBJ		= $@

N		=

export Q VERBOSE

EVENT_PARSE_VERSION = $(EP_VERSION).$(EP_PATCHLEVEL).$(EP_EXTRAVERSION)

INCLUDES = -I. -I/usr/local/include $(CONFIG_INCLUDES)

# Set compile option CFLAGS if not set elsewhere

CFLAGS ?= -g -Wall

# Append required CFLAGS

override CFLAGS += $(CONFIG_FLAGS) $(INCLUDES) $(PLUGIN_DIR_SQ)

override CFLAGS += $(udis86-flags)

ifeq ($(VERBOSE),1)

  Q =

  print_compile =

  print_app_build =

  print_fpic_compile =

  print_shared_lib_compile =

  print_plugin_obj_compile =

  print_plugin_build =

  print_install =

else

  Q = @

  print_compile =		echo '  CC                 '$(OBJ);

  print_app_build =		echo '  BUILD              '$(OBJ);

  print_fpic_compile =		echo '  CC FPIC            '$(OBJ);

  print_shared_lib_compile =	echo '  BUILD SHARED LIB   '$(OBJ);

  print_plugin_obj_compile =	echo '  CC PLUGIN OBJ      '$(OBJ);

  print_plugin_build =		echo '  CC PLUGI           '$(OBJ);

  print_static_lib_build =	echo '  BUILD STATIC LIB   '$(OBJ);

  print_install =		echo '  INSTALL     '$1'	to	$(DESTDIR_SQ)$2';

endif

do_fpic_compile =					\

	($(print_fpic_compile)				\

	$(CC) -c $(CFLAGS) $(EXT) -fPIC $< -o $@)

do_app_build =						\

	($(print_app_build)				\

	$(CC) $^ -rdynamic -o $@ $(CONFIG_LIBS) $(LIBS))

do_compile_shared_library =			\

	($(print_shared_lib_compile)		\

	$(CC) --shared $^ -o $@)

do_compile_plugin_obj =				\

	($(print_plugin_obj_compile)		\

	$(CC) -c $(CFLAGS) -fPIC -o $@ $<)

do_plugin_build =				\

	($(print_plugin_build)			\

	$(CC) $(CFLAGS) -shared -nostartfiles -o $@ $<)

do_build_static_lib =				\

	($(print_static_lib_build)		\

	$(RM) $@;  $(AR) rcs $@ $^)

define do_compile

	$(print_compile)						\

	$(CC) -c $(CFLAGS) $(EXT) $< -o $(obj)/$@;

endef

$(obj)/%.o: $(src)/%.c

	$(Q)$(call do_compile)

%.o: $(src)/%.c

	$(Q)$(call do_compile)

PEVENT_LIB_OBJS = event-parse.o trace-seq.o parse-filter.o parse-utils.o

ALL_OBJS = $(PEVENT_LIB_OBJS)

CMD_TARGETS = $(LIB_FILE)

TARGETS = $(CMD_TARGETS)

all: all_cmd

all_cmd: $(CMD_TARGETS)

libtraceevent.so: $(PEVENT_LIB_OBJS)

	$(Q)$(do_compile_shared_library)

libtraceevent.a: $(PEVENT_LIB_OBJS)

	$(Q)$(do_build_static_lib)

$(PEVENT_LIB_OBJS): %.o: $(src)/%.c

	$(Q)$(do_fpic_compile)

define make_version.h

	(echo '/* This file is automatically generated. Do not modify. */';		\

	echo \#define VERSION_CODE $(shell						\

	expr $(VERSION) \* 256 + $(PATCHLEVEL));					\

	echo '#define EXTRAVERSION ' $(EXTRAVERSION);					\

	echo '#define VERSION_STRING "'$(VERSION).$(PATCHLEVEL).$(EXTRAVERSION)'"';	\

	echo '#define FILE_VERSION '$(FILE_VERSION);					\

	) > $1

endef

define update_version.h

	($(call make_version.h, $@.tmp);		\

	if [ -r $@ ] && cmp -s $@ $@.tmp; then		\

		rm -f $@.tmp;				\

	else						\

		echo '  UPDATE                 $@';	\

		mv -f $@.tmp $@;			\

	fi);

endef

ep_version.h: force

	$(Q)$(N)$(call update_version.h)

VERSION_FILES = ep_version.h

define update_dir

	(echo $1 > $@.tmp;	\

	if [ -r $@ ] && cmp -s $@ $@.tmp; then		\

		rm -f $@.tmp;				\

	else						\

		echo '  UPDATE                 $@';	\

		mv -f $@.tmp $@;			\

	fi);

endef

## make deps

all_objs := $(sort $(ALL_OBJS))

all_deps := $(all_objs:%.o=.%.d)

define check_deps

		$(CC) -M $(CFLAGS) $< > $@;

endef

$(gui_deps): ks_version.h

$(non_gui_deps): tc_version.h

$(all_deps): .%.d: $(src)/%.c

	$(Q)$(call check_deps)

$(all_objs) : %.o : .%.d

dep_includes := $(wildcard $(all_deps))

ifneq ($(dep_includes),)

 include $(dep_includes)

endif

tags:	force

	$(RM) tags

	find . -name '*.[ch]' | xargs ctags --extra=+f --c-kinds=+px

TAGS:	force

	$(RM) TAGS

	find . -name '*.[ch]' | xargs etags

define do_install

	$(print_install)				\

	if [ ! -d '$(DESTDIR_SQ)$2' ]; then		\

		$(INSTALL) -d -m 755 '$(DESTDIR_SQ)$2';	\

	fi;						\

	$(INSTALL) $1 '$(DESTDIR_SQ)$2'

endef

install_lib: all_cmd install_plugins install_python

	$(Q)$(call do_install,$(LIB_FILE),$(bindir_SQ))

install: install_lib

clean:

	$(RM) *.o *~ $(TARGETS) *.a *.so $(VERSION_FILES).*.d

	$(RM) tags TAGS

endif # skip-makefile

PHONY += force

force:

# Declare the contents of the .PHONY variable as phony.  We keep that

# information in a variable so we can use it in if_changed and friends.

.PHONY: $(PHONY)

/*

 * Copyright (C) 2010 Red Hat Inc, Steven Rostedt <srostedt@redhat.com>

 *

 * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

 * This program is free software; you can redistribute it and/or

 * modify it under the terms of the GNU Lesser General Public

 * License as published by the Free Software Foundation;

 * version 2.1 of the License (not later!)

 *

 * This program is distributed in the hope that it will be useful,

 * but WITHOUT ANY WARRANTY; without even the implied warranty of

 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

 * GNU Lesser General Public License for more details.

 *

 * You should have received a copy of the GNU Lesser General Public

 * License along with this program; if not, write to the Free Software

 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.

 *

 * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

 */

#ifndef __UTIL_H

#define __UTIL_H

#include <ctype.h>

/* Can be overridden */

void die(const char *fmt, ...);

void *malloc_or_die(unsigned int size);

void warning(const char *fmt, ...);

void pr_stat(const char *fmt, ...);

void vpr_stat(const char *fmt, va_list ap);

/* Always available */

void __die(const char *fmt, ...);

void __warning(const char *fmt, ...);

void __pr_stat(const char *fmt, ...);

void __vdie(const char *fmt, ...);

void __vwarning(const char *fmt, ...);

void __vpr_stat(const char *fmt, ...);

static inline char *strim(char *string)

{

	char *ret;

	if (!string)

		return NULL;

	while (*string) {

		if (!isspace(*string))

			break;

		string++;

	}

	ret = string;

	string = ret + strlen(ret) - 1;

	while (string > ret) {

		if (!isspace(*string))

			break;

		string--;

	}

	string[1] = 0;

	return ret;

}

static inline int has_text(const char *text)

{

	if (!text)

		return 0;

	while (*text) {

		if (!isspace(*text))

			return 1;

		text++;

	}

	return 0;

}

#endif