diff options
| author | David Smith <dsmith@redhat.com> | 2009-03-12 12:58:49 -0500 |
|---|---|---|
| committer | David Smith <dsmith@redhat.com> | 2009-03-12 12:58:49 -0500 |
| commit | 2791f774da562b5a2bfc976baad246999da29ea6 (patch) | |
| tree | d1ece2d650e6307d86ed6269d4afffbaf30e05c3 | |
| parent | 976f6b6a6fae081d1d72d06457d64af87db789ef (diff) | |
| parent | 96b030fe8a0bb0297d23638e2975a3e9eb2b85b6 (diff) | |
| download | systemtap-steved-2791f774da562b5a2bfc976baad246999da29ea6.tar.gz systemtap-steved-2791f774da562b5a2bfc976baad246999da29ea6.tar.xz systemtap-steved-2791f774da562b5a2bfc976baad246999da29ea6.zip | |
Merge branch 'master' of ssh://sources.redhat.com/git/systemtap into pr7043
114 files changed, 11022 insertions, 1040 deletions
@@ -2,6 +2,7 @@ Ananth N Mavinakayanahalli Anil Keshavamurthy Anithra Janakiraman Charles Spirakis +Dan Horak Dave Brolley Dave Nomura David Smith @@ -24,6 +25,7 @@ Mark McLoughlin Mark Wielaard Martin Hunt Masami Hiramatsu +Maynard Johnson Michael Meeks Mike Mason Nobuhiro Tachino diff --git a/Makefile.am b/Makefile.am index 4c84309c..9681381d 100644 --- a/Makefile.am +++ b/Makefile.am @@ -101,11 +101,6 @@ stamp-elfutils: config.status stap_DEPENDENCIES += lib-elfutils/libdw.so lib-elfutils/libdw.so: stamp-elfutils ; -pkglib_LIBRARIES = libsduprobes.a -libsduprobes_a_SOURCES = runtime/sduprobes.c -sduprobes.o: runtime/sduprobes.c - $(CC) -g -O0 -c -o $@ $< - PHONIES += install-elfutils install-elfutils: mkdir -p $(DESTDIR)$(pkglibdir) diff --git a/Makefile.in b/Makefile.in index 000b6b89..73ef5bac 100644 --- a/Makefile.in +++ b/Makefile.in @@ -18,7 +18,6 @@ - VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -90,26 +89,12 @@ CONFIG_CLEAN_FILES = stap.1 stapprobes.5 stapfuncs.5 stapvars.5 \ man/stapprobes.scsi.5 man/stapprobes.signal.5 \ man/stapprobes.socket.5 man/stapprobes.tcp.5 \ man/stapprobes.udp.5 initscript/systemtap run-stap -am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; -am__vpath_adj = case $$p in \ - $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ - *) f=$$p;; \ - esac; -am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; -am__installdirs = "$(DESTDIR)$(pkglibdir)" "$(DESTDIR)$(bindir)" \ - "$(DESTDIR)$(pkglibexecdir)" "$(DESTDIR)$(bindir)" \ - "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(man5dir)" \ - "$(DESTDIR)$(man8dir)" "$(DESTDIR)$(oldincludedir)" -pkglibLIBRARIES_INSTALL = $(INSTALL_DATA) -LIBRARIES = $(pkglib_LIBRARIES) -AR = ar -ARFLAGS = cru -libsduprobes_a_AR = $(AR) $(ARFLAGS) -libsduprobes_a_LIBADD = -@BUILD_ELFUTILS_TRUE@am_libsduprobes_a_OBJECTS = sduprobes.$(OBJEXT) -libsduprobes_a_OBJECTS = $(am_libsduprobes_a_OBJECTS) @BUILD_SERVER_TRUE@am__EXEEXT_1 = stap-client-connect$(EXEEXT) \ @BUILD_SERVER_TRUE@ stap-server-connect$(EXEEXT) +am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(pkglibexecdir)" \ + "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)" \ + "$(DESTDIR)$(man5dir)" "$(DESTDIR)$(man8dir)" \ + "$(DESTDIR)$(oldincludedir)" binPROGRAMS_INSTALL = $(INSTALL_PROGRAM) pkglibexecPROGRAMS_INSTALL = $(INSTALL_PROGRAM) PROGRAMS = $(bin_PROGRAMS) $(noinst_PROGRAMS) $(pkglibexec_PROGRAMS) @@ -168,10 +153,9 @@ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ CXXLD = $(CXX) CXXLINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) \ -o $@ -SOURCES = $(libsduprobes_a_SOURCES) $(loc2c_test_SOURCES) \ - $(stap_SOURCES) $(stap_client_connect_SOURCES) \ - $(stap_server_connect_SOURCES) $(stapio_SOURCES) \ - $(staprun_SOURCES) +SOURCES = $(loc2c_test_SOURCES) $(stap_SOURCES) \ + $(stap_client_connect_SOURCES) $(stap_server_connect_SOURCES) \ + $(stapio_SOURCES) $(staprun_SOURCES) RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ html-recursive info-recursive install-data-recursive \ install-dvi-recursive install-exec-recursive \ @@ -184,6 +168,12 @@ man5dir = $(mandir)/man5 man8dir = $(mandir)/man8 NROFF = nroff MANS = $(man_MANS) +am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; +am__vpath_adj = case $$p in \ + $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ + *) f=$$p;; \ + esac; +am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; oldincludeHEADERS_INSTALL = $(INSTALL_HEADER) HEADERS = $(oldinclude_HEADERS) RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ @@ -298,7 +288,6 @@ staplog_CPPFLAGS = @staplog_CPPFLAGS@ subdirs = @subdirs@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ -top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ @@ -343,8 +332,6 @@ stap_LDFLAGS = $(AM_LDFLAGS) @PIELDFLAGS@ $(am__append_5) @BUILD_SERVER_TRUE@stap_client_connect_LDFLAGS = $(AM_LDFLAGS) @BUILD_SERVER_TRUE@stap_server_connect_LDFLAGS = $(AM_LDFLAGS) PHONIES = $(am__append_9) $(am__append_10) dist-gzip -@BUILD_ELFUTILS_TRUE@pkglib_LIBRARIES = libsduprobes.a -@BUILD_ELFUTILS_TRUE@libsduprobes_a_SOURCES = runtime/sduprobes.c staprun_SOURCES = runtime/staprun/staprun.c runtime/staprun/staprun_funcs.c\ runtime/staprun/ctl.c runtime/staprun/common.c @@ -485,39 +472,6 @@ initscript/systemtap: $(top_builddir)/config.status $(top_srcdir)/initscript/sys cd $(top_builddir) && $(SHELL) ./config.status $@ run-stap: $(top_builddir)/config.status $(srcdir)/run-stap.in cd $(top_builddir) && $(SHELL) ./config.status $@ -install-pkglibLIBRARIES: $(pkglib_LIBRARIES) - @$(NORMAL_INSTALL) - test -z "$(pkglibdir)" || $(MKDIR_P) "$(DESTDIR)$(pkglibdir)" - @list='$(pkglib_LIBRARIES)'; for p in $$list; do \ - if test -f $$p; then \ - f=$(am__strip_dir) \ - echo " $(pkglibLIBRARIES_INSTALL) '$$p' '$(DESTDIR)$(pkglibdir)/$$f'"; \ - $(pkglibLIBRARIES_INSTALL) "$$p" "$(DESTDIR)$(pkglibdir)/$$f"; \ - else :; fi; \ - done - @$(POST_INSTALL) - @list='$(pkglib_LIBRARIES)'; for p in $$list; do \ - if test -f $$p; then \ - p=$(am__strip_dir) \ - echo " $(RANLIB) '$(DESTDIR)$(pkglibdir)/$$p'"; \ - $(RANLIB) "$(DESTDIR)$(pkglibdir)/$$p"; \ - else :; fi; \ - done - -uninstall-pkglibLIBRARIES: - @$(NORMAL_UNINSTALL) - @list='$(pkglib_LIBRARIES)'; for p in $$list; do \ - p=$(am__strip_dir) \ - echo " rm -f '$(DESTDIR)$(pkglibdir)/$$p'"; \ - rm -f "$(DESTDIR)$(pkglibdir)/$$p"; \ - done - -clean-pkglibLIBRARIES: - -test -z "$(pkglib_LIBRARIES)" || rm -f $(pkglib_LIBRARIES) -libsduprobes.a: $(libsduprobes_a_OBJECTS) $(libsduprobes_a_DEPENDENCIES) - -rm -f libsduprobes.a - $(libsduprobes_a_AR) libsduprobes.a $(libsduprobes_a_OBJECTS) $(libsduprobes_a_LIBADD) - $(RANLIB) libsduprobes.a install-binPROGRAMS: $(bin_PROGRAMS) @$(NORMAL_INSTALL) test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)" @@ -613,7 +567,6 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/loc2c_test-loc2c-test.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/loc2c_test-loc2c.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sduprobes.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/stap-buildrun.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/stap-cache.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/stap-coveragedb.Po@am__quote@ @@ -655,20 +608,6 @@ distclean-compile: @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` -@BUILD_ELFUTILS_FALSE@sduprobes.o: runtime/sduprobes.c -@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT sduprobes.o -MD -MP -MF $(DEPDIR)/sduprobes.Tpo -c -o sduprobes.o `test -f 'runtime/sduprobes.c' || echo '$(srcdir)/'`runtime/sduprobes.c -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/sduprobes.Tpo $(DEPDIR)/sduprobes.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='runtime/sduprobes.c' object='sduprobes.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o sduprobes.o `test -f 'runtime/sduprobes.c' || echo '$(srcdir)/'`runtime/sduprobes.c - -sduprobes.obj: runtime/sduprobes.c -@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT sduprobes.obj -MD -MP -MF $(DEPDIR)/sduprobes.Tpo -c -o sduprobes.obj `if test -f 'runtime/sduprobes.c'; then $(CYGPATH_W) 'runtime/sduprobes.c'; else $(CYGPATH_W) '$(srcdir)/runtime/sduprobes.c'; fi` -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/sduprobes.Tpo $(DEPDIR)/sduprobes.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='runtime/sduprobes.c' object='sduprobes.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o sduprobes.obj `if test -f 'runtime/sduprobes.c'; then $(CYGPATH_W) 'runtime/sduprobes.c'; else $(CYGPATH_W) '$(srcdir)/runtime/sduprobes.c'; fi` - loc2c_test-loc2c-test.o: loc2c-test.c @am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(loc2c_test_CPPFLAGS) $(CPPFLAGS) $(loc2c_test_CFLAGS) $(CFLAGS) -MT loc2c_test-loc2c-test.o -MD -MP -MF $(DEPDIR)/loc2c_test-loc2c-test.Tpo -c -o loc2c_test-loc2c-test.o `test -f 'loc2c-test.c' || echo '$(srcdir)/'`loc2c-test.c @am__fastdepCC_TRUE@ mv -f $(DEPDIR)/loc2c_test-loc2c-test.Tpo $(DEPDIR)/loc2c_test-loc2c-test.Po @@ -1360,11 +1299,11 @@ check-am: all-am $(MAKE) $(AM_MAKEFLAGS) check-local check: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) check-recursive -all-am: Makefile $(LIBRARIES) $(PROGRAMS) $(SCRIPTS) $(MANS) \ - $(HEADERS) config.h all-local +all-am: Makefile $(PROGRAMS) $(SCRIPTS) $(MANS) $(HEADERS) config.h \ + all-local installdirs: installdirs-recursive installdirs-am: - for dir in "$(DESTDIR)$(pkglibdir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(pkglibexecdir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(man5dir)" "$(DESTDIR)$(man8dir)" "$(DESTDIR)$(oldincludedir)"; do \ + for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(pkglibexecdir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(man5dir)" "$(DESTDIR)$(man8dir)" "$(DESTDIR)$(oldincludedir)"; do \ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: $(BUILT_SOURCES) @@ -1396,8 +1335,7 @@ maintainer-clean-generic: clean: clean-recursive clean-am: clean-binPROGRAMS clean-generic clean-local \ - clean-noinstPROGRAMS clean-pkglibLIBRARIES \ - clean-pkglibexecPROGRAMS mostlyclean-am + clean-noinstPROGRAMS clean-pkglibexecPROGRAMS mostlyclean-am distclean: distclean-recursive -rm -f $(am__CONFIG_DISTCLEAN_FILES) @@ -1422,8 +1360,7 @@ install-data-am: install-data-local install-man \ install-dvi: install-dvi-recursive install-exec-am: install-binPROGRAMS install-binSCRIPTS \ - install-exec-local install-pkglibLIBRARIES \ - install-pkglibexecPROGRAMS + install-exec-local install-pkglibexecPROGRAMS @$(NORMAL_INSTALL) $(MAKE) $(AM_MAKEFLAGS) install-exec-hook @@ -1460,7 +1397,7 @@ ps-am: uninstall-am: uninstall-binPROGRAMS uninstall-binSCRIPTS \ uninstall-local uninstall-man uninstall-oldincludeHEADERS \ - uninstall-pkglibLIBRARIES uninstall-pkglibexecPROGRAMS + uninstall-pkglibexecPROGRAMS uninstall-man: uninstall-man1 uninstall-man5 uninstall-man8 @@ -1470,27 +1407,24 @@ uninstall-man: uninstall-man1 uninstall-man5 uninstall-man8 .PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ all all-am all-local am--refresh check check-am check-local \ clean clean-binPROGRAMS clean-generic clean-local \ - clean-noinstPROGRAMS clean-pkglibLIBRARIES \ - clean-pkglibexecPROGRAMS ctags ctags-recursive distclean \ - distclean-compile distclean-generic distclean-hdr \ - distclean-local distclean-tags dvi dvi-am html html-am info \ - info-am install install-am install-binPROGRAMS \ + clean-noinstPROGRAMS clean-pkglibexecPROGRAMS ctags \ + ctags-recursive distclean distclean-compile distclean-generic \ + distclean-hdr distclean-local distclean-tags dvi dvi-am html \ + html-am info info-am install install-am install-binPROGRAMS \ install-binSCRIPTS install-data install-data-am \ install-data-local install-dvi install-dvi-am install-exec \ install-exec-am install-exec-hook install-exec-local \ install-html install-html-am install-info install-info-am \ install-man install-man1 install-man5 install-man8 \ install-oldincludeHEADERS install-pdf install-pdf-am \ - install-pkglibLIBRARIES install-pkglibexecPROGRAMS install-ps \ - install-ps-am install-strip installcheck installcheck-am \ - installdirs installdirs-am maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-compile \ - mostlyclean-generic pdf pdf-am ps ps-am tags tags-recursive \ - uninstall uninstall-am uninstall-binPROGRAMS \ - uninstall-binSCRIPTS uninstall-local uninstall-man \ - uninstall-man1 uninstall-man5 uninstall-man8 \ - uninstall-oldincludeHEADERS uninstall-pkglibLIBRARIES \ - uninstall-pkglibexecPROGRAMS + install-pkglibexecPROGRAMS install-ps install-ps-am \ + install-strip installcheck installcheck-am installdirs \ + installdirs-am maintainer-clean maintainer-clean-generic \ + mostlyclean mostlyclean-compile mostlyclean-generic pdf pdf-am \ + ps ps-am tags tags-recursive uninstall uninstall-am \ + uninstall-binPROGRAMS uninstall-binSCRIPTS uninstall-local \ + uninstall-man uninstall-man1 uninstall-man5 uninstall-man8 \ + uninstall-oldincludeHEADERS uninstall-pkglibexecPROGRAMS git_version.stamp: @if test -f "$(srcdir)/git_version.h"; then \ @@ -1523,8 +1457,6 @@ cscope: @BUILD_ELFUTILS_TRUE@ done @BUILD_ELFUTILS_TRUE@ touch $@ @BUILD_ELFUTILS_TRUE@lib-elfutils/libdw.so: stamp-elfutils ; -@BUILD_ELFUTILS_TRUE@sduprobes.o: runtime/sduprobes.c -@BUILD_ELFUTILS_TRUE@ $(CC) -g -O0 -c -o $@ $< @BUILD_ELFUTILS_TRUE@install-elfutils: @BUILD_ELFUTILS_TRUE@ mkdir -p $(DESTDIR)$(pkglibdir) @BUILD_ELFUTILS_TRUE@ for file in lib-elfutils/*.so* lib-elfutils/${PACKAGE_NAME}/*.so*; do \ @@ -1,3 +1,10 @@ +* What's new + +- Variables unavailable in current context may be skipped by setting a + session level flag with command line option --skip-badvars now available. + This will simply substitute the otherwise error causing variable with a + literal 0 and print a warning message when the substitution has been made. + * What's new in version 0.9 - Typecasting is now supported using the @cast operator. A script can diff --git a/buildrun.cxx b/buildrun.cxx index fe060236..b9d648ef 100644 --- a/buildrun.cxx +++ b/buildrun.cxx @@ -24,6 +24,7 @@ extern "C" { #include <unistd.h> #include <string.h> #include <errno.h> +#include <glob.h> } @@ -146,6 +147,7 @@ compile_pass (systemtap_session& s) output_autoconf(s, o, "autoconf-task-uid.c", "STAPCONF_TASK_UID", NULL); output_autoconf(s, o, "autoconf-vm-area.c", "STAPCONF_VM_AREA", NULL); output_autoconf(s, o, "autoconf-procfs-owner.c", "STAPCONF_PROCFS_OWNER", NULL); + output_autoconf(s, o, "autoconf-alloc-percpu-align.c", "STAPCONF_ALLOC_PERCPU_ALIGN", NULL); #if 0 /* NB: For now, the performance hit of probe_kernel_read/write (vs. our @@ -153,6 +155,8 @@ compile_pass (systemtap_session& s) * this autoconf. */ output_autoconf(s, o, "autoconf-probe-kernel.c", "STAPCONF_PROBE_KERNEL", NULL); #endif + output_autoconf(s, o, "autoconf-save-stack-trace.c", + "STAPCONF_KERNEL_STACKTRACE", NULL); o << module_cflags << " += -include $(STAPCONF_HEADER)" << endl; @@ -334,4 +338,78 @@ run_pass (systemtap_session& s) return rc; } + +// Build a tiny kernel module to query tracepoints +int +make_tracequery(systemtap_session& s, string& name) +{ + // create a subdirectory for the module + string dir(s.tmpdir + "/tracequery"); + if (create_dir(dir.c_str()) != 0) + { + if (! s.suppress_warnings) + cerr << "Warning: failed to create directory for querying tracepoints." << endl; + return 1; + } + + name = dir + "/tracequery.ko"; + + // create a simple Makefile + string makefile(dir + "/Makefile"); + ofstream omf(makefile.c_str()); + omf << "EXTRA_CFLAGS := -g" << endl; // force debuginfo generation + omf << "obj-m := tracequery.o" << endl; + omf.close(); + + // create our source file + string source(dir + "/tracequery.c"); + ofstream osrc(source.c_str()); + osrc << "#include <linux/module.h>" << endl; + osrc << "#ifdef CONFIG_TRACEPOINTS" << endl; + osrc << "#include <linux/tracepoint.h>" << endl; + + // override DECLARE_TRACE to synthesize probe functions for us + osrc << "#undef DECLARE_TRACE" << endl; + osrc << "#define DECLARE_TRACE(name, proto, args) \\" << endl; + osrc << " void stapprobe_##name(proto) {}" << endl; + + // older tracepoints used DEFINE_TRACE, so redirect that too + osrc << "#undef DEFINE_TRACE" << endl; + osrc << "#define DEFINE_TRACE(name, proto, args) \\" << endl; + osrc << " DECLARE_TRACE(name, TPPROTO(proto), TPARGS(args))" << endl; + + // dynamically pull in all tracepoint headers from include/trace/ + glob_t trace_glob; + string glob_str(s.kernel_build_tree + "/include/trace/*.h"); + glob(glob_str.c_str(), 0, NULL, &trace_glob); + for (unsigned i = 0; i < trace_glob.gl_pathc; ++i) + { + string header(basename(trace_glob.gl_pathv[i])); + + // filter out a few known "internal-only" headers + if (header == "trace_events.h") + continue; + if (header.find("_event_types.h") != string::npos) + continue; + + osrc << "#include <trace/" << header << ">" << endl; + } + globfree(&trace_glob); + + // finish up the module source + osrc << "#endif /* CONFIG_TRACEPOINTS */" << endl; + osrc << "int init_module(void) { return 0; }" << endl; + osrc << "void cleanup_module(void) {}" << endl; + osrc << "MODULE_DESCRIPTION(\"tracepoint query\");" << endl; + osrc << "MODULE_LICENSE(\"GPL\");" << endl; + osrc.close(); + + // make the module + string make_cmd = "make -C '" + s.kernel_build_tree + "'" + + " M='" + dir + "' modules"; + if (s.verbose < 4) + make_cmd += " >/dev/null 2>&1"; + return run_make_cmd(s, make_cmd); +} + /* vim: set sw=2 ts=8 cino=>4,n-2,{2,^-2,t0,(0,u0,w1,M1 : */ @@ -14,6 +14,7 @@ int compile_pass (systemtap_session& s); int run_pass (systemtap_session& s); +int make_tracequery(systemtap_session& s, std::string& name); #endif // BUILDRUN_H diff --git a/doc/Language_Reference_Guide/Makefile b/doc/Language_Reference_Guide/Makefile new file mode 100644 index 00000000..e8dfb206 --- /dev/null +++ b/doc/Language_Reference_Guide/Makefile @@ -0,0 +1,17 @@ +#Makefile for Language_Reference_Guide + +XML_LANG = en-US +DOCNAME = Language_Reference_Guide +PRODUCT = Fedora +BRAND = fedora + +CHUNK_SECTION_DEPTH=1 + +#OTHER_LANGS = as-IN bn-IN de-DE es-ES fr-FR gu-IN hi-IN it-IT ja-JP kn-IN ko-KR ml-IN mr-IN or-IN pa-IN pt-BR ru-RU si-LK ta-IN te-IN zh-CN zh-TW + +# Extra Parameters start here + +# Extra Parameters stop here +COMMON_CONFIG = /usr/share/publican +include $(COMMON_CONFIG)/make/Makefile.common + diff --git a/doc/Language_Reference_Guide/README b/doc/Language_Reference_Guide/README new file mode 100644 index 00000000..d3175ae3 --- /dev/null +++ b/doc/Language_Reference_Guide/README @@ -0,0 +1,16 @@ +This is an automated source build of the Language Reference Guide, +used to build it in Publican. + +To build the source, run: + + bash publicanize-langref.sh + +This will copy the LaTeX source of the Language Reference Guide and +convert it to DocBook XML. You can now build it in pdf, html, etc +using Publican. + +The main source of the Language Reference Guide is in: + ../langref.tex + +As such, any revisions to this document should be applied to ../langref.tex, +not to the source in this directory. diff --git a/doc/Language_Reference_Guide/en-US/Author_Group.xml b/doc/Language_Reference_Guide/en-US/Author_Group.xml new file mode 100644 index 00000000..00df1c7d --- /dev/null +++ b/doc/Language_Reference_Guide/en-US/Author_Group.xml @@ -0,0 +1,16 @@ +<?xml version='1.0'?> +<!DOCTYPE authorgroup PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [ +]> + +<authorgroup> + + <author> + <firstname>Robb</firstname> + <surname>Romans</surname> + <affiliation> + <orgname>IBM</orgname> + <orgdiv>Documentation</orgdiv> + </affiliation> + <email>robb@linux.vnet.ibm.com</email> + </author> +</authorgroup> diff --git a/doc/Language_Reference_Guide/en-US/Book_Info.xml b/doc/Language_Reference_Guide/en-US/Book_Info.xml new file mode 100644 index 00000000..14a34093 --- /dev/null +++ b/doc/Language_Reference_Guide/en-US/Book_Info.xml @@ -0,0 +1,63 @@ +<?xml version='1.0'?> +<!DOCTYPE bookinfo PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [ +]> + +<bookinfo id="Language_Reference_Guide-Fedora"> + <title>Language Reference Guide</title> + <subtitle>A guide to the constructs and syntax used in SystemTap scripts</subtitle> + <productname>Fedora</productname> + <productnumber>10</productnumber> + <edition>1</edition> + <pubsnumber>1</pubsnumber> + <abstract> + <para> + The <citetitle>SystemTap Language Reference Guide</citetitle> is a + comprehensive reference of the language constructs and syntax used in + SystemTap scripts. It is suitable for users who have intermediate to + advanced knowledge of SystemTap. For other available SystemTap documentation, + refer to <xref linkend="For-Further-Reference"/>. + </para> + </abstract> + <corpauthor> + <inlinemediaobject> + <imageobject> + <imagedata format='SVG' fileref="Common_Content/images/title_logo.svg" /> + </imageobject> + <textobject><phrase>Logo</phrase></textobject> + </inlinemediaobject> + </corpauthor> +<!-- <copyright> + <year>&YEAR;</year> + <holder>&HOLDER;</holder> + </copyright>--> + +<legalnotice> + <para> + Copyright © 2007 Red Hat Inc., Copyright © 2007 IBM Corp., Copyright © 2007 Intel Corporation. + </para> + + <para> + This document was derived from other documents contributed to the SystemTap project by employees of Red Hat, IBM and Intel. + </para> + + <para> + Permission is granted to copy, distribute and/or modify this document + under the terms of the GNU Free Documentation License, Version 1.2 + or any later version published by the Free Software Foundation; + with no Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts. + </para> + <para> + The GNU Free Documentation License is available from + <ulink url="http://www.gnu.org/licenses/fdl.html"/> or by writing to + the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + Boston, MA 02110-1301, USA. + </para> +</legalnotice> + + +<!-- <xi:include href="Common_Content/Legal_Notice.xml" xmlns:xi="http://www.w3.org/2001/XInclude" /> --> + <xi:include href="Author_Group.xml" xmlns:xi="http://www.w3.org/2001/XInclude" /> +</bookinfo> + + + diff --git a/doc/Language_Reference_Guide/en-US/Language_Reference_Guide.ent b/doc/Language_Reference_Guide/en-US/Language_Reference_Guide.ent new file mode 100644 index 00000000..e44f36cb --- /dev/null +++ b/doc/Language_Reference_Guide/en-US/Language_Reference_Guide.ent @@ -0,0 +1,2 @@ +<!ENTITY PRODUCT "Fedora"> +<!ENTITY BOOKID "Language_Reference_Guide"> diff --git a/doc/Language_Reference_Guide/en-US/Preface.xml b/doc/Language_Reference_Guide/en-US/Preface.xml new file mode 100644 index 00000000..9e8995e3 --- /dev/null +++ b/doc/Language_Reference_Guide/en-US/Preface.xml @@ -0,0 +1,13 @@ +<?xml version='1.0'?> +<!DOCTYPE preface PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [ +]> + +<preface id="Language_Reference_Guide-Preface"> + <title>Preface</title> + <xi:include href="Common_Content/Conventions.xml" xmlns:xi="http://www.w3.org/2001/XInclude" /> + <xi:include href="Feedback.xml" xmlns:xi="http://www.w3.org/2001/XInclude"> + <xi:fallback xmlns:xi="http://www.w3.org/2001/XInclude"> + <xi:include href="Common_Content/Feedback.xml" xmlns:xi="http://www.w3.org/2001/XInclude" /> + </xi:fallback> + </xi:include> +</preface> diff --git a/doc/Language_Reference_Guide/en-US/Revision_History.xml b/doc/Language_Reference_Guide/en-US/Revision_History.xml new file mode 100644 index 00000000..68432a02 --- /dev/null +++ b/doc/Language_Reference_Guide/en-US/Revision_History.xml @@ -0,0 +1,26 @@ +<?xml version='1.0'?> +<!DOCTYPE appendix PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [ +]> + +<appendix id="appe-Publican-Revision_History"> + <title>Revision History</title> + <simpara> + <revhistory> + <revision> + <revnumber>1.0</revnumber> + <date></date> + <author> + <firstname></firstname> + <surname></surname> + <email></email> + </author> + <revdescription> + <simplelist> + <member></member> + </simplelist> + </revdescription> + </revision> + </revhistory> + </simpara> +</appendix> + diff --git a/doc/Language_Reference_Guide/en-US/images/icon.svg b/doc/Language_Reference_Guide/en-US/images/icon.svg new file mode 100644 index 00000000..c471a607 --- /dev/null +++ b/doc/Language_Reference_Guide/en-US/images/icon.svg @@ -0,0 +1,3936 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<!-- Created with Inkscape (http://www.inkscape.org/) --> +<svg + xmlns:ns="http://ns.adobe.com/AdobeSVGViewerExtensions/3/" + xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/" + xmlns:dc="http://purl.org/dc/elements/1.1/" + xmlns:cc="http://web.resource.org/cc/" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns="http://www.w3.org/2000/svg" + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + version="1.0" + width="32" + height="32" + id="svg3017" + sodipodi:version="0.32" + inkscape:version="0.44+devel" + sodipodi:docname="book.svg" + sodipodi:docbase="/home/andy/Desktop"> + <metadata + id="metadata489"> + <rdf:RDF> + <cc:Work + rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type + rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> + </cc:Work> + </rdf:RDF> + </metadata> + <sodipodi:namedview + inkscape:window-height="480" + inkscape:window-width="858" + inkscape:pageshadow="0" + inkscape:pageopacity="0.0" + guidetolerance="10.0" + gridtolerance="10.0" + objecttolerance="10.0" + borderopacity="1.0" + bordercolor="#666666" + pagecolor="#ffffff" + id="base" + inkscape:zoom="1" + inkscape:cx="16" + inkscape:cy="15.944056" + inkscape:window-x="0" + inkscape:window-y="33" + inkscape:current-layer="svg3017" /> + <defs + id="defs3019"> + <linearGradient + id="linearGradient2381"> + <stop + style="stop-color:white;stop-opacity:1" + offset="0" + id="stop2383" /> + <stop + style="stop-color:white;stop-opacity:0" + offset="1" + id="stop2385" /> + </linearGradient> + <linearGradient + x1="415.73831" + y1="11.854" + x2="418.13361" + y2="18.8104" + id="XMLID_1758_" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.8362,0.5206,-1.1904,0.992,147.62,-30.9374)"> + <stop + style="stop-color:#ccc;stop-opacity:1" + offset="0" + id="stop3903" /> + <stop + style="stop-color:#f2f2f2;stop-opacity:1" + offset="1" + id="stop3905" /> + <a:midPointStop + style="stop-color:#CCCCCC" + offset="0" /> + <a:midPointStop + style="stop-color:#CCCCCC" + offset="0.5" /> + <a:midPointStop + style="stop-color:#F2F2F2" + offset="1" /> + </linearGradient> + <linearGradient + x1="500.70749" + y1="-13.2441" + x2="513.46442" + y2="-2.1547" + id="XMLID_1757_" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.6868,0.4269,-0.9821,0.821,111.6149,-5.7901)"> + <stop + style="stop-color:#5387ba;stop-opacity:1" + offset="0" + id="stop3890" /> + <stop + style="stop-color:#96bad6;stop-opacity:1" + offset="1" + id="stop3892" /> + <a:midPointStop + style="stop-color:#5387BA" + offset="0" /> + <a:midPointStop + style="stop-color:#5387BA" + offset="0.5" /> + <a:midPointStop + style="stop-color:#96BAD6" + offset="1" /> + </linearGradient> + <clipPath + id="XMLID_1755_"> + <use + id="use3874" + x="0" + y="0" + width="744.09448" + height="600" + xlink:href="#XMLID_343_" /> + </clipPath> + <linearGradient + x1="505.62939" + y1="-14.9526" + x2="527.49402" + y2="-0.7536" + id="XMLID_1756_" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.6868,0.4269,-0.9821,0.821,111.6149,-5.7901)"> + <stop + style="stop-color:#b4daea;stop-opacity:1" + offset="0" + id="stop3877" /> + <stop + style="stop-color:#b4daea;stop-opacity:1" + offset="0.51120001" + id="stop3879" /> + <stop + style="stop-color:#5387ba;stop-opacity:1" + offset="0.64609998" + id="stop3881" /> + <stop + style="stop-color:#16336e;stop-opacity:1" + offset="1" + id="stop3883" /> + <a:midPointStop + style="stop-color:#B4DAEA" + offset="0" /> + <a:midPointStop + style="stop-color:#B4DAEA" + offset="0.5" /> + <a:midPointStop + style="stop-color:#B4DAEA" + offset="0.5112" /> + <a:midPointStop + style="stop-color:#B4DAEA" + offset="0.5" /> + <a:midPointStop + style="stop-color:#5387BA" + offset="0.6461" /> + <a:midPointStop + style="stop-color:#5387BA" + offset="0.5" /> + <a:midPointStop + style="stop-color:#16336E" + offset="1" /> + </linearGradient> + <linearGradient + x1="471.0806" + y1="201.07761" + x2="481.91711" + y2="210.4977" + id="XMLID_1754_" + gradientUnits="userSpaceOnUse"> + <stop + style="stop-color:#6498c1;stop-opacity:1" + offset="0.005618" + id="stop3863" /> + <stop + style="stop-color:#79a9cc;stop-opacity:1" + offset="0.2332" + id="stop3865" /> + <stop + style="stop-color:#a4cde2;stop-opacity:1" + offset="0.74049997" + id="stop3867" /> + <stop + style="stop-color:#b4daea;stop-opacity:1" + offset="1" + id="stop3869" /> + <a:midPointStop + style="stop-color:#6498C1" + offset="5.618000e-003" /> + <a:midPointStop + style="stop-color:#6498C1" + offset="0.4438" /> + <a:midPointStop + style="stop-color:#B4DAEA" + offset="1" /> + </linearGradient> + <linearGradient + x1="516.57672" + y1="-15.769" + x2="516.57672" + y2="0.84280002" + id="XMLID_1753_" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.6868,0.4269,-0.9821,0.821,111.6149,-5.7901)"> + <stop + style="stop-color:#b2b2b2;stop-opacity:1" + offset="0" + id="stop3851" /> + <stop + style="stop-color:#f2f2f2;stop-opacity:1" + offset="1" + id="stop3853" /> + <a:midPointStop + style="stop-color:#B2B2B2" + offset="0" /> + <a:midPointStop + style="stop-color:#B2B2B2" + offset="0.5" /> + <a:midPointStop + style="stop-color:#F2F2F2" + offset="1" /> + </linearGradient> + <clipPath + id="XMLID_1751_"> + <use + id="use3837" + x="0" + y="0" + width="744.09448" + height="600" + xlink:href="#XMLID_338_" /> + </clipPath> + <linearGradient + x1="506.09909" + y1="-11.5137" + x2="527.99609" + y2="2.7063999" + id="XMLID_1752_" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.6868,0.4269,-0.9821,0.821,111.6149,-5.7901)"> + <stop + style="stop-color:#b4daea;stop-opacity:1" + offset="0" + id="stop3840" /> + <stop + style="stop-color:#b4daea;stop-opacity:1" + offset="0.51120001" + id="stop3842" /> + <stop + style="stop-color:#5387ba;stop-opacity:1" + offset="0.64609998" + id="stop3844" /> + <stop + style="stop-color:#16336e;stop-opacity:1" + offset="1" + id="stop3846" /> + <a:midPointStop + style="stop-color:#B4DAEA" + offset="0" /> + <a:midPointStop + style="stop-color:#B4DAEA" + offset="0.5" /> + <a:midPointStop + style="stop-color:#B4DAEA" + offset="0.5112" /> + <a:midPointStop + style="stop-color:#B4DAEA" + offset="0.5" /> + <a:midPointStop + style="stop-color:#5387BA" + offset="0.6461" /> + <a:midPointStop + style="stop-color:#5387BA" + offset="0.5" /> + <a:midPointStop + style="stop-color:#16336E" + offset="1" /> + </linearGradient> + <linearGradient + x1="468.2915" + y1="204.7612" + x2="479.39871" + y2="214.4166" + id="XMLID_1750_" + gradientUnits="userSpaceOnUse"> + <stop + style="stop-color:#5387ba;stop-opacity:1" + offset="0" + id="stop3830" /> + <stop + style="stop-color:#96bad6;stop-opacity:1" + offset="1" + id="stop3832" /> + <a:midPointStop + style="stop-color:#5387BA" + offset="0" /> + <a:midPointStop + style="stop-color:#5387BA" + offset="0.5" /> + <a:midPointStop + style="stop-color:#96BAD6" + offset="1" /> + </linearGradient> + <linearGradient + x1="502.70749" + y1="115.3013" + x2="516.39001" + y2="127.1953" + id="XMLID_1749_" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.9703,0.2419,-0.2419,0.9703,11.0227,-35.6159)"> + <stop + style="stop-color:#5387ba;stop-opacity:1" + offset="0" + id="stop3818" /> + <stop + style="stop-color:#96bad6;stop-opacity:1" + offset="1" + id="stop3820" /> + <a:midPointStop + style="stop-color:#5387BA" + offset="0" /> + <a:midPointStop + style="stop-color:#5387BA" + offset="0.5" /> + <a:midPointStop + style="stop-color:#96BAD6" + offset="1" /> + </linearGradient> + <linearGradient + x1="501.0903" + y1="-19.2544" + x2="531.85413" + y2="0.72390002" + id="XMLID_1748_" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.6868,0.4269,-0.9821,0.821,111.6149,-5.7901)"> + <stop + style="stop-color:#b4daea;stop-opacity:1" + offset="0" + id="stop3803" /> + <stop + style="stop-color:#b4daea;stop-opacity:1" + offset="0.51120001" + id="stop3805" /> + <stop + style="stop-color:#5387ba;stop-opacity:1" + offset="0.64609998" + id="stop3807" /> + <stop + style="stop-color:#16336e;stop-opacity:1" + offset="1" + id="stop3809" /> + <a:midPointStop + style="stop-color:#B4DAEA" + offset="0" /> + <a:midPointStop + style="stop-color:#B4DAEA" + offset="0.5" /> + <a:midPointStop + style="stop-color:#B4DAEA" + offset="0.5112" /> + <a:midPointStop + style="stop-color:#B4DAEA" + offset="0.5" /> + <a:midPointStop + style="stop-color:#5387BA" + offset="0.6461" /> + <a:midPointStop + style="stop-color:#5387BA" + offset="0.5" /> + <a:midPointStop + style="stop-color:#16336E" + offset="1" /> + </linearGradient> + <linearGradient + x1="481.23969" + y1="212.5742" + x2="472.92981" + y2="207.4967" + id="XMLID_2275_" + gradientUnits="userSpaceOnUse"> + <stop + style="stop-color:#f3403f;stop-opacity:1" + offset="0" + id="stop9947" /> + <stop + style="stop-color:#d02a28;stop-opacity:1" + offset="0.37889999" + id="stop9949" /> + <stop + style="stop-color:#b21714;stop-opacity:1" + offset="0.77649999" + id="stop9951" /> + <stop + style="stop-color:#a6100c;stop-opacity:1" + offset="1" + id="stop9953" /> + <a:midPointStop + style="stop-color:#F3403F" + offset="0" /> + <a:midPointStop + style="stop-color:#F3403F" + offset="0.4213" /> + <a:midPointStop + style="stop-color:#A6100C" + offset="1" /> + </linearGradient> + <clipPath + id="XMLID_2273_"> + <use + id="use9933" + x="0" + y="0" + width="744.09448" + height="600" + xlink:href="#XMLID_960_" /> + </clipPath> + <linearGradient + x1="473.7681" + y1="209.17529" + x2="486.98099" + y2="213.2001" + id="XMLID_2274_" + gradientUnits="userSpaceOnUse"> + <stop + style="stop-color:#f3403f;stop-opacity:1" + offset="0" + id="stop9936" /> + <stop + style="stop-color:#d02a28;stop-opacity:1" + offset="0.37889999" + id="stop9938" /> + <stop + style="stop-color:#b21714;stop-opacity:1" + offset="0.77649999" + id="stop9940" /> + <stop + style="stop-color:#a6100c;stop-opacity:1" + offset="1" + id="stop9942" /> + <a:midPointStop + style="stop-color:#F3403F" + offset="0" /> + <a:midPointStop + style="stop-color:#F3403F" + offset="0.4213" /> + <a:midPointStop + style="stop-color:#A6100C" + offset="1" /> + </linearGradient> + <linearGradient + x1="478.21341" + y1="-131.9297" + x2="469.85818" + y2="-140.28481" + id="XMLID_2272_" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.5592,0.829,-0.829,0.5592,101.3357,-104.791)"> + <stop + style="stop-color:#f3403f;stop-opacity:1" + offset="0" + id="stop9917" /> + <stop + style="stop-color:#d02a28;stop-opacity:1" + offset="0.37889999" + id="stop9919" /> + <stop + style="stop-color:#b21714;stop-opacity:1" + offset="0.77649999" + id="stop9921" /> + <stop + style="stop-color:#a6100c;stop-opacity:1" + offset="1" + id="stop9923" /> + <a:midPointStop + style="stop-color:#F3403F" + offset="0" /> + <a:midPointStop + style="stop-color:#F3403F" + offset="0.4213" /> + <a:midPointStop + style="stop-color:#A6100C" + offset="1" /> + </linearGradient> + <marker + refX="0" + refY="0" + orient="auto" + style="overflow:visible" + id="TriangleInM"> + <path + d="M 5.77,0 L -2.88,5 L -2.88,-5 L 5.77,0 z " + transform="scale(-0.4,-0.4)" + style="fill:#5c5c4f" + id="path3197" /> + </marker> + <linearGradient + x1="200.7363" + y1="100.4028" + x2="211.99519" + y2="89.143997" + id="XMLID_3298_" + gradientUnits="userSpaceOnUse"> + <stop + style="stop-color:#bfbfbf;stop-opacity:1" + offset="0" + id="stop20103" /> + <stop + style="stop-color:#f2f2f2;stop-opacity:1" + offset="1" + id="stop20105" /> + <a:midPointStop + offset="0" + style="stop-color:#BFBFBF" /> + <a:midPointStop + offset="0.5" + style="stop-color:#BFBFBF" /> + <a:midPointStop + offset="1" + style="stop-color:#F2F2F2" /> + </linearGradient> + <linearGradient + x1="200.7363" + y1="100.4028" + x2="211.99519" + y2="89.143997" + id="linearGradient36592" + xlink:href="#XMLID_3298_" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1.029078,0,0,1,-183.2624,-79.44655)" /> + <linearGradient + x1="181.2925" + y1="110.8481" + x2="192.6369" + y2="99.5037" + id="XMLID_3297_" + gradientUnits="userSpaceOnUse"> + <stop + style="stop-color:#e5e5e5;stop-opacity:1" + offset="0" + id="stop20096" /> + <stop + style="stop-color:#ccc;stop-opacity:1" + offset="1" + id="stop20098" /> + <a:midPointStop + offset="0" + style="stop-color:#E5E5E5" /> + <a:midPointStop + offset="0.5" + style="stop-color:#E5E5E5" /> + <a:midPointStop + offset="1" + style="stop-color:#CCCCCC" /> + </linearGradient> + <linearGradient + x1="181.2925" + y1="110.8481" + x2="192.6369" + y2="99.5037" + id="linearGradient36595" + xlink:href="#XMLID_3297_" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1.029078,0,0,1,-183.2624,-79.44655)" /> + <linearGradient + x1="211.77589" + y1="105.7749" + x2="212.6619" + y2="108.2092" + id="XMLID_3296_" + gradientUnits="userSpaceOnUse"> + <stop + style="stop-color:#0f6124;stop-opacity:1" + offset="0" + id="stop20087" /> + <stop + style="stop-color:#219630;stop-opacity:1" + offset="1" + id="stop20089" /> + <a:midPointStop + offset="0" + style="stop-color:#0F6124" /> + <a:midPointStop + offset="0.5" + style="stop-color:#0F6124" /> + <a:midPointStop + offset="1" + style="stop-color:#219630" /> + </linearGradient> + <linearGradient + x1="211.77589" + y1="105.7749" + x2="212.6619" + y2="108.2092" + id="linearGradient36677" + xlink:href="#XMLID_3296_" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1.029078,0,0,1,-183.2624,-79.44655)" /> + <linearGradient + x1="208.9834" + y1="116.8296" + x2="200.0811" + y2="96.834602" + id="XMLID_3295_" + gradientUnits="userSpaceOnUse"> + <stop + style="stop-color:#b2b2b2;stop-opacity:1" + offset="0" + id="stop20076" /> + <stop + style="stop-color:#e5e5e5;stop-opacity:1" + offset="0.5" + id="stop20078" /> + <stop + style="stop-color:white;stop-opacity:1" + offset="1" + id="stop20080" /> + <a:midPointStop + offset="0" + style="stop-color:#B2B2B2" /> + <a:midPointStop + offset="0.5" + style="stop-color:#B2B2B2" /> + <a:midPointStop + offset="0.5" + style="stop-color:#E5E5E5" /> + <a:midPointStop + offset="0.5" + style="stop-color:#E5E5E5" /> + <a:midPointStop + offset="1" + style="stop-color:#FFFFFF" /> + </linearGradient> + <linearGradient + x1="208.9834" + y1="116.8296" + x2="200.0811" + y2="96.834602" + id="linearGradient36604" + xlink:href="#XMLID_3295_" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1.029078,0,0,1,-183.2624,-79.44655)" /> + <linearGradient + x1="195.5264" + y1="97.911102" + x2="213.5213" + y2="115.9061" + id="XMLID_3294_" + gradientUnits="userSpaceOnUse"> + <stop + style="stop-color:#ccc;stop-opacity:1" + offset="0" + id="stop20069" /> + <stop + style="stop-color:white;stop-opacity:1" + offset="1" + id="stop20071" /> + <a:midPointStop + offset="0" + style="stop-color:#CCCCCC" /> + <a:midPointStop + offset="0.5" + style="stop-color:#CCCCCC" /> + <a:midPointStop + offset="1" + style="stop-color:#FFFFFF" /> + </linearGradient> + <linearGradient + x1="195.5264" + y1="97.911102" + x2="213.5213" + y2="115.9061" + id="linearGradient36607" + xlink:href="#XMLID_3294_" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1.029078,0,0,1,-183.2624,-79.44655)" /> + <linearGradient + x1="186.1938" + y1="109.1343" + x2="206.6881" + y2="88.639999" + id="XMLID_3293_" + gradientUnits="userSpaceOnUse"> + <stop + style="stop-color:#b2b2b2;stop-opacity:1" + offset="0" + id="stop20056" /> + <stop + style="stop-color:#e5e5e5;stop-opacity:1" + offset="0.16850001" + id="stop20058" /> + <stop + style="stop-color:white;stop-opacity:1" + offset="0.23029999" + id="stop20060" /> + <stop + style="stop-color:#e5e5e5;stop-opacity:1" + offset="0.2809" + id="stop20062" /> + <stop + style="stop-color:#c2c2c2;stop-opacity:1" + offset="0.5" + id="stop20064" /> + <a:midPointStop + offset="0" + style="stop-color:#B2B2B2" /> + <a:midPointStop + offset="0.5" + style="stop-color:#B2B2B2" /> + <a:midPointStop + offset="0.1685" + style="stop-color:#E5E5E5" /> + <a:midPointStop + offset="0.5" + style="stop-color:#E5E5E5" /> + <a:midPointStop + offset="0.2303" + style="stop-color:#FFFFFF" /> + <a:midPointStop + offset="0.5" + style="stop-color:#FFFFFF" /> + <a:midPointStop + offset="0.2809" + style="stop-color:#E5E5E5" /> + <a:midPointStop + offset="0.5" + style="stop-color:#E5E5E5" /> + <a:midPointStop + offset="0.5" + style="stop-color:#C2C2C2" /> + </linearGradient> + <linearGradient + x1="186.1938" + y1="109.1343" + x2="206.6881" + y2="88.639999" + id="linearGradient36610" + xlink:href="#XMLID_3293_" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1.029078,0,0,1,-183.2624,-79.44655)" /> + <linearGradient + x1="184.8569" + y1="112.2676" + x2="211.94099" + y2="89.541397" + id="XMLID_3292_" + gradientUnits="userSpaceOnUse"> + <stop + style="stop-color:#b2b2b2;stop-opacity:1" + offset="0" + id="stop20043" /> + <stop + style="stop-color:#e5e5e5;stop-opacity:1" + offset="0.16850001" + id="stop20045" /> + <stop + style="stop-color:white;stop-opacity:1" + offset="0.23029999" + id="stop20047" /> + <stop + style="stop-color:#e5e5e5;stop-opacity:1" + offset="0.2809" + id="stop20049" /> + <stop + style="stop-color:#ccc;stop-opacity:1" + offset="1" + id="stop20051" /> + <a:midPointStop + offset="0" + style="stop-color:#B2B2B2" /> + <a:midPointStop + offset="0.5" + style="stop-color:#B2B2B2" /> + <a:midPointStop + offset="0.1685" + style="stop-color:#E5E5E5" /> + <a:midPointStop + offset="0.5" + style="stop-color:#E5E5E5" /> + <a:midPointStop + offset="0.2303" + style="stop-color:#FFFFFF" /> + <a:midPointStop + offset="0.5" + style="stop-color:#FFFFFF" /> + <a:midPointStop + offset="0.2809" + style="stop-color:#E5E5E5" /> + <a:midPointStop + offset="0.5" + style="stop-color:#E5E5E5" /> + <a:midPointStop + offset="1" + style="stop-color:#CCCCCC" /> + </linearGradient> + <linearGradient + x1="184.8569" + y1="112.2676" + x2="211.94099" + y2="89.541397" + id="linearGradient36613" + xlink:href="#XMLID_3292_" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1.029078,0,0,1,-183.2624,-79.44655)" /> + <marker + refX="0" + refY="0" + orient="auto" + style="overflow:visible" + id="TriangleOutM"> + <path + d="M 5.77,0 L -2.88,5 L -2.88,-5 L 5.77,0 z " + transform="scale(0.4,0.4)" + style="fill:#5c5c4f;fill-rule:evenodd;stroke-width:1pt;marker-start:none" + id="path3238" /> + </marker> + <linearGradient + x1="165.3" + y1="99.5" + x2="165.3" + y2="115.9" + id="XMLID_3457_" + gradientUnits="userSpaceOnUse"> + <stop + style="stop-color:#999;stop-opacity:1" + offset="0" + id="stop8309" /> + <stop + style="stop-color:#b2b2b2;stop-opacity:1" + offset="0.30000001" + id="stop8311" /> + <stop + style="stop-color:#b2b2b2;stop-opacity:1" + offset="1" + id="stop8313" /> + <a:midPointstop + offset="0" + style="stop-color:#999999" /> + <a:midPointstop + offset="0.5" + style="stop-color:#999999" /> + <a:midPointstop + offset="0.3" + style="stop-color:#B2B2B2" /> + <a:midPointstop + offset="0.5" + style="stop-color:#B2B2B2" /> + <a:midPointstop + offset="1" + style="stop-color:#B2B2B2" /> + </linearGradient> + <linearGradient + x1="165.3" + y1="99.5" + x2="165.3" + y2="115.9" + id="lg1997" + xlink:href="#XMLID_3457_" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1.2,0,0,1.2,-175.9,-114.6)" /> + <linearGradient + x1="175" + y1="99.800003" + x2="175" + y2="112.5" + id="XMLID_3456_" + gradientUnits="userSpaceOnUse"> + <stop + style="stop-color:#737373;stop-opacity:1" + offset="0" + id="stop8300" /> + <stop + style="stop-color:#191919;stop-opacity:1" + offset="0.60000002" + id="stop8302" /> + <stop + style="stop-color:#191919;stop-opacity:1" + offset="1" + id="stop8304" /> + <a:midPointstop + offset="0" + style="stop-color:#737373" /> + <a:midPointstop + offset="0.5" + style="stop-color:#737373" /> + <a:midPointstop + offset="0.6" + style="stop-color:#191919" /> + <a:midPointstop + offset="0.5" + style="stop-color:#191919" /> + <a:midPointstop + offset="1" + style="stop-color:#191919" /> + </linearGradient> + <linearGradient + x1="175" + y1="99.800003" + x2="175" + y2="112.5" + id="lg2000" + xlink:href="#XMLID_3456_" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1.2,0,0,1.2,-175.9,-114.6)" /> + <linearGradient + x1="168.8" + y1="107.1" + x2="164.5" + y2="110" + id="XMLID_3455_" + gradientUnits="userSpaceOnUse"> + <stop + style="stop-color:#666;stop-opacity:1" + offset="0" + id="stop8291" /> + <stop + style="stop-color:#191919;stop-opacity:1" + offset="0.69999999" + id="stop8293" /> + <stop + style="stop-color:#191919;stop-opacity:1" + offset="1" + id="stop8295" /> + <a:midPointstop + offset="0" + style="stop-color:#666666" /> + <a:midPointstop + offset="0.5" + style="stop-color:#666666" /> + <a:midPointstop + offset="0.7" + style="stop-color:#191919" /> + <a:midPointstop + offset="0.5" + style="stop-color:#191919" /> + <a:midPointstop + offset="1" + style="stop-color:#191919" /> + </linearGradient> + <linearGradient + x1="168.8" + y1="107.1" + x2="164.5" + y2="110" + id="lg2003" + xlink:href="#XMLID_3455_" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1.2,0,0,1.2,-175.9,-114.6)" /> + <linearGradient + id="lg63694"> + <stop + style="stop-color:white;stop-opacity:1" + offset="0" + id="stop63696" /> + <stop + style="stop-color:white;stop-opacity:0" + offset="1" + id="stop63698" /> + </linearGradient> + <linearGradient + x1="458" + y1="483" + x2="465.20001" + y2="271.39999" + id="lg2006" + xlink:href="#lg63694" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(6.3e-2,0,0,6.3e-2,-1.3,-9.8)" /> + <linearGradient + x1="176.3" + y1="110.1" + x2="158.7" + y2="105" + id="XMLID_3453_" + gradientUnits="userSpaceOnUse"> + <stop + style="stop-color:#666;stop-opacity:1" + offset="0" + id="stop8271" /> + <stop + style="stop-color:#737373;stop-opacity:1" + offset="0.2" + id="stop8273" /> + <stop + style="stop-color:white;stop-opacity:1" + offset="1" + id="stop8275" /> + <a:midPointstop + offset="0" + style="stop-color:#666666" /> + <a:midPointstop + offset="0.5" + style="stop-color:#666666" /> + <a:midPointstop + offset="0.2" + style="stop-color:#737373" /> + <a:midPointstop + offset="0.5" + style="stop-color:#737373" /> + <a:midPointstop + offset="1" + style="stop-color:#FFFFFF" /> + </linearGradient> + <linearGradient + x1="176.3" + y1="110.1" + x2="158.7" + y2="105" + id="lg2009" + xlink:href="#XMLID_3453_" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1.2,0,0,1.2,-175.9,-114.6)" /> + <linearGradient + x1="173.60001" + y1="118.9" + x2="172.8" + y2="128.2" + id="XMLID_3449_" + gradientUnits="userSpaceOnUse"> + <stop + style="stop-color:#ecb300;stop-opacity:1" + offset="0" + id="stop8232" /> + <stop + style="stop-color:#fff95e;stop-opacity:1" + offset="0.60000002" + id="stop8234" /> + <stop + style="stop-color:#ecd600;stop-opacity:1" + offset="1" + id="stop8236" /> + <a:midPointstop + offset="0" + style="stop-color:#ECB300" /> + <a:midPointstop + offset="0.5" + style="stop-color:#ECB300" /> + <a:midPointstop + offset="0.6" + style="stop-color:#FFF95E" /> + <a:midPointstop + offset="0.5" + style="stop-color:#FFF95E" /> + <a:midPointstop + offset="1" + style="stop-color:#ECD600" /> + </linearGradient> + <linearGradient + x1="173.60001" + y1="118.9" + x2="172.8" + y2="128.2" + id="lg2016" + xlink:href="#XMLID_3449_" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1.2,0,0,1.2,-175.9,-114.6)" /> + <radialGradient + cx="284.60001" + cy="172.60001" + r="6.5" + fx="284.60001" + fy="172.60001" + id="XMLID_3448_" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1.4,0,0,1.4,-237.3,-126.8)"> + <stop + style="stop-color:#ecb300;stop-opacity:1" + offset="0" + id="stop8219" /> + <stop + style="stop-color:#ecb300;stop-opacity:1" + offset="0.30000001" + id="stop8221" /> + <stop + style="stop-color:#c96b00;stop-opacity:1" + offset="0.89999998" + id="stop8223" /> + <stop + style="stop-color:#9a5500;stop-opacity:1" + offset="1" + id="stop8225" /> + <a:midPointstop + offset="0" + style="stop-color:#ECB300" /> + <a:midPointstop + offset="0.5" + style="stop-color:#ECB300" /> + <a:midPointstop + offset="0.3" + style="stop-color:#ECB300" /> + <a:midPointstop + offset="0.5" + style="stop-color:#ECB300" /> + <a:midPointstop + offset="0.9" + style="stop-color:#C96B00" /> + <a:midPointstop + offset="0.5" + style="stop-color:#C96B00" /> + <a:midPointstop + offset="1" + style="stop-color:#9A5500" /> + </radialGradient> + <radialGradient + cx="284.60001" + cy="172.60001" + r="6.5" + fx="284.60001" + fy="172.60001" + id="rg2020" + xlink:href="#XMLID_3448_" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(2.513992,0,0,2.347576,-689.1621,-378.5717)" /> + <linearGradient + x1="158.10001" + y1="123" + x2="164.2" + y2="126.6" + id="XMLID_3447_" + gradientUnits="userSpaceOnUse"> + <stop + style="stop-color:#ecd600;stop-opacity:1" + offset="0" + id="stop8204" /> + <stop + style="stop-color:#ffffb3;stop-opacity:1" + offset="0.30000001" + id="stop8206" /> + <stop + style="stop-color:white;stop-opacity:1" + offset="1" + id="stop8208" /> + <a:midPointstop + offset="0" + style="stop-color:#ECD600" /> + <a:midPointstop + offset="0.5" + style="stop-color:#ECD600" /> + <a:midPointstop + offset="0.3" + style="stop-color:#FFFFB3" /> + <a:midPointstop + offset="0.5" + style="stop-color:#FFFFB3" /> + <a:midPointstop + offset="1" + style="stop-color:#FFFFFF" /> + </linearGradient> + <linearGradient + x1="158.10001" + y1="123" + x2="164.2" + y2="126.6" + id="lg2026" + xlink:href="#XMLID_3447_" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1.2,0,0,1.2,-175.9,-114.6)" /> + <radialGradient + cx="280.89999" + cy="163.7" + r="10.1" + fx="280.89999" + fy="163.7" + id="XMLID_3446_" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1.4,0,0,1.4,-237.3,-126.8)"> + <stop + style="stop-color:white;stop-opacity:1" + offset="0" + id="stop8197" /> + <stop + style="stop-color:#fff95e;stop-opacity:1" + offset="1" + id="stop8199" /> + <a:midPointstop + offset="0" + style="stop-color:#FFFFFF" /> + <a:midPointstop + offset="0.5" + style="stop-color:#FFFFFF" /> + <a:midPointstop + offset="1" + style="stop-color:#FFF95E" /> + </radialGradient> + <radialGradient + cx="280.89999" + cy="163.7" + r="10.1" + fx="280.89999" + fy="163.7" + id="rg2029" + xlink:href="#XMLID_3446_" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1.7,0,0,1.7,-457.5,-266.8)" /> + <linearGradient + x1="156.5" + y1="122.7" + x2="180.10001" + y2="122.7" + id="XMLID_3445_" + gradientUnits="userSpaceOnUse"> + <stop + style="stop-color:#ecb300;stop-opacity:1" + offset="0" + id="stop8184" /> + <stop + style="stop-color:#ffe900;stop-opacity:1" + offset="0.2" + id="stop8186" /> + <stop + style="stop-color:#ffffb3;stop-opacity:1" + offset="0.30000001" + id="stop8188" /> + <stop + style="stop-color:#ffe900;stop-opacity:1" + offset="0.40000001" + id="stop8190" /> + <stop + style="stop-color:#d68100;stop-opacity:1" + offset="1" + id="stop8192" /> + <a:midPointstop + offset="0" + style="stop-color:#ECB300" /> + <a:midPointstop + offset="0.5" + style="stop-color:#ECB300" /> + <a:midPointstop + offset="0.2" + style="stop-color:#FFE900" /> + <a:midPointstop + offset="0.5" + style="stop-color:#FFE900" /> + <a:midPointstop + offset="0.3" + style="stop-color:#FFFFB3" /> + <a:midPointstop + offset="0.5" + style="stop-color:#FFFFB3" /> + <a:midPointstop + offset="0.4" + style="stop-color:#FFE900" /> + <a:midPointstop + offset="0.5" + style="stop-color:#FFE900" /> + <a:midPointstop + offset="1" + style="stop-color:#D68100" /> + </linearGradient> + <linearGradient + x1="156.5" + y1="122.7" + x2="180.10001" + y2="122.7" + id="lg2032" + xlink:href="#XMLID_3445_" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1.2,0,0,1.2,-175.9,-114.6)" /> + <linearGradient + x1="156.39999" + y1="115.4" + x2="180.10001" + y2="115.4" + id="XMLID_3444_" + gradientUnits="userSpaceOnUse"> + <stop + style="stop-color:#ecb300;stop-opacity:1" + offset="0" + id="stop8171" /> + <stop + style="stop-color:#ffe900;stop-opacity:1" + offset="0.2" + id="stop8173" /> + <stop + style="stop-color:#ffffb3;stop-opacity:1" + offset="0.30000001" + id="stop8175" /> + <stop + style="stop-color:#ffe900;stop-opacity:1" + offset="0.40000001" + id="stop8177" /> + <stop + style="stop-color:#d68100;stop-opacity:1" + offset="1" + id="stop8179" /> + <a:midPointstop + offset="0" + style="stop-color:#ECB300" /> + <a:midPointstop + offset="0.5" + style="stop-color:#ECB300" /> + <a:midPointstop + offset="0.2" + style="stop-color:#FFE900" /> + <a:midPointstop + offset="0.5" + style="stop-color:#FFE900" /> + <a:midPointstop + offset="0.3" + style="stop-color:#FFFFB3" /> + <a:midPointstop + offset="0.5" + style="stop-color:#FFFFB3" /> + <a:midPointstop + offset="0.4" + style="stop-color:#FFE900" /> + <a:midPointstop + offset="0.5" + style="stop-color:#FFE900" /> + <a:midPointstop + offset="1" + style="stop-color:#D68100" /> + </linearGradient> + <linearGradient + x1="156.39999" + y1="115.4" + x2="180.10001" + y2="115.4" + id="lg2035" + xlink:href="#XMLID_3444_" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1.2,0,0,1.2,-175.9,-114.6)" /> + <linearGradient + x1="379.70001" + y1="167.89999" + x2="383.89999" + y2="172.89999" + id="lg4286_" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.8,0.2,-0.2,0.8,78.8,38.1)"> + <stop + style="stop-color:white;stop-opacity:1" + offset="0" + id="s16159" /> + <stop + style="stop-color:white;stop-opacity:1" + offset="0.1" + id="s16161" /> + <stop + style="stop-color:#737373;stop-opacity:1" + offset="1" + id="s16163" /> + <ns:midPointStop + style="stop-color:#FFFFFF" + offset="0" /> + <ns:midPointStop + style="stop-color:#FFFFFF" + offset="0.5" /> + <ns:midPointStop + style="stop-color:#FFFFFF" + offset="0.1" /> + <ns:midPointStop + style="stop-color:#FFFFFF" + offset="0.5" /> + <ns:midPointStop + style="stop-color:#737373" + offset="1" /> + </linearGradient> + <linearGradient + x1="379.60001" + y1="167.8" + x2="383.79999" + y2="172" + id="lg6416" + xlink:href="#lg4286_" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(2.622156,0.623859,-0.623859,2.62182,-882.9706,-673.7921)" /> + <linearGradient + x1="384.20001" + y1="169.8" + x2="384.79999" + y2="170.39999" + id="lg4285_" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.8,0.2,-0.2,0.8,78.8,38.1)"> + <stop + style="stop-color:#737373;stop-opacity:1" + offset="0" + id="s16152" /> + <stop + style="stop-color:#d9d9d9;stop-opacity:1" + offset="1" + id="s16154" /> + <ns:midPointStop + style="stop-color:#737373" + offset="0" /> + <ns:midPointStop + style="stop-color:#737373" + offset="0.5" /> + <ns:midPointStop + style="stop-color:#D9D9D9" + offset="1" /> + </linearGradient> + <linearGradient + x1="384.20001" + y1="169.8" + x2="384.79999" + y2="170.39999" + id="lg6453" + xlink:href="#lg4285_" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(2.6,0.6,-0.6,2.6,-883,-673.8)" /> + <linearGradient + x1="380.5" + y1="172.60001" + x2="382.79999" + y2="173.7" + id="lg4284_" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.8,0.2,-0.2,0.8,78.8,38.1)"> + <stop + style="stop-color:gray;stop-opacity:1" + offset="0" + id="s16145" /> + <stop + style="stop-color:#e5e5e5;stop-opacity:1" + offset="1" + id="s16147" /> + <ns:midPointStop + style="stop-color:#808080" + offset="0" /> + <ns:midPointStop + style="stop-color:#808080" + offset="0.5" /> + <ns:midPointStop + style="stop-color:#E5E5E5" + offset="1" /> + </linearGradient> + <linearGradient + x1="380.5" + y1="172.60001" + x2="382.79999" + y2="173.7" + id="lg6456" + xlink:href="#lg4284_" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(2.6,0.6,-0.6,2.6,-883,-673.8)" /> + <radialGradient + cx="347.29999" + cy="244.5" + r="5.1999998" + fx="347.29999" + fy="244.5" + id="lg4282_" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(3.4,0,0,3.4,-1148,-802)"> + <stop + style="stop-color:#333;stop-opacity:1" + offset="0" + id="s16135" /> + <stop + style="stop-color:#999;stop-opacity:1" + offset="1" + id="s16137" /> + <ns:midPointStop + style="stop-color:#333333" + offset="0" /> + <ns:midPointStop + style="stop-color:#333333" + offset="0.5" /> + <ns:midPointStop + style="stop-color:#999999" + offset="1" /> + </radialGradient> + <linearGradient + x1="310.39999" + y1="397.70001" + x2="310.89999" + y2="399.5" + id="lg4280_" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.7,-0.7,0.7,0.7,-153.4,180.6)"> + <stop + style="stop-color:#ffcd00;stop-opacity:1" + offset="0" + id="s16111" /> + <stop + style="stop-color:#ffffb3;stop-opacity:1" + offset="0.60000002" + id="s16113" /> + <stop + style="stop-color:#ffffb3;stop-opacity:1" + offset="1" + id="s16115" /> + <ns:midPointStop + style="stop-color:#FFCD00" + offset="0" /> + <ns:midPointStop + style="stop-color:#FFCD00" + offset="0.5" /> + <ns:midPointStop + style="stop-color:#FFFFB3" + offset="0.6" /> + <ns:midPointStop + style="stop-color:#FFFFB3" + offset="0.5" /> + <ns:midPointStop + style="stop-color:#FFFFB3" + offset="1" /> + </linearGradient> + <linearGradient + x1="310.39999" + y1="397.70001" + x2="310.89999" + y2="399.5" + id="lg6467" + xlink:href="#lg4280_" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(2.4,-2.4,2.4,2.4,-1663.6,-195)" /> + <linearGradient + x1="310.89999" + y1="395.79999" + x2="313.29999" + y2="403.10001" + id="lg4279_" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.7,-0.7,0.7,0.7,-153.4,180.6)"> + <stop + style="stop-color:#ffffb3;stop-opacity:1" + offset="0" + id="s16100" /> + <stop + style="stop-color:#ffffb3;stop-opacity:1" + offset="0.40000001" + id="s16102" /> + <stop + style="stop-color:#ffcd00;stop-opacity:1" + offset="0.89999998" + id="s16104" /> + <stop + style="stop-color:#ffcd00;stop-opacity:1" + offset="1" + id="s16106" /> + <ns:midPointStop + style="stop-color:#FFFFB3" + offset="0" /> + <ns:midPointStop + style="stop-color:#FFFFB3" + offset="0.5" /> + <ns:midPointStop + style="stop-color:#FFFFB3" + offset="0.4" /> + <ns:midPointStop + style="stop-color:#FFFFB3" + offset="0.5" /> + <ns:midPointStop + style="stop-color:#FFCD00" + offset="0.9" /> + <ns:midPointStop + style="stop-color:#FFCD00" + offset="0.5" /> + <ns:midPointStop + style="stop-color:#FFCD00" + offset="1" /> + </linearGradient> + <linearGradient + x1="310.89999" + y1="395.79999" + x2="313.29999" + y2="403.10001" + id="lg6465" + xlink:href="#lg4279_" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(2.4,-2.4,2.4,2.4,-1663.6,-195)" /> + <linearGradient + x1="307.79999" + y1="395.20001" + x2="313.79999" + y2="413.60001" + id="lg4278_" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.7,-0.7,0.7,0.7,-153.4,180.6)"> + <stop + style="stop-color:#ffffb3;stop-opacity:1" + offset="0" + id="s16091" /> + <stop + style="stop-color:#fcd72f;stop-opacity:1" + offset="0.40000001" + id="s16093" /> + <stop + style="stop-color:#ffcd00;stop-opacity:1" + offset="1" + id="s16095" /> + <ns:midPointStop + style="stop-color:#FFFFB3" + offset="0" /> + <ns:midPointStop + style="stop-color:#FFFFB3" + offset="0.5" /> + <ns:midPointStop + style="stop-color:#FCD72F" + offset="0.4" /> + <ns:midPointStop + style="stop-color:#FCD72F" + offset="0.5" /> + <ns:midPointStop + style="stop-color:#FFCD00" + offset="1" /> + </linearGradient> + <linearGradient + x1="306.5" + y1="393" + x2="309" + y2="404" + id="lg6400" + xlink:href="#lg4278_" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(2.4,-2.4,2.4,2.4,-1663.6,-195)" /> + <linearGradient + x1="352.10001" + y1="253.60001" + x2="348.5" + y2="237.8" + id="lg4276_" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(3.4,0,0,3.4,-1148,-802)"> + <stop + style="stop-color:#ffff87;stop-opacity:1" + offset="0" + id="s16077" /> + <stop + style="stop-color:#ffad00;stop-opacity:1" + offset="1" + id="s16079" /> + <ns:midPointStop + style="stop-color:#FFFF87" + offset="0" /> + <ns:midPointStop + style="stop-color:#FFFF87" + offset="0.5" /> + <ns:midPointStop + style="stop-color:#FFAD00" + offset="1" /> + </linearGradient> + <linearGradient + x1="335.60001" + y1="354.79999" + x2="337.89999" + y2="354.79999" + id="lg4275_" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.9,-0.5,0.5,0.9,-121.7,105.1)"> + <stop + style="stop-color:#d9d9d9;stop-opacity:1" + offset="0" + id="s16057" /> + <stop + style="stop-color:white;stop-opacity:1" + offset="0.80000001" + id="s16059" /> + <stop + style="stop-color:white;stop-opacity:1" + offset="1" + id="s16061" /> + <ns:midPointStop + style="stop-color:#D9D9D9" + offset="0" /> + <ns:midPointStop + style="stop-color:#D9D9D9" + offset="0.5" /> + <ns:midPointStop + style="stop-color:#FFFFFF" + offset="0.8" /> + <ns:midPointStop + style="stop-color:#FFFFFF" + offset="0.5" /> + <ns:midPointStop + style="stop-color:#FFFFFF" + offset="1" /> + </linearGradient> + <linearGradient + x1="335.60001" + y1="354.79999" + x2="337.89999" + y2="354.79999" + id="lg6463" + xlink:href="#lg4275_" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(2.9,-1.7,1.7,2.9,-1557,-448.7)" /> + <linearGradient + x1="337.39999" + y1="353.10001" + x2="339.39999" + y2="357.10001" + id="lg4274_" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.9,-0.5,0.5,0.9,-121.7,105.1)"> + <stop + style="stop-color:white;stop-opacity:1" + offset="0" + id="s16048" /> + <stop + style="stop-color:white;stop-opacity:1" + offset="0.1" + id="s16050" /> + <stop + style="stop-color:#ccc;stop-opacity:1" + offset="1" + id="s16052" /> + <ns:midPointStop + style="stop-color:#FFFFFF" + offset="0" /> + <ns:midPointStop + style="stop-color:#FFFFFF" + offset="0.5" /> + <ns:midPointStop + style="stop-color:#FFFFFF" + offset="0.1" /> + <ns:midPointStop + style="stop-color:#FFFFFF" + offset="0.5" /> + <ns:midPointStop + style="stop-color:#CCCCCC" + offset="1" /> + </linearGradient> + <linearGradient + x1="337.39999" + y1="353.10001" + x2="339.39999" + y2="357.10001" + id="lg6461" + xlink:href="#lg4274_" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(2.9,-1.7,1.7,2.9,-1557,-448.7)" /> + <linearGradient + x1="334.39999" + y1="355.5" + x2="335.5" + y2="356.79999" + id="lg4273_" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.9,-0.5,0.5,0.9,-121.7,105.1)"> + <stop + style="stop-color:white;stop-opacity:1" + offset="0" + id="s16041" /> + <stop + style="stop-color:#ccc;stop-opacity:1" + offset="1" + id="s16043" /> + <ns:midPointStop + style="stop-color:#FFFFFF" + offset="5.6e-003" /> + <ns:midPointStop + style="stop-color:#FFFFFF" + offset="0.5" /> + <ns:midPointStop + style="stop-color:#CCCCCC" + offset="1" /> + </linearGradient> + <linearGradient + x1="334.39999" + y1="355.5" + x2="335.5" + y2="356.79999" + id="lg6381" + xlink:href="#lg4273_" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(2.9,-1.7,1.7,2.9,-1557,-448.7)" /> + <linearGradient + x1="348.39999" + y1="247.39999" + x2="354.10001" + y2="242" + id="lg4271_" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(3.4,0,0,3.4,-1148,-802)"> + <stop + style="stop-color:#f2f2f2;stop-opacity:1" + offset="0" + id="s16025" /> + <stop + style="stop-color:#9e9e9e;stop-opacity:1" + offset="0.40000001" + id="s16027" /> + <stop + style="stop-color:black;stop-opacity:1" + offset="1" + id="s16029" /> + <ns:midPointStop + style="stop-color:#F2F2F2" + offset="0" /> + <ns:midPointStop + style="stop-color:#F2F2F2" + offset="0.5" /> + <ns:midPointStop + style="stop-color:#000000" + offset="1" /> + </linearGradient> + <linearGradient + x1="351.29999" + y1="257.29999" + x2="346.29999" + y2="235.5" + id="lg4270_" + gradientUnits="userSpaceOnUse"> + <stop + style="stop-color:#ffff87;stop-opacity:1" + offset="0" + id="s16007" /> + <stop + style="stop-color:#ffad00;stop-opacity:1" + offset="1" + id="s16009" /> + <ns:midPointStop + style="stop-color:#FFFF87" + offset="0" /> + <ns:midPointStop + style="stop-color:#FFFF87" + offset="0.5" /> + <ns:midPointStop + style="stop-color:#FFAD00" + offset="1" /> + </linearGradient> + <linearGradient + x1="351.29999" + y1="257.29999" + x2="346.29999" + y2="235.5" + id="lg6459" + xlink:href="#lg4270_" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(3.4,0,0,3.4,-1148,-802)" /> + <linearGradient + x1="43.799999" + y1="32.5" + x2="63.299999" + y2="66.400002" + id="XMLID_2708_" + gradientUnits="userSpaceOnUse"> + <stop + style="stop-color:white;stop-opacity:1" + offset="0" + id="stop75318" /> + <stop + style="stop-color:#fffcea;stop-opacity:1" + offset="1" + id="stop75320" /> + <a:midPointStop + style="stop-color:#FFFFFF" + offset="0" /> + <a:midPointStop + style="stop-color:#FFFFFF" + offset="0.5" /> + <a:midPointStop + style="stop-color:#FFFCEA" + offset="1" /> + </linearGradient> + <linearGradient + x1="43.799999" + y1="32.5" + x2="63.299999" + y2="66.400002" + id="lg1907" + xlink:href="#XMLID_2708_" + gradientUnits="userSpaceOnUse" + gradientTransform="translate(-29,-22.6)" /> + <linearGradient + x1="52.5" + y1="40.400002" + x2="58.200001" + y2="64" + id="XMLID_2707_" + gradientUnits="userSpaceOnUse"> + <stop + style="stop-color:#ffdea0;stop-opacity:1" + offset="0" + id="stop75305" /> + <stop + style="stop-color:#ffd89e;stop-opacity:1" + offset="0.30000001" + id="stop75307" /> + <stop + style="stop-color:#ffd79e;stop-opacity:1" + offset="0.30000001" + id="stop75309" /> + <stop + style="stop-color:#dbaf6d;stop-opacity:1" + offset="0.69999999" + id="stop75311" /> + <stop + style="stop-color:#6f4c24;stop-opacity:1" + offset="1" + id="stop75313" /> + <a:midPointStop + style="stop-color:#FFDEA0" + offset="0" /> + <a:midPointStop + style="stop-color:#FFDEA0" + offset="0.6" /> + <a:midPointStop + style="stop-color:#FFD79E" + offset="0.3" /> + <a:midPointStop + style="stop-color:#FFD79E" + offset="0.5" /> + <a:midPointStop + style="stop-color:#DBAF6D" + offset="0.7" /> + <a:midPointStop + style="stop-color:#DBAF6D" + offset="0.5" /> + <a:midPointStop + style="stop-color:#6F4C24" + offset="1" /> + </linearGradient> + <linearGradient + x1="52.5" + y1="40.400002" + x2="58.200001" + y2="64" + id="lg1910" + xlink:href="#XMLID_2707_" + gradientUnits="userSpaceOnUse" + gradientTransform="translate(-29,-22.6)" /> + <linearGradient + x1="58" + y1="73.199997" + x2="44.5" + y2="19" + id="XMLID_2704_" + gradientUnits="userSpaceOnUse" + gradientTransform="translate(-29,-22.6)"> + <stop + style="stop-color:#d4a96c;stop-opacity:1" + offset="0.5" + id="stop75284" /> + <stop + style="stop-color:#dcb273;stop-opacity:1" + offset="0.60000002" + id="stop75286" /> + <stop + style="stop-color:#f0ca87;stop-opacity:1" + offset="0.80000001" + id="stop75288" /> + <stop + style="stop-color:#ffdc96;stop-opacity:1" + offset="0.69999999" + id="stop75290" /> + <stop + style="stop-color:#c18a42;stop-opacity:1" + offset="1" + id="stop75292" /> + <a:midPointStop + style="stop-color:#D4A96C" + offset="0.5" /> + <a:midPointStop + style="stop-color:#D4A96C" + offset="0.6" /> + <a:midPointStop + style="stop-color:#FFDC96" + offset="0.7" /> + <a:midPointStop + style="stop-color:#FFDC96" + offset="0.5" /> + <a:midPointStop + style="stop-color:#C18A42" + offset="1" /> + </linearGradient> + <linearGradient + x1="53.700001" + y1="32" + x2="53.700001" + y2="64.599998" + id="XMLID_2703_" + gradientUnits="userSpaceOnUse"> + <stop + style="stop-color:#e5c9b0;stop-opacity:1" + offset="0" + id="stop75268" /> + <stop + style="stop-color:#e5c9b0;stop-opacity:1" + offset="0.40000001" + id="stop75270" /> + <stop + style="stop-color:#c0aa94;stop-opacity:1" + offset="1" + id="stop75272" /> + <a:midPointStop + style="stop-color:#E5C9B0" + offset="0" /> + <a:midPointStop + style="stop-color:#E5C9B0" + offset="0.5" /> + <a:midPointStop + style="stop-color:#E5C9B0" + offset="0.4" /> + <a:midPointStop + style="stop-color:#E5C9B0" + offset="0.5" /> + <a:midPointStop + style="stop-color:#C0AA94" + offset="1" /> + </linearGradient> + <linearGradient + x1="53.700001" + y1="32" + x2="53.700001" + y2="64.599998" + id="lg1916" + xlink:href="#XMLID_2703_" + gradientUnits="userSpaceOnUse" + gradientTransform="translate(-29,-22.6)" /> + <linearGradient + x1="224.31" + y1="19.450001" + x2="214.33" + y2="11.46" + id="XMLID_419_" + gradientUnits="userSpaceOnUse"> + <stop + style="stop-color:#404040;stop-opacity:1" + offset="0" + id="s1903" /> + <stop + style="stop-color:#6d6d6d;stop-opacity:1" + offset="0.33000001" + id="s1905" /> + <stop + style="stop-color:#e9e9e9;stop-opacity:1" + offset="1" + id="s1907" /> + <a:midPointStop + offset="0" + style="stop-color:#404040" /> + <a:midPointStop + offset="0.5" + style="stop-color:#404040" /> + <a:midPointStop + offset="0.33" + style="stop-color:#6D6D6D" /> + <a:midPointStop + offset="0.5" + style="stop-color:#6D6D6D" /> + <a:midPointStop + offset="1" + style="stop-color:#E9E9E9" /> + </linearGradient> + <linearGradient + x1="221.84" + y1="32.779999" + x2="212.2" + y2="20.27" + id="lg1988" + xlink:href="#XMLID_419_" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1.33,0,0,1.31,-274.2,-5.2)" /> + <linearGradient + x1="228.35001" + y1="33.279999" + x2="215.42999" + y2="33.279999" + id="lg1900" + gradientUnits="userSpaceOnUse"> + <stop + style="stop-color:white;stop-opacity:1" + offset="0" + id="s1902" /> + <stop + style="stop-color:white;stop-opacity:0" + offset="1" + id="s1906" /> + <a:midPointStop + style="stop-color:#575757" + offset="0" /> + <a:midPointStop + style="stop-color:#575757" + offset="0.5" /> + <a:midPointStop + style="stop-color:#6D6D6D" + offset="0.33" /> + <a:midPointStop + style="stop-color:#6D6D6D" + offset="0.5" /> + <a:midPointStop + style="stop-color:#D3D3D3" + offset="1" /> + </linearGradient> + <linearGradient + x1="234.81" + y1="33.279999" + x2="228.27" + y2="33.279999" + id="lg1908" + xlink:href="#lg1900" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1.33,0,0,1.31,-274.2,-5.2)" /> + <linearGradient + x1="228.35001" + y1="33.279999" + x2="215.42999" + y2="33.279999" + id="XMLID_416_" + gradientUnits="userSpaceOnUse"> + <stop + style="stop-color:#575757;stop-opacity:1" + offset="0" + id="s1874" /> + <stop + style="stop-color:#6d6d6d;stop-opacity:1" + offset="0.33000001" + id="s1876" /> + <stop + style="stop-color:#d3d3d3;stop-opacity:1" + offset="1" + id="s1878" /> + <a:midPointStop + offset="0" + style="stop-color:#575757" /> + <a:midPointStop + offset="0.5" + style="stop-color:#575757" /> + <a:midPointStop + offset="0.33" + style="stop-color:#6D6D6D" /> + <a:midPointStop + offset="0.5" + style="stop-color:#6D6D6D" /> + <a:midPointStop + offset="1" + style="stop-color:#D3D3D3" /> + </linearGradient> + <linearGradient + x1="228.35001" + y1="33.279999" + x2="215.42999" + y2="33.279999" + id="lg1991" + xlink:href="#XMLID_416_" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1.33,0,0,1.31,-274.2,-5.2)" /> + <radialGradient + cx="603.19" + cy="230.77" + r="1.67" + fx="603.19" + fy="230.77" + id="x5010_" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1.1,0,0,1.1,-54.33,-75.4)"> + <stop + style="stop-color:#c9ffc9;stop-opacity:1" + offset="0" + id="stop29201" /> + <stop + style="stop-color:#23a11f;stop-opacity:1" + offset="1" + id="stop29203" /> + <a:midPointStop + offset="0" + style="stop-color:#C9FFC9" /> + <a:midPointStop + offset="0.5" + style="stop-color:#C9FFC9" /> + <a:midPointStop + offset="1" + style="stop-color:#23A11F" /> + </radialGradient> + <radialGradient + cx="603.19" + cy="230.77" + r="1.67" + fx="603.19" + fy="230.77" + id="radialGradient5711" + xlink:href="#x5010_" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1.23,0,0,1.23,-709.93,-245.02)" /> + <linearGradient + x1="592.31" + y1="162.60001" + x2="609.32001" + y2="145.59" + id="lg5722" + xlink:href="#x5003_" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1.12,0,0,1.12,-649.08,-160.62)" /> + <linearGradient + x1="601.48999" + y1="170.16" + x2="613.84003" + y2="170.16" + id="x5002_" + gradientUnits="userSpaceOnUse"> + <stop + style="stop-color:#d9d9d9;stop-opacity:1" + offset="0" + id="stop29134" /> + <stop + style="stop-color:white;stop-opacity:1" + offset="0.2" + id="stop29136" /> + <stop + style="stop-color:#999;stop-opacity:1" + offset="1" + id="stop29138" /> + <a:midPointStop + offset="0" + style="stop-color:#D9D9D9" /> + <a:midPointStop + offset="0.5" + style="stop-color:#D9D9D9" /> + <a:midPointStop + offset="0.20" + style="stop-color:#FFFFFF" /> + <a:midPointStop + offset="0.5" + style="stop-color:#FFFFFF" /> + <a:midPointStop + offset="1" + style="stop-color:#999999" /> + </linearGradient> + <linearGradient + x1="601.48999" + y1="170.16" + x2="613.84003" + y2="170.16" + id="lg5725" + xlink:href="#x5002_" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1.12,0,0,1.12,-649.08,-160.62)" /> + <linearGradient + x1="592.20001" + y1="156.45" + x2="609.98999" + y2="174.23" + id="x5004_" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1.12,0,0,1.12,-649.08,-160.62)"> + <stop + style="stop-color:#d9d9d9;stop-opacity:1" + offset="0" + id="stop29157" /> + <stop + style="stop-color:white;stop-opacity:1" + offset="1" + id="stop29159" /> + <a:midPointStop + offset="0" + style="stop-color:#D9D9D9" /> + <a:midPointStop + offset="0.5" + style="stop-color:#D9D9D9" /> + <a:midPointStop + offset="1" + style="stop-color:#FFFFFF" /> + </linearGradient> + <linearGradient + x1="592.20001" + y1="156.45" + x2="609.98999" + y2="174.23" + id="lg5728" + xlink:href="#x5004_" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1.12,0,0,1.12,-649.08,-160.62)" /> + <linearGradient + x1="592.31" + y1="162.60001" + x2="609.32001" + y2="145.59" + id="x5003_" + gradientUnits="userSpaceOnUse"> + <stop + style="stop-color:#f2f2f2;stop-opacity:1" + offset="0" + id="stop29143" /> + <stop + style="stop-color:#e5e5e5;stop-opacity:1" + offset="1" + id="stop29145" /> + <a:midPointStop + offset="0" + style="stop-color:#F2F2F2" /> + <a:midPointStop + offset="0.5" + style="stop-color:#F2F2F2" /> + <a:midPointStop + offset="1" + style="stop-color:#E5E5E5" /> + </linearGradient> + <linearGradient + x1="592.31" + y1="162.60001" + x2="609.32001" + y2="145.59" + id="lg5732" + xlink:href="#x5003_" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1.12,0,0,1.12,-649.08,-160.62)" /> + <linearGradient + x1="592.20001" + y1="156.45" + x2="609.98999" + y2="174.24001" + id="x5000_" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1.12,0,0,1.12,-649.08,-160.62)"> + <stop + style="stop-color:#d9d9d9;stop-opacity:1" + offset="0" + id="stop29124" /> + <stop + style="stop-color:white;stop-opacity:1" + offset="1" + id="stop29126" /> + <a:midPointStop + offset="0" + style="stop-color:#D9D9D9" /> + <a:midPointStop + offset="0.5" + style="stop-color:#D9D9D9" /> + <a:midPointStop + offset="1" + style="stop-color:#FFFFFF" /> + </linearGradient> + <linearGradient + x1="592.20001" + y1="156.45" + x2="609.98999" + y2="174.24001" + id="lg5735" + xlink:href="#x5000_" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1.12,0,0,1.12,-649.08,-160.62)" /> + <linearGradient + x1="308.54999" + y1="149.89999" + x2="299.72" + y2="148.83" + id="XMLID_2433_" + gradientUnits="userSpaceOnUse"> + <stop + style="stop-color:#d6d6d6;stop-opacity:1" + offset="0" + id="71615" /> + <stop + style="stop-color:#a5a5a5;stop-opacity:1" + offset="1" + id="71617" /> + <a:midPointStop + offset="0" + style="stop-color:#D6D6D6" /> + <a:midPointStop + offset="0.5" + style="stop-color:#D6D6D6" /> + <a:midPointStop + offset="1" + style="stop-color:#A5A5A5" /> + </linearGradient> + <linearGradient + x1="308.54999" + y1="149.89999" + x2="299.72" + y2="148.83" + id="lg1952" + xlink:href="#XMLID_2433_" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1.03,0,0,1.03,-279.57,-124.36)" /> + <radialGradient + cx="307.39999" + cy="121" + r="23.35" + fx="307.39999" + fy="121" + id="XMLID_2432_" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.98,0,0,0.98,2.88,2.75)"> + <stop + style="stop-color:#d2d2d2;stop-opacity:1" + offset="0.19" + id="71592" /> + <stop + style="stop-color:#cfcfcf;stop-opacity:1" + offset="0.44999999" + id="71594" /> + <stop + style="stop-color:#c7c7c7;stop-opacity:1" + offset="0.60000002" + id="71596" /> + <stop + style="stop-color:#b9b9b9;stop-opacity:1" + offset="0.74000001" + id="71598" /> + <stop + style="stop-color:#a4a4a4;stop-opacity:1" + offset="0.86000001" + id="71600" /> + <stop + style="stop-color:#8a8a8a;stop-opacity:1" + offset="0.95999998" + id="71602" /> + <stop + style="stop-color:gray;stop-opacity:1" + offset="1" + id="71604" /> + <a:midPointStop + offset="0.19" + style="stop-color:#D2D2D2" /> + <a:midPointStop + offset="0.8" + style="stop-color:#D2D2D2" /> + <a:midPointStop + offset="1" + style="stop-color:#808080" /> + </radialGradient> + <radialGradient + cx="307.39999" + cy="121" + r="23.35" + fx="307.39999" + fy="121" + id="radialGradient2331" + xlink:href="#XMLID_2432_" + gradientUnits="userSpaceOnUse" + gradientTransform="translate(-276.62,-121.54)" /> + <linearGradient + x1="294.13" + y1="127.07" + x2="294.13" + y2="142.2" + id="XMLID_2430_" + gradientUnits="userSpaceOnUse"> + <stop + style="stop-color:#b5d8ff;stop-opacity:1" + offset="0" + id="71582" /> + <stop + style="stop-color:black;stop-opacity:1" + offset="1" + id="71584" /> + <a:midPointStop + offset="0" + style="stop-color:#B5D8FF" /> + <a:midPointStop + offset="0.5" + style="stop-color:#B5D8FF" /> + <a:midPointStop + offset="1" + style="stop-color:#000000" /> + </linearGradient> + <linearGradient + x1="294.13" + y1="127.07" + x2="294.13" + y2="142.2" + id="lg2820" + xlink:href="#XMLID_2430_" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1.03,0,0,1.03,-279.57,-124.36)" /> + <linearGradient + x1="279.10999" + y1="148.03" + x2="309.16" + y2="148.03" + id="XMLID_2429_" + gradientUnits="userSpaceOnUse"> + <stop + style="stop-color:#e1e1e1;stop-opacity:1" + offset="0" + id="71564" /> + <stop + style="stop-color:#e1e1e1;stop-opacity:1" + offset="0.25" + id="71566" /> + <stop + style="stop-color:#a5a5a5;stop-opacity:1" + offset="0.44" + id="71568" /> + <stop + style="stop-color:#a5a5a5;stop-opacity:1" + offset="1" + id="71570" /> + <a:midPointStop + offset="0" + style="stop-color:#E1E1E1" /> + <a:midPointStop + offset="0.5" + style="stop-color:#E1E1E1" /> + <a:midPointStop + offset="0.25" + style="stop-color:#E1E1E1" /> + <a:midPointStop + offset="0.5" + style="stop-color:#E1E1E1" /> + <a:midPointStop + offset="0.44" + style="stop-color:#A5A5A5" /> + <a:midPointStop + offset="0.5" + style="stop-color:#A5A5A5" /> + <a:midPointStop + offset="1" + style="stop-color:#A5A5A5" /> + </linearGradient> + <linearGradient + x1="279.10999" + y1="148.03" + x2="309.16" + y2="148.03" + id="lg2818" + xlink:href="#XMLID_2429_" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1.03,0,0,1.03,-279.57,-124.36)" /> + <radialGradient + cx="622.34302" + cy="14.449" + r="26.496" + fx="622.34302" + fy="14.449" + id="lg3499_" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.851,0,0,0.849,69.297,51.658)"> + <stop + style="stop-color:#23468e;stop-opacity:1" + offset="0" + id="stop10972" /> + <stop + style="stop-color:#012859;stop-opacity:1" + offset="1" + id="stop10974" /> + <a:midPointStop + offset="0" + style="stop-color:#23468E" /> + <a:midPointStop + offset="0.5" + style="stop-color:#23468E" /> + <a:midPointStop + offset="1" + style="stop-color:#012859" /> + </radialGradient> + <radialGradient + cx="622.34302" + cy="14.449" + r="26.496" + fx="622.34302" + fy="14.449" + id="rg5791" + xlink:href="#lg3499_" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.858,0,0,0.857,-511.7,9.02)" /> + <linearGradient + x1="616.112" + y1="76.247002" + x2="588.14099" + y2="60.742001" + id="lg3497_" + gradientUnits="userSpaceOnUse"> + <stop + style="stop-color:#01326e;stop-opacity:1" + offset="0" + id="stop10962" /> + <stop + style="stop-color:#012859;stop-opacity:1" + offset="1" + id="stop10964" /> + <a:midPointStop + offset="0" + style="stop-color:#01326E" /> + <a:midPointStop + offset="0.5" + style="stop-color:#01326E" /> + <a:midPointStop + offset="1" + style="stop-color:#012859" /> + </linearGradient> + <linearGradient + x1="617.698" + y1="82.445999" + x2="585.95203" + y2="54.848999" + id="lg3496_" + gradientUnits="userSpaceOnUse"> + <stop + style="stop-color:#e5e5e5;stop-opacity:1" + offset="0" + id="stop10950" /> + <stop + style="stop-color:#ccc;stop-opacity:1" + offset="1" + id="stop10952" /> + <a:midPointStop + offset="0" + style="stop-color:#E5E5E5" /> + <a:midPointStop + offset="0.5" + style="stop-color:#E5E5E5" /> + <a:midPointStop + offset="1" + style="stop-color:#CCCCCC" /> + </linearGradient> + <linearGradient + x1="617.698" + y1="82.445999" + x2="585.95203" + y2="54.848999" + id="lg5794" + xlink:href="#lg3496_" + gradientUnits="userSpaceOnUse" /> + <linearGradient + x1="601.39001" + y1="55.341" + x2="588.29199" + y2="71.515999" + id="lg3495_" + gradientUnits="userSpaceOnUse"> + <stop + style="stop-color:#d9d9d9;stop-opacity:1" + offset="0" + id="stop10941" /> + <stop + style="stop-color:#f2f2f2;stop-opacity:1" + offset="0.52200001" + id="stop10943" /> + <stop + style="stop-color:#ccc;stop-opacity:1" + offset="1" + id="stop10945" /> + <a:midPointStop + offset="0" + style="stop-color:#D9D9D9" /> + <a:midPointStop + offset="0.5" + style="stop-color:#D9D9D9" /> + <a:midPointStop + offset="0.522" + style="stop-color:#F2F2F2" /> + <a:midPointStop + offset="0.5" + style="stop-color:#F2F2F2" /> + <a:midPointStop + offset="1" + style="stop-color:#CCCCCC" /> + </linearGradient> + <linearGradient + x1="601.39001" + y1="55.341" + x2="588.29199" + y2="71.515999" + id="lg5771" + xlink:href="#lg3495_" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1.009,0,0,1.009,-581.615,-43.098)" /> + <linearGradient + x1="611.34601" + y1="55.279999" + x2="590.39001" + y2="81.157997" + id="lg3494_" + gradientUnits="userSpaceOnUse"> + <stop + style="stop-color:#d9d9d9;stop-opacity:1" + offset="0" + id="stop10932" /> + <stop + style="stop-color:#f2f2f2;stop-opacity:1" + offset="0.52200001" + id="stop10934" /> + <stop + style="stop-color:#ccc;stop-opacity:1" + offset="1" + id="stop10936" /> + <a:midPointStop + offset="0" + style="stop-color:#D9D9D9" /> + <a:midPointStop + offset="0.5" + style="stop-color:#D9D9D9" /> + <a:midPointStop + offset="0.522" + style="stop-color:#F2F2F2" /> + <a:midPointStop + offset="0.5" + style="stop-color:#F2F2F2" /> + <a:midPointStop + offset="1" + style="stop-color:#CCCCCC" /> + </linearGradient> + <linearGradient + x1="611.34601" + y1="55.279999" + x2="590.39001" + y2="81.157997" + id="lg5774" + xlink:href="#lg3494_" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1.009,0,0,1.009,-581.616,-43.098)" /> + <linearGradient + x1="798.72998" + y1="69.839996" + x2="799.04999" + y2="70.709999" + id="g3302_" + gradientUnits="userSpaceOnUse"> + <stop + style="stop-color:#005e00;stop-opacity:1" + offset="0" + id="s6504" /> + <stop + style="stop-color:#23a11f;stop-opacity:1" + offset="1" + id="s6506" /> + <a:midPointstop + style="stop-color:#005E00" + offset="0" /> + <a:midPointstop + style="stop-color:#005E00" + offset="0.5" /> + <a:midPointstop + style="stop-color:#23A11F" + offset="1" /> + </linearGradient> + <linearGradient + x1="798.72998" + y1="69.839996" + x2="799.04999" + y2="70.709999" + id="lg5851" + xlink:href="#g3302_" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1.204,0,0,1.263,-926.036,-60.001)" /> + <linearGradient + x1="779.19" + y1="122.73" + x2="811.69" + y2="149.74001" + id="g3301_" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1,-0.25,0,1,0,129.19)"> + <stop + style="stop-color:#f2f2f2;stop-opacity:1" + offset="0" + id="s6483" /> + <stop + style="stop-color:#eee;stop-opacity:1" + offset="0.17" + id="s6485" /> + <stop + style="stop-color:#e3e3e3;stop-opacity:1" + offset="0.34" + id="s6487" /> + <stop + style="stop-color:#cfcfcf;stop-opacity:1" + offset="0.50999999" + id="s6489" /> + <stop + style="stop-color:#b4b4b4;stop-opacity:1" + offset="0.67000002" + id="s6491" /> + <stop + style="stop-color:#919191;stop-opacity:1" + offset="0.83999997" + id="s6493" /> + <stop + style="stop-color:#666;stop-opacity:1" + offset="1" + id="s6495" /> + <a:midPointstop + style="stop-color:#F2F2F2" + offset="0" /> + <a:midPointstop + style="stop-color:#F2F2F2" + offset="0.71" /> + <a:midPointstop + style="stop-color:#666666" + offset="1" /> + </linearGradient> + <linearGradient + x1="779.19" + y1="122.73" + x2="811.69" + y2="149.74001" + id="lg5855" + xlink:href="#g3301_" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1.204,-0.316,0,1.263,-926.036,103.123)" /> + <clipPath + id="g3299_"> + <use + id="use6469" + x="0" + y="0" + width="1005.92" + height="376.97" + xlink:href="#g101_" /> + </clipPath> + <radialGradient + cx="1189.9301" + cy="100.05" + r="40.400002" + fx="1189.9301" + fy="100.05" + id="g3300_" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.34,-8.46e-2,0,0.34,394.16,137.13)"> + <stop + style="stop-color:white;stop-opacity:1" + offset="0" + id="s6472" /> + <stop + style="stop-color:white;stop-opacity:0" + offset="1" + id="s6474" /> + <a:midPointstop + style="stop-color:#FFFFFF" + offset="0" /> + <a:midPointstop + style="stop-color:#FFFFFF" + offset="0.5" /> + <a:midPointstop + style="stop-color:#000000" + offset="1" /> + </radialGradient> + <radialGradient + cx="1199.74" + cy="97.150002" + r="40.400002" + fx="1199.74" + fy="97.150002" + id="rg5860" + xlink:href="#g3300_" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.409,-0.107,0,0.429,-451.489,113.149)" /> + <linearGradient + x1="796.38" + y1="67.580002" + x2="781.28003" + y2="58.549999" + id="g3298_" + gradientUnits="userSpaceOnUse"> + <stop + style="stop-color:#4c8bca;stop-opacity:1" + offset="0" + id="s6462" /> + <stop + style="stop-color:#b7e9ff;stop-opacity:1" + offset="1" + id="s6464" /> + <a:midPointstop + style="stop-color:#4C8BCA" + offset="0" /> + <a:midPointstop + style="stop-color:#4C8BCA" + offset="0.5" /> + <a:midPointstop + style="stop-color:#B7E9FF" + offset="1" /> + </linearGradient> + <linearGradient + x1="800.97998" + y1="140.72" + x2="777.71997" + y2="121.76" + id="g3297_" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1,-0.25,0,1,0,129.19)"> + <stop + style="stop-color:#e5e5e5;stop-opacity:1" + offset="0" + id="s6448" /> + <stop + style="stop-color:#ccc;stop-opacity:1" + offset="1" + id="s6450" /> + <a:midPointstop + style="stop-color:#E5E5E5" + offset="0" /> + <a:midPointstop + style="stop-color:#E5E5E5" + offset="0.5" /> + <a:midPointstop + style="stop-color:#CCCCCC" + offset="1" /> + </linearGradient> + <linearGradient + x1="800.97998" + y1="140.72" + x2="777.71997" + y2="121.76" + id="lg5890" + xlink:href="#g3297_" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1,-0.25,0,1,0,129.19)" /> + <linearGradient + x1="790.03998" + y1="-16.33" + x2="779.84003" + y2="-3.73" + id="g3296_" + gradientUnits="userSpaceOnUse" + gradientTransform="translate(0,70.17)"> + <stop + style="stop-color:#d9d9d9;stop-opacity:1" + offset="0" + id="s6439" /> + <stop + style="stop-color:#f2f2f2;stop-opacity:1" + offset="0.51999998" + id="s6441" /> + <stop + style="stop-color:#ccc;stop-opacity:1" + offset="1" + id="s6443" /> + <a:midPointstop + style="stop-color:#D9D9D9" + offset="0" /> + <a:midPointstop + style="stop-color:#D9D9D9" + offset="0.5" /> + <a:midPointstop + style="stop-color:#F2F2F2" + offset="0.52" /> + <a:midPointstop + style="stop-color:#F2F2F2" + offset="0.5" /> + <a:midPointstop + style="stop-color:#CCCCCC" + offset="1" /> + </linearGradient> + <linearGradient + x1="790.03998" + y1="-16.33" + x2="779.84003" + y2="-3.73" + id="lg5866" + xlink:href="#g3296_" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1.204,0,0,1.263,-926.036,28.6)" /> + <linearGradient + x1="785.84003" + y1="72.989998" + x2="785.26001" + y2="76.279999" + id="g3293_" + gradientUnits="userSpaceOnUse"> + <stop + style="stop-color:white;stop-opacity:1" + offset="0" + id="s6412" /> + <stop + style="stop-color:#737373;stop-opacity:1" + offset="1" + id="s6414" /> + <a:midPointstop + style="stop-color:#FFFFFF" + offset="0" /> + <a:midPointstop + style="stop-color:#FFFFFF" + offset="0.5" /> + <a:midPointstop + style="stop-color:#737373" + offset="1" /> + </linearGradient> + <linearGradient + x1="785.84003" + y1="72.989998" + x2="785.26001" + y2="76.279999" + id="lg5871" + xlink:href="#g3293_" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1.204,0,0,1.263,-926.036,-60.001)" /> + <linearGradient + x1="789.37" + y1="69.879997" + x2="791.03998" + y2="77.120003" + id="g3292_" + gradientUnits="userSpaceOnUse"> + <stop + style="stop-color:#999;stop-opacity:1" + offset="0" + id="s6403" /> + <stop + style="stop-color:#f2f2f2;stop-opacity:1" + offset="0.28" + id="s6405" /> + <stop + style="stop-color:#666;stop-opacity:1" + offset="1" + id="s6407" /> + <a:midPointstop + style="stop-color:#999999" + offset="0" /> + <a:midPointstop + style="stop-color:#999999" + offset="0.5" /> + <a:midPointstop + style="stop-color:#F2F2F2" + offset="0.28" /> + <a:midPointstop + style="stop-color:#F2F2F2" + offset="0.5" /> + <a:midPointstop + style="stop-color:#666666" + offset="1" /> + </linearGradient> + <linearGradient + x1="789.37" + y1="69.879997" + x2="791.03998" + y2="77.120003" + id="lg5874" + xlink:href="#g3292_" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1.204,0,0,1.263,-926.036,-60.001)" /> + <linearGradient + x1="786.65997" + y1="136.12" + x2="786.71002" + y2="134.33" + id="g3290_" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1,-0.25,0,1,0,137.29)"> + <stop + style="stop-color:#d9d9d9;stop-opacity:1" + offset="0" + id="s6380" /> + <stop + style="stop-color:#b2b2b2;stop-opacity:1" + offset="1" + id="s6382" /> + <a:midPointstop + style="stop-color:#D9D9D9" + offset="0" /> + <a:midPointstop + style="stop-color:#D9D9D9" + offset="0.5" /> + <a:midPointstop + style="stop-color:#B2B2B2" + offset="1" /> + </linearGradient> + <linearGradient + x1="786.65997" + y1="136.12" + x2="786.71002" + y2="134.33" + id="lg5878" + xlink:href="#g3290_" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1.204,-0.316,0,1.263,-926.036,113.351)" /> + <radialGradient + cx="1458.77" + cy="-5.0999999" + r="35.130001" + fx="1458.77" + fy="-5.0999999" + id="g3289_" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.42,0,0,0.42,167.09,79.84)"> + <stop + style="stop-color:white;stop-opacity:1" + offset="0" + id="s6371" /> + <stop + style="stop-color:#999;stop-opacity:1" + offset="1" + id="s6373" /> + <a:midPointstop + style="stop-color:#FFFFFF" + offset="0" /> + <a:midPointstop + style="stop-color:#FFFFFF" + offset="0.5" /> + <a:midPointstop + style="stop-color:#999999" + offset="1" /> + </radialGradient> + <radialGradient + cx="1458.77" + cy="-5.0999999" + r="35.130001" + fx="1458.77" + fy="-5.0999999" + id="rg5881" + xlink:href="#g3289_" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.505,0,0,0.53,-724.957,40.636)" /> + <radialGradient + cx="1612.98" + cy="-4.4699998" + r="36.580002" + fx="1612.98" + fy="-4.4699998" + id="g3288_" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.34,0,0,0.36,238.56,86.87)"> + <stop + style="stop-color:#e5e5e5;stop-opacity:1" + offset="0" + id="s6362" /> + <stop + style="stop-color:#b2b2b2;stop-opacity:1" + offset="0.63999999" + id="s6364" /> + <stop + style="stop-color:#737373;stop-opacity:1" + offset="1" + id="s6366" /> + <a:midPointstop + style="stop-color:#E5E5E5" + offset="0" /> + <a:midPointstop + style="stop-color:#E5E5E5" + offset="0.5" /> + <a:midPointstop + style="stop-color:#B2B2B2" + offset="0.64" /> + <a:midPointstop + style="stop-color:#B2B2B2" + offset="0.5" /> + <a:midPointstop + style="stop-color:#737373" + offset="1" /> + </radialGradient> + <radialGradient + cx="1612.98" + cy="-4.4699998" + r="36.580002" + fx="1612.98" + fy="-4.4699998" + id="rg5884" + xlink:href="#g3288_" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.408,0,0,0.448,-638.943,49.495)" /> + <radialGradient + cx="1470.5" + cy="-10.21" + r="33.290001" + fx="1470.5" + fy="-10.21" + id="g3287_" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.42,0,0,0.42,167.09,79.84)"> + <stop + style="stop-color:#e5e5e5;stop-opacity:1" + offset="0" + id="s6347" /> + <stop + style="stop-color:#b2b2b2;stop-opacity:1" + offset="0.38999999" + id="s6349" /> + <stop + style="stop-color:#b1b1b1;stop-opacity:1" + offset="0.75" + id="s6351" /> + <stop + style="stop-color:#aaa;stop-opacity:1" + offset="0.88" + id="s6353" /> + <stop + style="stop-color:#9e9e9e;stop-opacity:1" + offset="0.97000003" + id="s6355" /> + <stop + style="stop-color:#999;stop-opacity:1" + offset="1" + id="s6357" /> + <a:midPointstop + style="stop-color:#E5E5E5" + offset="0" /> + <a:midPointstop + style="stop-color:#E5E5E5" + offset="0.5" /> + <a:midPointstop + style="stop-color:#B2B2B2" + offset="0.39" /> + <a:midPointstop + style="stop-color:#B2B2B2" + offset="0.87" /> + <a:midPointstop + style="stop-color:#999999" + offset="1" /> + </radialGradient> + <radialGradient + cx="1470.5" + cy="-10.21" + r="33.290001" + fx="1470.5" + fy="-10.21" + id="rg5887" + xlink:href="#g3287_" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.505,0,0,0.53,-724.957,40.636)" /> + <pattern + patternTransform="matrix(0.592927,0,0,0.592927,78,462)" + id="cream-spots" + height="32" + width="32" + patternUnits="userSpaceOnUse"> + <g + transform="translate(-365.3146,-513.505)" + id="g3047"> + id="path2858" /> + <path + inkscape:label="#path2854" + sodipodi:nodetypes="czzzz" + style="fill:#e3dcc0" + id="path3060" + d="M 390.31462,529.50504 C 390.31462,534.47304 386.28262,538.50504 381.31462,538.50504 C 376.34662,538.50504 372.31462,534.47304 372.31462,529.50504 C 372.31462,524.53704 376.34662,520.50504 381.31462,520.50504 C 386.28262,520.50504 390.31462,524.53704 390.31462,529.50504 z " /> +</g> + </pattern> + <pattern + patternTransform="matrix(0.733751,0,0,0.733751,67,367)" + id="dark-cream-spots" + height="32" + width="32" + patternUnits="userSpaceOnUse"> + <g + transform="translate(-408.0946,-513.505)" + id="dark-cream-spot" + inkscape:label="#g3043"> + <path + sodipodi:nodetypes="czzzz" + style="fill:#c8c5ac" + d="M 433.09458,529.50504 C 433.09458,534.47304 429.06258,538.50504 424.09458,538.50504 C 419.12658,538.50504 415.09458,534.47304 415.09458,529.50504 C 415.09458,524.53704 419.12658,520.50504 424.09458,520.50504 C 429.06258,520.50504 433.09458,524.53704 433.09458,529.50504 z " + id="path2953" /> + </g> + </pattern> + <pattern + patternTransform="matrix(0.375,0,0,0.375,379,400)" + id="white-spots" + height="32" + width="32" + patternUnits="userSpaceOnUse"> + <g + transform="translate(-484.3997,-513.505)" + id="white-spot" + inkscape:label="#g3035"> + <path + style="opacity:0.25;fill:white" + id="path3033" + d="M 509.39967,529.50504 C 509.39967,534.47304 505.36767,538.50504 500.39967,538.50504 C 495.43167,538.50504 491.39967,534.47304 491.39967,529.50504 C 491.39967,524.53704 495.43167,520.50504 500.39967,520.50504 C 505.36767,520.50504 509.39967,524.53704 509.39967,529.50504 z " + sodipodi:nodetypes="czzzz" /> + </g> + </pattern> + <pattern + patternTransform="matrix(0.455007,0,0,0.455007,-5e-5,1.9e-5)" + id="black-spots" + height="32" + width="32" + patternUnits="userSpaceOnUse"> + <g + transform="translate(-448.3997,-513.505)" + id="black-spot" + inkscape:label="#g3039"> + <path + sodipodi:nodetypes="czzzz" + d="M 473.39967,529.50504 C 473.39967,534.47304 469.36767,538.50504 464.39967,538.50504 C 459.43167,538.50504 455.39967,534.47304 455.39967,529.50504 C 455.39967,524.53704 459.43167,520.50504 464.39967,520.50504 C 469.36767,520.50504 473.39967,524.53704 473.39967,529.50504 z " + id="path2961" + style="opacity:0.25;fill:black" /> + </g> + </pattern> + <linearGradient + x1="501.0903" + y1="-19.2544" + x2="531.85413" + y2="0.72390002" + id="linearGradient17334" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.6868,0.4269,-0.9821,0.821,111.6149,-5.7901)"> + <stop + style="stop-color:#b4daea;stop-opacity:1" + offset="0" + id="stop17336" /> + <stop + style="stop-color:#b4daea;stop-opacity:1" + offset="0.51120001" + id="stop17338" /> + <stop + style="stop-color:#5387ba;stop-opacity:1" + offset="0.64609998" + id="stop17340" /> + <stop + style="stop-color:#16336e;stop-opacity:1" + offset="1" + id="stop17342" /> + <a:midPointStop + offset="0" + style="stop-color:#B4DAEA" /> + <a:midPointStop + offset="0.5" + style="stop-color:#B4DAEA" /> + <a:midPointStop + offset="0.5112" + style="stop-color:#B4DAEA" /> + <a:midPointStop + offset="0.5" + style="stop-color:#B4DAEA" /> + <a:midPointStop + offset="0.6461" + style="stop-color:#5387BA" /> + <a:midPointStop + offset="0.5" + style="stop-color:#5387BA" /> + <a:midPointStop + offset="1" + style="stop-color:#16336E" /> + </linearGradient> + <linearGradient + x1="415.73831" + y1="11.854" + x2="418.13361" + y2="18.8104" + id="linearGradient17426" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.8362,0.5206,-1.1904,0.992,147.62,-30.9374)"> + <stop + style="stop-color:#ccc;stop-opacity:1" + offset="0" + id="stop17428" /> + <stop + style="stop-color:#f2f2f2;stop-opacity:1" + offset="1" + id="stop17430" /> + <a:midPointStop + offset="0" + style="stop-color:#CCCCCC" /> + <a:midPointStop + offset="0.5" + style="stop-color:#CCCCCC" /> + <a:midPointStop + offset="1" + style="stop-color:#F2F2F2" /> + </linearGradient> + <linearGradient + x1="478.21341" + y1="-131.9297" + x2="469.85818" + y2="-140.28481" + id="linearGradient17434" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.5592,0.829,-0.829,0.5592,101.3357,-104.791)"> + <stop + style="stop-color:#f3403f;stop-opacity:1" + offset="0" + id="stop17436" /> + <stop + style="stop-color:#d02a28;stop-opacity:1" + offset="0.37889999" + id="stop17438" /> + <stop + style="stop-color:#b21714;stop-opacity:1" + offset="0.77649999" + id="stop17440" /> + <stop + style="stop-color:#a6100c;stop-opacity:1" + offset="1" + id="stop17442" /> + <a:midPointStop + offset="0" + style="stop-color:#F3403F" /> + <a:midPointStop + offset="0.4213" + style="stop-color:#F3403F" /> + <a:midPointStop + offset="1" + style="stop-color:#A6100C" /> + </linearGradient> + <linearGradient + x1="502.70749" + y1="115.3013" + x2="516.39001" + y2="127.1953" + id="linearGradient17709" + xlink:href="#XMLID_1749_" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.9703,0.2419,-0.2419,0.9703,11.0227,-35.6159)" /> + <linearGradient + x1="506.09909" + y1="-11.5137" + x2="527.99609" + y2="2.7063999" + id="linearGradient17711" + xlink:href="#XMLID_1752_" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.6868,0.4269,-0.9821,0.821,111.6149,-5.7901)" /> + <linearGradient + x1="516.57672" + y1="-15.769" + x2="516.57672" + y2="0.84280002" + id="linearGradient17713" + xlink:href="#XMLID_1753_" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.6868,0.4269,-0.9821,0.821,111.6149,-5.7901)" /> + <linearGradient + x1="505.62939" + y1="-14.9526" + x2="527.49402" + y2="-0.7536" + id="linearGradient17715" + xlink:href="#XMLID_1756_" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.6868,0.4269,-0.9821,0.821,111.6149,-5.7901)" /> + <linearGradient + x1="500.70749" + y1="-13.2441" + x2="513.46442" + y2="-2.1547" + id="linearGradient17717" + xlink:href="#XMLID_1757_" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.6868,0.4269,-0.9821,0.821,111.6149,-5.7901)" /> + <linearGradient + x1="473.7681" + y1="209.17529" + x2="486.98099" + y2="213.2001" + id="linearGradient17721" + xlink:href="#XMLID_2274_" + gradientUnits="userSpaceOnUse" /> + <linearGradient + x1="481.23969" + y1="212.5742" + x2="472.92981" + y2="207.4967" + id="linearGradient17723" + xlink:href="#XMLID_2275_" + gradientUnits="userSpaceOnUse" /> + <linearGradient + x1="500.70749" + y1="-13.2441" + x2="513.46442" + y2="-2.1547" + id="linearGradient17416" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.6868,0.4269,-0.9821,0.821,111.6149,-5.7901)"> + <stop + style="stop-color:#5387ba;stop-opacity:1" + offset="0" + id="stop17418" /> + <stop + style="stop-color:#96bad6;stop-opacity:1" + offset="1" + id="stop17420" /> + <a:midPointStop + style="stop-color:#5387BA" + offset="0" /> + <a:midPointStop + style="stop-color:#5387BA" + offset="0.5" /> + <a:midPointStop + style="stop-color:#96BAD6" + offset="1" /> + </linearGradient> + <defs + id="defs9929"> + <path + d="M 489.21,209.35 L 485.35,203.63 C 483.63,204.25 473.47,208.93 471.5,210.18 C 470.57,210.77 470.17,211.16 469.72,212.48 C 470.93,212.31 471.72,212.49 473.42,213.04 C 473.26,214.77 473.24,215.74 473.57,218.2 C 474.01,216.88 474.41,216.49 475.34,215.9 C 477.33,214.65 487.49,209.97 489.21,209.35 z " + id="XMLID_960_" /> + </defs> + <clipPath + id="clipPath17448"> + <use + id="use17450" + x="0" + y="0" + width="744.09448" + height="600" + xlink:href="#XMLID_960_" /> + </clipPath> + <linearGradient + x1="473.7681" + y1="209.17529" + x2="486.98099" + y2="213.2001" + id="linearGradient17452" + gradientUnits="userSpaceOnUse"> + <stop + style="stop-color:#f3403f;stop-opacity:1" + offset="0" + id="stop17454" /> + <stop + style="stop-color:#d02a28;stop-opacity:1" + offset="0.37889999" + id="stop17456" /> + <stop + style="stop-color:#b21714;stop-opacity:1" + offset="0.77649999" + id="stop17458" /> + <stop + style="stop-color:#a6100c;stop-opacity:1" + offset="1" + id="stop17460" /> + <a:midPointStop + style="stop-color:#F3403F" + offset="0" /> + <a:midPointStop + style="stop-color:#F3403F" + offset="0.4213" /> + <a:midPointStop + style="stop-color:#A6100C" + offset="1" /> + </linearGradient> + <linearGradient + x1="481.23969" + y1="212.5742" + x2="472.92981" + y2="207.4967" + id="linearGradient17463" + gradientUnits="userSpaceOnUse"> + <stop + style="stop-color:#f3403f;stop-opacity:1" + offset="0" + id="stop17465" /> + <stop + style="stop-color:#d02a28;stop-opacity:1" + offset="0.37889999" + id="stop17467" /> + <stop + style="stop-color:#b21714;stop-opacity:1" + offset="0.77649999" + id="stop17469" /> + <stop + style="stop-color:#a6100c;stop-opacity:1" + offset="1" + id="stop17471" /> + <a:midPointStop + style="stop-color:#F3403F" + offset="0" /> + <a:midPointStop + style="stop-color:#F3403F" + offset="0.4213" /> + <a:midPointStop + style="stop-color:#A6100C" + offset="1" /> + </linearGradient> + <linearGradient + x1="481.23969" + y1="212.5742" + x2="472.92981" + y2="207.4967" + id="linearGradient17807" + xlink:href="#XMLID_2275_" + gradientUnits="userSpaceOnUse" + gradientTransform="translate(-177.1654,35.43307)" /> + <linearGradient + x1="473.7681" + y1="209.17529" + x2="486.98099" + y2="213.2001" + id="linearGradient17810" + xlink:href="#XMLID_2274_" + gradientUnits="userSpaceOnUse" + gradientTransform="translate(-177.1654,35.43307)" /> + <linearGradient + x1="502.70749" + y1="115.3013" + x2="516.39001" + y2="127.1953" + id="linearGradient17812" + xlink:href="#XMLID_1749_" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.9703,0.2419,-0.2419,0.9703,11.0227,-35.6159)" /> + <linearGradient + x1="506.09909" + y1="-11.5137" + x2="527.99609" + y2="2.7063999" + id="linearGradient17814" + xlink:href="#XMLID_1752_" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.6868,0.4269,-0.9821,0.821,111.6149,-5.7901)" /> + <linearGradient + x1="516.57672" + y1="-15.769" + x2="516.57672" + y2="0.84280002" + id="linearGradient17816" + xlink:href="#XMLID_1753_" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.6868,0.4269,-0.9821,0.821,111.6149,-5.7901)" /> + <linearGradient + x1="505.62939" + y1="-14.9526" + x2="527.49402" + y2="-0.7536" + id="linearGradient17818" + xlink:href="#XMLID_1756_" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.6868,0.4269,-0.9821,0.821,111.6149,-5.7901)" /> + <linearGradient + x1="502.70749" + y1="115.3013" + x2="516.39001" + y2="127.1953" + id="linearGradient17347" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.9703,0.2419,-0.2419,0.9703,11.0227,-35.6159)"> + <stop + style="stop-color:#5387ba;stop-opacity:1" + offset="0" + id="stop17349" /> + <stop + style="stop-color:#96bad6;stop-opacity:1" + offset="1" + id="stop17351" /> + <a:midPointStop + offset="0" + style="stop-color:#5387BA" /> + <a:midPointStop + offset="0.5" + style="stop-color:#5387BA" /> + <a:midPointStop + offset="1" + style="stop-color:#96BAD6" /> + </linearGradient> + <linearGradient + x1="516.57672" + y1="-15.769" + x2="516.57672" + y2="0.84280002" + id="linearGradient17379" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.6868,0.4269,-0.9821,0.821,111.6149,-5.7901)"> + <stop + style="stop-color:#b2b2b2;stop-opacity:1" + offset="0" + id="stop17381" /> + <stop + style="stop-color:#f2f2f2;stop-opacity:1" + offset="1" + id="stop17383" /> + <a:midPointStop + offset="0" + style="stop-color:#B2B2B2" /> + <a:midPointStop + offset="0.5" + style="stop-color:#B2B2B2" /> + <a:midPointStop + offset="1" + style="stop-color:#F2F2F2" /> + </linearGradient> + <linearGradient + x1="502.70749" + y1="115.3013" + x2="516.39001" + y2="127.1953" + id="linearGradient17862" + xlink:href="#XMLID_1749_" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.9703,0.2419,-0.2419,0.9703,-166.1427,-0.18283)" /> + <linearGradient + x1="505.62939" + y1="-14.9526" + x2="527.49402" + y2="-0.7536" + id="linearGradient17864" + xlink:href="#XMLID_1756_" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.6868,0.4269,-0.9821,0.821,111.6149,-5.7901)" /> + <defs + id="defs3859"> + <polygon + points="465.54,213.52 481.94,217.46 482.74,216.71 487.46,198.05 471.08,194.07 470.26,194.83 465.54,213.52 " + id="XMLID_343_" /> + </defs> + <linearGradient + x1="471.0806" + y1="201.07761" + x2="481.91711" + y2="210.4977" + id="linearGradient17389" + gradientUnits="userSpaceOnUse"> + <stop + style="stop-color:#6498c1;stop-opacity:1" + offset="0.005618" + id="stop17391" /> + <stop + style="stop-color:#79a9cc;stop-opacity:1" + offset="0.2332" + id="stop17393" /> + <stop + style="stop-color:#a4cde2;stop-opacity:1" + offset="0.74049997" + id="stop17395" /> + <stop + style="stop-color:#b4daea;stop-opacity:1" + offset="1" + id="stop17397" /> + <a:midPointStop + style="stop-color:#6498C1" + offset="5.618000e-003" /> + <a:midPointStop + style="stop-color:#6498C1" + offset="0.4438" /> + <a:midPointStop + style="stop-color:#B4DAEA" + offset="1" /> + </linearGradient> + <clipPath + id="clipPath17400"> + <use + id="use17402" + x="0" + y="0" + width="744.09448" + height="600" + xlink:href="#XMLID_343_" /> + </clipPath> + <linearGradient + x1="505.62939" + y1="-14.9526" + x2="527.49402" + y2="-0.7536" + id="linearGradient17404" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.6868,0.4269,-0.9821,0.821,111.6149,-5.7901)"> + <stop + style="stop-color:#b4daea;stop-opacity:1" + offset="0" + id="stop17406" /> + <stop + style="stop-color:#b4daea;stop-opacity:1" + offset="0.51120001" + id="stop17408" /> + <stop + style="stop-color:#5387ba;stop-opacity:1" + offset="0.64609998" + id="stop17410" /> + <stop + style="stop-color:#16336e;stop-opacity:1" + offset="1" + id="stop17412" /> + <a:midPointStop + style="stop-color:#B4DAEA" + offset="0" /> + <a:midPointStop + style="stop-color:#B4DAEA" + offset="0.5" /> + <a:midPointStop + style="stop-color:#B4DAEA" + offset="0.5112" /> + <a:midPointStop + style="stop-color:#B4DAEA" + offset="0.5" /> + <a:midPointStop + style="stop-color:#5387BA" + offset="0.6461" /> + <a:midPointStop + style="stop-color:#5387BA" + offset="0.5" /> + <a:midPointStop + style="stop-color:#16336E" + offset="1" /> + </linearGradient> + <linearGradient + x1="506.09909" + y1="-11.5137" + x2="527.99609" + y2="2.7063999" + id="linearGradient17882" + xlink:href="#XMLID_1752_" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.6868,0.4269,-0.9821,0.821,111.6149,-5.7901)" /> + <defs + id="defs3826"> + <polygon + points="463.52,216.14 480.56,220.24 481.36,219.5 483.03,202.04 469.05,196.69 468.24,197.45 463.52,216.14 " + id="XMLID_338_" /> + </defs> + <linearGradient + x1="468.2915" + y1="204.7612" + x2="479.39871" + y2="214.4166" + id="linearGradient17357" + gradientUnits="userSpaceOnUse"> + <stop + style="stop-color:#5387ba;stop-opacity:1" + offset="0" + id="stop17359" /> + <stop + style="stop-color:#96bad6;stop-opacity:1" + offset="1" + id="stop17361" /> + <a:midPointStop + style="stop-color:#5387BA" + offset="0" /> + <a:midPointStop + style="stop-color:#5387BA" + offset="0.5" /> + <a:midPointStop + style="stop-color:#96BAD6" + offset="1" /> + </linearGradient> + <clipPath + id="clipPath17364"> + <use + id="use17366" + x="0" + y="0" + width="744.09448" + height="600" + xlink:href="#XMLID_338_" /> + </clipPath> + <linearGradient + x1="506.09909" + y1="-11.5137" + x2="527.99609" + y2="2.7063999" + id="linearGradient17368" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.6868,0.4269,-0.9821,0.821,111.6149,-5.7901)"> + <stop + style="stop-color:#b4daea;stop-opacity:1" + offset="0" + id="stop17370" /> + <stop + style="stop-color:#b4daea;stop-opacity:1" + offset="0.51120001" + id="stop17372" /> + <stop + style="stop-color:#5387ba;stop-opacity:1" + offset="0.64609998" + id="stop17374" /> + <stop + style="stop-color:#16336e;stop-opacity:1" + offset="1" + id="stop17376" /> + <a:midPointStop + style="stop-color:#B4DAEA" + offset="0" /> + <a:midPointStop + style="stop-color:#B4DAEA" + offset="0.5" /> + <a:midPointStop + style="stop-color:#B4DAEA" + offset="0.5112" /> + <a:midPointStop + style="stop-color:#B4DAEA" + offset="0.5" /> + <a:midPointStop + style="stop-color:#5387BA" + offset="0.6461" /> + <a:midPointStop + style="stop-color:#5387BA" + offset="0.5" /> + <a:midPointStop + style="stop-color:#16336E" + offset="1" /> + </linearGradient> + <linearGradient + x1="296.4996" + y1="188.81061" + x2="317.32471" + y2="209.69398" + id="linearGradient2387" + xlink:href="#linearGradient2381" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.90776,0,0,0.90776,24.35648,49.24131)" /> + <linearGradient + x1="296.4996" + y1="188.81061" + x2="317.32471" + y2="209.69398" + id="linearGradient5105" + xlink:href="#linearGradient2381" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.90776,0,0,0.90776,24.35648,49.24131)" /> + <linearGradient + x1="296.4996" + y1="188.81061" + x2="317.32471" + y2="209.69398" + id="linearGradient5145" + xlink:href="#linearGradient2381" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.90776,0,0,0.90776,24.35648,49.24131)" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient2381" + id="linearGradient2371" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.90776,0,0,0.90776,24.35648,49.24131)" + x1="296.4996" + y1="188.81061" + x2="317.32471" + y2="209.69398" /> + </defs> + <g + transform="matrix(0.437808,-0.437808,0.437808,0.437808,-220.8237,43.55311)" + id="g5089"> + <path + d="M 8.4382985,-6.28125 C 7.8309069,-6.28125 4.125,-0.33238729 4.125,1.96875 L 4.125,28.6875 C 4.125,29.533884 4.7068159,29.8125 5.28125,29.8125 L 30.84375,29.8125 C 31.476092,29.8125 31.968751,29.319842 31.96875,28.6875 L 31.96875,23.46875 L 32.25,23.46875 C 32.74684,23.46875 33.156249,23.059339 33.15625,22.5625 L 33.15625,-5.375 C 33.15625,-5.8718398 32.74684,-6.28125 32.25,-6.28125 L 8.4382985,-6.28125 z " + transform="translate(282.8327,227.1903)" + style="fill:#5c5c4f;stroke:black;stroke-width:3.23021388;stroke-miterlimit:4;stroke-dasharray:none" + id="path5091" /> + <rect + width="27.85074" + height="29.369793" + rx="1.1414107" + ry="1.1414107" + x="286.96509" + y="227.63805" + style="fill:#032c87" + id="rect5093" /> + <path + d="M 288.43262,225.43675 L 313.67442,225.43675 L 313.67442,254.80655 L 287.29827,254.83069 L 288.43262,225.43675 z " + style="fill:white" + id="rect5095" /> + <path + d="M 302.44536,251.73726 C 303.83227,259.59643 301.75225,263.02091 301.75225,263.02091 C 303.99609,261.41329 305.71651,259.54397 306.65747,257.28491 C 307.62455,259.47755 308.49041,261.71357 310.9319,263.27432 C 310.9319,263.27432 309.33686,256.07392 309.22047,251.73726 L 302.44536,251.73726 z " + style="fill:#a70000;fill-opacity:1;stroke-width:2" + id="path5097" /> + <rect + width="25.241802" + height="29.736675" + rx="0.89682275" + ry="0.89682275" + x="290.73544" + y="220.92249" + style="fill:#809cc9" + id="rect5099" /> + <path + d="M 576.47347,725.93939 L 582.84431,726.35441 L 583.25121,755.8725 C 581.35919,754.55465 576.39694,752.1117 574.98889,754.19149 L 574.98889,727.42397 C 574.98889,726.60151 575.65101,725.93939 576.47347,725.93939 z " + transform="matrix(0.499065,-0.866565,0,1,0,0)" + style="fill:#4573b3;fill-opacity:1" + id="rect5101" /> + <path + d="M 293.2599,221.89363 L 313.99908,221.89363 C 314.45009,221.89363 314.81318,222.25673 314.81318,222.70774 C 315.02865,229.0361 295.44494,244.47124 292.44579,240.30491 L 292.44579,222.70774 C 292.44579,222.25673 292.80889,221.89363 293.2599,221.89363 z " + style="opacity:0.65536726;fill:url(#linearGradient2371);fill-opacity:1" + id="path5103" /> + </g> +</svg> diff --git a/doc/Language_Reference_Guide/publicanize-langref.sh b/doc/Language_Reference_Guide/publicanize-langref.sh new file mode 100755 index 00000000..fd4edf6a --- /dev/null +++ b/doc/Language_Reference_Guide/publicanize-langref.sh @@ -0,0 +1,157 @@ +#!/bin/bash +#this script converts the langref.tex source for the Language Reference Guide into +#DocBook XML. the conversion is done thru latexml, a utility that comes with dblatex-0.2.7. +#the output xml file of latexml is pretty dirty, so this script is needed to further clean it up. + +#copy latex file to here +cp ../langref.tex . + +#convert it to raw xml +latexml langref.tex --dest=Language_Reference_Guide.xml + +#remove excess whitespace +sed -i -e 's/^\s*//g' Language_Reference_Guide.xml + +sed -i -e 's/<!--\ %\*\*\*\* langref.tex Line [0-9]* \*\*\*\* -->//g' Language_Reference_Guide.xml + +cat Language_Reference_Guide.xml | +perl -p -e 'undef $/;s|<!-- %SystemTap Language Reference -->\n<\?latexml options="twoside,english" class="article"\?>\n<\?latexml package="geometry"\?>\n<\?latexml RelaxNGSchema="LaTeXML"\?>\n<\?latexml RelaxNGSchema="LaTeXML"\?>\n<document xmlns="http://dlmf.nist.gov/LaTeXML">\n<title>SystemTap Language Reference</title>|<\!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [ +]>\n<book>\n<xi:include href="Book_Info.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />|msg' | +perl -p -e 'undef $/;s|<para xml:id="p1a">\n<p>This document was derived from other documents contributed to the SystemTap project by employees of Red Hat, IBM and Intel.</p>\n</para>\n<para xml:id="p2">\n<p>Copyright © 2007 Red Hat Inc.\nCopyright © 2007 IBM Corp.\nCopyright © 2007 Intel Corporation.</p>\n</para>\n<para xml:id="p3">\n<p>Permission is granted to copy, distribute and/or modify this document\nunder the terms of the GNU Free Documentation License, Version 1.2\nor any later version published by the Free Software Foundation;\nwith no Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts.</p>\n</para>\n<para xml:id="p4">\n<p>The GNU Free Documentation License is available from\n<ref class="url" href="http://www.gnu.org/licenses/fdl.html"><text font="typewriter">http://www.gnu.org/licenses/fdl.html</text></ref> or by writing to\nthe Free Software Foundation, Inc., 51 Franklin Street,\nFifth Floor, Boston, MA 02110-1301, USA.</p>\n</para>||msg' | +#fix up screens +perl -p -e 'undef $/;s|<itemize>\n<item>\n<verbatim font="typewriter">|<screen>|msg' | +perl -p -e 'undef $/;s|<itemize>\n<item>\n\n<verbatim font="typewriter">|<screen>|msg' | +perl -p -e 'undef $/;s|</verbatim>\n</item>\n</itemize>|</screen>|msg' | +perl -p -e 'undef $/;s|</verbatim>\n\n</item>\n</itemize>|</screen>|msg' | +#fix up index tags +perl -p -e 'undef $/;s|<index xml:id="idx">\n<title>Index</title>\n</index>|<index/>|msg' | +#needed later, for TABLES! +perl -p -e 'undef $/;s|</text>\n</td>|</entry>|msg' > clean.xml + +#further fix up headers! +perl -p -i -e 's|<\?latexml searchpaths="[^>]*>\n||g' clean.xml + + +#change main tags +sed -i -e 's/<\/document>/<\/book>/g' clean.xml + +#more fixup for screen tags +perl -p -i -e 's|<verbatim font="[^"]*">|<screen>|g' clean.xml +perl -p -i -e 's|</verbatim>|</screen>|g' clean.xml + +#clean section tags +sed -i -e 's/<section refnum="[0-9]*"/<section/g' clean.xml +sed -i -e 's/<section xml:id="[0-9S]*"/<section/g' clean.xml +sed -i -e 's/<section labels="LABEL:sec:/<section id="/g' clean.xml + +#clean subsection tags +sed -i -e 's/<subsection refnum="[0-9]*.[0-9]*"/<subsection/g' clean.xml +sed -i -e 's/<subsection xml:id="[S.0-9]*"/<subsection/g' clean.xml +sed -i -e 's/<subsection labels="LABEL:sub:/<subsection id="/g' clean.xml + +#clean subsubsection tags +sed -i -e 's/<subsubsection refnum="[S.0-9]*"/<subsubsection/g' clean.xml +sed -i -e 's/<subsubsection xml:id="[S.0-9]*"/<subsubsection/g' clean.xml +sed -i -e 's/<subsubsection labels="LABEL:sub:/<subsubsection id="/g' clean.xml + +#change section tags to chapter, yay +sed -i -e 's/<section/<chapter/g' clean.xml +sed -i -e 's/<\/section>/<\/chapter>/g' clean.xml + +#change subsection and subsubsection tags to section +sed -i -e 's/<subsection/<section/g' clean.xml +sed -i -e 's/<\/subsection>/<\/section>/g' clean.xml +sed -i -e 's/<subsubsection/<section/g' clean.xml +sed -i -e 's/<\/subsubsection>/<\/section>/g' clean.xml + +#remove <para, then replace <p> with <para> +sed -i -e 's/<para xml:id="[pS.0-9]*"/<para/g' clean.xml +sed -i -e 's/<para>//g' clean.xml +sed -i -e 's/<\/para>//g' clean.xml +sed -i -e 's/<p>/<para>/g' clean.xml +sed -i -e 's/<\/p>/<\/para>/g' clean.xml + +#properly convert xrefs +sed -i -e 's/<ref labelref="LABEL:sub:/<xref linkend="/g' clean.xml +sed -i -e 's/<ref labelref="LABEL:sec:/<xref linkend="/g' clean.xml + +#convert indexterms +sed -i -e 's/indexmark>/indexterm>/g' clean.xml +perl -p -i -e 's/<indexphrase key="[^"]*">/<primary>/g' clean.xml +sed -i -e 's/<indexphrase>/<primary>/g' clean.xml +sed -i -e 's/<\/indexphrase>/<\/primary>/g' clean.xml + +#convert <emph>s +sed -i -e 's/emph>/emphasis>/g' clean.xml + +#convert itemizedlists and listitems, dependent on successful exec of "fix up screens" perl routines +sed -i -e 's/<itemize xml:id="[Ii,0-9]*">/<itemizedlist>/g' clean.xml +sed -i -e 's/<item xml:id="[Ii.0-9]*">/<listitem>/g' clean.xml +sed -i -e 's/<\/itemize>/<\/itemizedlist>/g' clean.xml +sed -i -e 's/<\/item>/<\/listitem>/g' clean.xml + +#convert orderedlists and their respective listitems +perl -p -i -e 's|<enumerate xml:id="[^"]*">|<orderedlist>|g' clean.xml +perl -p -i -e 's|</enumerate>|</orderedlist>|g' clean.xml +perl -p -i -e 's|<item refnum="[^"]*" xml:id="[^"]*">|<listitem>|g' clean.xml + +#TRICKY: this perl expression takes all occurences of +# <ref class="url" href="http://sourceware.org/systemtap/wiki/HomePage"><text +# font="typewriter">http://sourceware.org/systemtap/wiki/HomePage</text></ref> +# and replaces the <text font=...</ref> string with "/>". from jfearn +# note: [^"]* means "any number of occurences of characters that are NOT quotes +# note: () groups strings/an expression together, which can be called later as $1 when replacing +perl -p -i -e 's|(<ref class="url" href="[^"]*")><text font="typewriter">[^<]*</text></ref>|$1/>|g' clean.xml + +#now, convert <ref class="url" to <ulink>s +sed -i -e 's/<ref class="url" href=/<ulink url=/g' clean.xml + +#TRICKY again: convert <text font=[var]> accordingly; bold is <computeroutput>, typewriter is <command> +perl -p -i -e 's|(<text font="bold">[^<]*)</text>|$1</computeroutput>|g' clean.xml +sed -i -e 's/<text font="bold">/<computeroutput>/g' clean.xml +perl -p -i -e 's|(<text font="typewriter">[^<]*)</text>|$1</command>|g' clean.xml +sed -i -e 's/<text font="typewriter">/<command>/g' clean.xml + +#weird remainders, defaulting them to command +perl -p -i -e 's|(<text font="typewriter bold">[^<]*)</text>|$1</command>|g' clean.xml +sed -i -e 's/<text font="typewriter bold">/<command>/g' clean.xml +perl -p -i -e 's|(<text font="smallcaps">[^<]*)</text>|$1</emphasis>|g' clean.xml +sed -i -e 's/<text font="smallcaps">/<emphasis>/g' clean.xml + +#TABLES! +#the first expression is quite dirty, since it assumes that all tables have 3 columns. dunno yet how to +#automagicize this, since the orig XML doesn't have any attribute that specifies columns per table +sed -i -e 's/<tabular>/<tgroup cols="3">/g' clean.xml +sed -i -e 's/tabular>/tgroup>/g' clean.xml +perl -p -i -e 's|<table placement="[^"]*" refnum="[^"]*" xml:id="([^"]*">)|<table id="$1|g' clean.xml +sed -i -e 's/caption>/title>/g' clean.xml +sed -i -e 's/tr>/row>/g' clean.xml +perl -p -i -e 's|<td[^>]*>||g' clean.xml +sed -i -e 's/<text>/<entry>/g' clean.xml + +#this is needed because some indexterms have been nested inside commands *sigh* +perl -p -i -e 's|(<command>[^<]*<indexterm><primary>[^<]*</primary></indexterm>)</text>|$1</command>|g' clean.xml +#this is needed because some closer tags for <text> are on new lines; is a dirty hack since we simply +#assume that all of them are </command> +sed -i -e 's/<\/text>/<\/command>/g' clean.xml + +#clean up error tags +perl -p -i -e 's|<ERROR [^/]*/ERROR>|<!-- ERROR TAG REMOVED -->|g' clean.xml +#clean up "Math" tags (like, wtf) +perl -p -i -e 's|<Math [^>]*><XMath><XMApp>|<command>|g' clean.xml +perl -p -i -e 's|<XMTok [^>]*>||g' clean.xml +perl -p -i -e 's|</XMTok>||g' clean.xml +perl -p -i -e 's|</XMApp>||g' clean.xml +perl -p -i -e 's|</XMath>||g' clean.xml +perl -p -i -e 's|</Math>|</command>|g' clean.xml + +#remove "About this guide" section +#perl -p -i -e 'undef $/;s|<section>\n<title>About this guide</title>||msg' clean.xml + +#finalize: copy clean.xml to en-US, then deletes it +cp clean.xml en-US/Language_Reference_Guide.xml + +#delete excess files +rm langref.tex +rm clean.xml +rm Language_Reference_Guide.xml diff --git a/doc/Makefile.in b/doc/Makefile.in index e23a6699..93753666 100644 --- a/doc/Makefile.in +++ b/doc/Makefile.in @@ -163,7 +163,6 @@ staplog_CPPFLAGS = @staplog_CPPFLAGS@ subdirs = @subdirs@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ -top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ PDF_FILES = tutorial.pdf langref.pdf diff --git a/doc/SystemTap_Tapset_Reference/tapsets.tmpl b/doc/SystemTap_Tapset_Reference/tapsets.tmpl index d6b3b309..798cfb3b 100644 --- a/doc/SystemTap_Tapset_Reference/tapsets.tmpl +++ b/doc/SystemTap_Tapset_Reference/tapsets.tmpl @@ -51,9 +51,9 @@ </para> </legalnotice> </bookinfo> - +<!-- pls dont remove marker comments, as they are used in publican conversion--> <toc></toc> - +<!--starthere--> <chapter id="introduction"> <title>Introduction</title> <para> @@ -98,7 +98,6 @@ the kernel. This is common among asynchronous events such as timers, exit functions, and print functions. </para> - <!-- <varlistentry> <term></term> @@ -111,11 +110,13 @@ </section> </chapter> - +<!--endhere--> +<!--markerforxi--> +<!-- pls dont remove marker comments, as they are used in publican conversion--> <chapter id="context_stp"> <title>Context Functions</title> <para> - The context functions provide additional information about the where + The context functions provide additional information about where the event occurred. These functions can provide information such as a backtrace where the event occured @@ -130,7 +131,7 @@ <title>Timestamp Functions</title> <para> Each timestamp function returns a value to indicate when - the function is executed. + a function is executed. Thus, these returned values can be used to indicate when an event occurs, provide an ordering for events, or compute the amount of time elapsed between to time stamps. @@ -165,9 +166,11 @@ <title>Networking Tapset</title> <para> This family of probe points is used to probe the activities of - network device. + the network device, TCP layer, and UDP layer. </para> !Itapset/networking.stp +!Itapset/tcp.stp +!Itapset/udp.stp </chapter> <chapter id="socket.stp"> @@ -178,14 +181,14 @@ </para> !Itapset/socket.stp </chapter> - +<!-- <chapter id="tcp.stp"> <title>TCP Tapset</title> <para> This family of probe points is used to probe TCP layer activities. It contains the following probe points: </para> -!Itapset/tcp.stp + </chapter> <chapter id="upd.stp"> @@ -194,9 +197,9 @@ This family of probe points is used to probe UDP layer activities. It contains the following probe points: </para> -!Itapset/udp.stp - </chapter> + </chapter> +--> <chapter id="process.stp"> <title>Process Tapset</title> <para> diff --git a/doc/Tapset_Reference_Guide/Makefile b/doc/Tapset_Reference_Guide/Makefile new file mode 100644 index 00000000..87a1fb5f --- /dev/null +++ b/doc/Tapset_Reference_Guide/Makefile @@ -0,0 +1,15 @@ +#Makefile for Tapset_Reference_Guide + +XML_LANG = en-US +DOCNAME = Tapset_Reference_Guide +#PRODUCT = FIX_ME! +BRAND = fedora + +#OTHER_LANGS = as-IN bn-IN de-DE es-ES fr-FR gu-IN hi-IN it-IT ja-JP kn-IN ko-KR ml-IN mr-IN or-IN pa-IN pt-BR ru-RU si-LK ta-IN te-IN zh-CN zh-TW + +# Extra Parameters start here + +# Extra Parameters stop here +COMMON_CONFIG = /usr/share/publican +include $(COMMON_CONFIG)/make/Makefile.common + diff --git a/doc/Tapset_Reference_Guide/README b/doc/Tapset_Reference_Guide/README new file mode 100644 index 00000000..1f27abe7 --- /dev/null +++ b/doc/Tapset_Reference_Guide/README @@ -0,0 +1,35 @@ +This is an automated source build of the SystemTap_Tapset_Reference Guide, +used to build it in Publican. + +To build the DocBook XML source (required by Publican), run: + + bash publicanize.sh + +This will copy and clean the XML source of SystemTap_Tapset_Reference +created by kernel-doc. You can now build it in pdf, html, etc using +Publican. + +The main source of the Language Reference Guide is: + + ../SystemTap_Tapset_Reference/tapsets.xml + +This main source is generated by kernel-doc when you run 'make' in the +main git tree. The tapset documentation inside is collected from all +tapset files defined in the following template file: + + ../SystemTap_Tapset_Reference/tapsets.tmpl + +The tapset file definitions appear in tapsets.tmpl as: + + !Itapset/context.stp + !Itapset/context-symbols.stp + etc + +context.stp, context-symbols, and all the other tapset files are located in: + + ../../tapset + +All tapset documentation should be done inside their respective tapset files. +For more information about this project, refer to: + + http://sourceware.org/systemtap/wiki/ProjectTapsetReferenceGuide
\ No newline at end of file diff --git a/doc/Tapset_Reference_Guide/en-US/Book_Info.xml b/doc/Tapset_Reference_Guide/en-US/Book_Info.xml new file mode 100644 index 00000000..ddf0f205 --- /dev/null +++ b/doc/Tapset_Reference_Guide/en-US/Book_Info.xml @@ -0,0 +1,36 @@ +<?xml version='1.0'?> +<!DOCTYPE bookinfo PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [ +]> + +<bookinfo id="Tapset_Reference_Guide-Red_Hat_Enterprise_Linux"> + <title>Tapset Reference Guide</title> + <subtitle>For SystemTap in Fedora 10</subtitle> + <productname>Fedora</productname> + <productnumber>10</productnumber> + <edition>1.0</edition> + <pubsnumber>0</pubsnumber> + <abstract> + <para> + The <citetitle>Tapset Reference Guide</citetitle> describes the most common tapset definitions + users can apply to SystemTap scripts. All included tapsets documented in this guide are current + as of Fedora 10 and the latest upstream version of SystemTap. + </para> + </abstract> + <corpauthor> + <inlinemediaobject> + <imageobject> + <imagedata format='SVG' fileref="Common_Content/images/title_logo.svg" /> + </imageobject> + <textobject><phrase>Logo</phrase></textobject> + </inlinemediaobject> + </corpauthor> + <copyright> + <year>&YEAR;</year> + <holder>&HOLDER;</holder> + </copyright> + <xi:include href="Legal_Notice.xml" xmlns:xi="http://www.w3.org/2001/XInclude" /> + <xi:include href="Author_Group.xml" xmlns:xi="http://www.w3.org/2001/XInclude" /> +</bookinfo> + + + diff --git a/doc/Tapset_Reference_Guide/en-US/Introduction.xml b/doc/Tapset_Reference_Guide/en-US/Introduction.xml new file mode 100644 index 00000000..633521e1 --- /dev/null +++ b/doc/Tapset_Reference_Guide/en-US/Introduction.xml @@ -0,0 +1,59 @@ +<?xml version='1.0'?> +<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [ +]> + +<chapter id="introduction"> + <title>Introduction</title> + + <para> + SystemTap provides free software (GPL) infrastructure to simplify the + gathering of information about the running Linux system. This assists + diagnosis of a performance or functional problem. SystemTap eliminates the + need for the developer to go through the tedious and disruptive instrument, + recompile, install, and reboot sequence that may be otherwise required to + collect data. + </para> + + <para> + SystemTap provides a simple command line interface and scripting language + for writing instrumentation for a live, running kernel. This instrumentation + uses probe points and functions provided in the <firstterm>tapset</firstterm> library. + </para> + + <para> + Simply put, tapsets are scripts that encapsulate knowledge about a kernel subsystem + into pre-written probes and functions that can be used by other scripts. + Tapsets are analogous to libraries for C programs. They hide the + underlying details of a kernel area while exposing the key information + needed to manage and monitor that aspect of the kernel. They are typically + developed by kernel subject-matter experts. + </para> + + <para> + A tapset exposes the high-level data and state transitions of a + subsystem. For the most part, good tapset developers assume that + SystemTap users know little to nothing about the kernel subsystem's + low-level details. As such, tapset developers write tapsets that help + ordinary SystemTap users write meaningful and useful SystemTap scripts. + </para> + +<!-- add xref to upcoming section on how to write Tapsets/Tapset Comments --> + + <section id="docsgoals"> + <title>Documentation Goals</title> + + <para> + This guide aims to document SystemTap's most useful and common tapset entries; it + also contains guidelines on proper tapset development and documentation. + The tapset definitions contained in this guide are extracted automatically from + properly-formatted comments in the code of each tapset file. As such, any revisions + to the definitions in this guide should be applied directly to their respective + tapset file. + </para> + +<remark>add: "while users can read from code, it's easier to read from here!"</remark> +<remark>add: target audience, expected proficiency of readers</remark> + + </section> + +</chapter>
\ No newline at end of file diff --git a/doc/Tapset_Reference_Guide/en-US/Legal_Notice.xml b/doc/Tapset_Reference_Guide/en-US/Legal_Notice.xml new file mode 100644 index 00000000..1fcb7b99 --- /dev/null +++ b/doc/Tapset_Reference_Guide/en-US/Legal_Notice.xml @@ -0,0 +1,30 @@ +<?xml version='1.0'?> +<!DOCTYPE authorgroup PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [ +]> + +<legalnotice> + <para> + This documentation is free software; you can redistribute + it and/or modify it under the terms of the GNU General Public + License version 2 as published by the Free Software Foundation. + </para> + + <para> + 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 General Public License for more details. + </para> + + <para> + You should have received a copy of the GNU General Public + License along with this program; if not, write to the Free + Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, + MA 02111-1307 USA + </para> + + <para> + For more details see the file COPYING in the source + distribution of Linux. + </para> +</legalnotice> diff --git a/doc/Tapset_Reference_Guide/en-US/Preface.xml b/doc/Tapset_Reference_Guide/en-US/Preface.xml new file mode 100644 index 00000000..6acf0c3e --- /dev/null +++ b/doc/Tapset_Reference_Guide/en-US/Preface.xml @@ -0,0 +1,15 @@ +<?xml version='1.0'?> +<!DOCTYPE preface PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [ +]> + +<preface id="Tapset_Reference_Guide-Preface"> + <title>Preface</title> + <para> + </para> + <xi:include href="Common_Content/Conventions.xml" xmlns:xi="http://www.w3.org/2001/XInclude" /> + <xi:include href="Feedback.xml" xmlns:xi="http://www.w3.org/2001/XInclude"> + <xi:fallback xmlns:xi="http://www.w3.org/2001/XInclude"> + <xi:include href="Common_Content/Feedback.xml" xmlns:xi="http://www.w3.org/2001/XInclude" /> + </xi:fallback> + </xi:include> +</preface> diff --git a/doc/Tapset_Reference_Guide/en-US/Tapset_Dev_Guide.xml b/doc/Tapset_Reference_Guide/en-US/Tapset_Dev_Guide.xml new file mode 100644 index 00000000..555fa7e6 --- /dev/null +++ b/doc/Tapset_Reference_Guide/en-US/Tapset_Dev_Guide.xml @@ -0,0 +1,284 @@ +<?xml version='1.0'?> +<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [ +]> + +<chapter id="Tapset_Dev_Guide"> + <title>Tapset Development Guidelines</title> + +<para> + This chapter describes the upstream guidelines on proper tapset documentation. It also contains + information on how to properly document your tapsets, to ensure that they are properly + defined in this guide. +</para> + + <section id="Tapsetcontents"> + <title>Writing Good Tapsets</title> + +<para> + The first step to writing good tapsets is to create a simple model of your subject area. For + example, a model of the process subsystem might include the following: +</para> + +<formalpara> + <title>Key Data</title> + <para> + <itemizedlist> + <listitem><para>process ID</para></listitem> + <listitem><para>parent process ID</para></listitem> + <listitem><para>process group ID</para></listitem> + </itemizedlist> + </para> +</formalpara> + +<formalpara> + <title>State Transitions</title> + <para> + <itemizedlist> + <listitem><para>forked</para></listitem> + <listitem><para>exec'd</para></listitem> + <listitem><para>running</para></listitem> + <listitem><para>stopped</para></listitem> + <listitem><para>terminated</para></listitem> + </itemizedlist> + </para> +</formalpara> + +<note> + <title>Note</title> + <para>Both lists are examples, and are not meant to represent a complete list.</para> +</note> + +<para> + Use your subsystem expertise to find probe points (function entries and + exits) that expose the elements of the model, then define probe aliases + for those points. Be aware that some state transitions can occur in more + than one place. In those cases, an alias can place a probe in multiple + locations. +</para> + +<para> + For example, process execs can occur in either the <command>do_execve()</command> or the + <command>compat_do_execve()</command> functions. The following alias inserts probes at the + beginning of those functions: +</para> + +<programlisting> +probe process.exec = kernel.function("do_execve"), +kernel.function("compat_do_execve") +{<replaceable>probe body</replaceable>} +</programlisting> + +<para> + Try to place probes on stable interfaces (i.e., functions + that are unlikely to change at the interface level) whenever possible. This will + make the tapset less likely to break due to kernel changes. Where + kernel version or architecture dependencies are unavoidable, use + preprocessor conditionals (see the <command>stap(1)</command> man page for details). +</para> + + +<para> + Fill in the probe bodies with the key data available at the probe points. + Function entry probes can access the entry parameters specified to + the function, while exit probes can access the entry parameters and the + return value. Convert the data into meaningful forms where appropriate + (e.g., bytes to kilobytes, state values to strings, etc). +</para> + +<para> + You may need to use auxiliary functions to access or convert some of the data. Auxiliary + functions often use embedded C to do things that cannot be done in the + SystemTap language, like access structure fields in some contexts, follow + linked lists, etc. You can use auxiliary functions defined in other tapsets + or write your own. +</para> + +<para> + In the following example, <command>copy_process()</command> returns a + pointer to the <command>task_struct</command> for the new process. Note + that the process ID of the new process is retrieved by calling + <command>task_pid()</command> and passing it the <command>task_struct</command> + pointer. In this case, the auxiliary function is an embedded C function + defined in <filename>task.stp</filename>. +</para> + +<programlisting> +probe process.create = kernel.function("copy_process").return +{ + task = $return + new_pid = task_pid(task) +} +</programlisting> + +<para> + It is not advisable to write probes for every function. Most SystemTap users + will not need or understand them. Keep your tapsets simple and high-level. +</para> + +<remark>info from here:http://sources.redhat.com/git/?p=systemtap.git;a=blob_plain;f=tapset/DEVGUIDE</remark> + + </section> + +<section id="Tapsetelements"> + <title>Elements of a Tapset</title> + + <para> + The following sections describe the most important aspects of writing a tapset. Most of + the content herein is suitable for developers who wish to contribute to + SystemTap's upstream library of tapsets. + </para> + +<section id="Tapsetelements-tapsetfiles"> + <title>Tapset Files</title> + + <para> + Tapset files are stored in <filename><replaceable>src</replaceable>/tapset/</filename> + of the SystemTap GIT directory. Most tapset files are kept at that level. If you have + code that only works with a specific architecture or kernel version, you may + choose to put your tapset in the appropriate subdirectory. + </para> + + <para> + Installed tapsets are located in <filename>/usr/share/systemtap/tapset/</filename> + or <filename>/usr/local/share/systemtap/tapset</filename>. + </para> + + <para> + Personal tapsets can be stored anywhere. However, to ensure that SystemTap + can use them, use <command>-I <replaceable>tapset_directory</replaceable></command> + to specify their location when invoking <command>stap</command>. + </para> +</section> + +<section id="Tapsetelements-namespace"> + <title>Namespace</title> + + + <para> + Probe alias names should take the form + <command><replaceable>tapset_name.probe_name</replaceable></command>. + For example, the probe for sending a signal could be named + <command>signal.send</command>. + </para> + + <para> + Global symbol names (probes, functions, and variables) should be unique + accross all tapsets. This helps avoid namespace collisions in scripts + that use multiple tapsets. To ensure this, use tapset-specific + prefixes in your global symbols. + </para> + + <para> + Internal symbol names should be prefixed with an underscore + (<command>_</command>). + </para> +</section> + +<section id="Tapsetelements-docscomments"> + <title>Comments and Documentation</title> + + <para> + All probes and functions should include comment blocks that describe + their purpose, the data they provide, and the context in which they run + (e.g. interrupt, process, etc). Use comments in areas where your intent may not + be clear from reading the code. + </para> + + <para> + Note that specially-formatted comments are automatically extracted from most + tapsets and included in this guide. This helps ensure that tapset contributors + can write their tapset <emphasis>and</emphasis> document it in the same place. + The specified format for documenting tapsets is as follows: + </para> + +<programlisting> +/** + * probe tapset.name - Short summary of what the tapset does. + * @argument: Explanation of argument. + * @argument2: Explanation of argument2. Probes can have multiple arguments. + * + * Context: + * A brief explanation of the tapset context. + * Note that the context should only be 1 paragraph short. + * + * Text that will appear under "Description." + * + * A new paragraph that will also appear under the heading "Description". + * + * Header: + * A paragraph that will appear under the heading "Header". + **/ +</programlisting> + +<para>For example:</para> + +<programlisting> +/** + * probe vm.write_shared_copy- Page copy for shared page write. + * @address: The address of the shared write. + * @zero: Boolean indicating whether it is a zero page + * (can do a clear instead of a copy). + * + * Context: + * The process attempting the write. + * + * Fires when a write to a shared page requires a page copy. This is + * always preceded by a <command>vm.shared_write</command>. + **/ +</programlisting> + +<para>To override the automatically-generated <command>Synopsis</command> content, use: + +<programlisting> + * Synopsis: + * <programlisting>Synopsis string</programlisting> + * +</programlisting> + +<para>For example:</para> + +<programlisting> +/** + * probe signal.handle - Fires when the signal handler is invoked + * @sig: The signal number that invoked the signal handler + * + * Synopsis: + * <programlisting>static int handle_signal(unsigned long sig, siginfo_t *info, struct k_sigaction *ka, + * sigset_t *oldset, struct pt_regs * regs)</programlisting> + */ +</programlisting> + +<para> + It is recommended that you use the <command><programlisting></command> tag in + this instance, since overriding the <command>Synopsis</command> content of an entry + does not automatically form the necessary tags. +</para> + +<para> + For the purposes of improving the DocBook XML output of your comments, you can also + use the following XML tags in your comments: +</para> + +<itemizedlist> + <listitem><para><command>command</command></para></listitem> + <listitem><para><command>emphasis</command></para></listitem> + <listitem><para><command>programlisting</command></para></listitem> + <listitem><para><command>remark</command> (tagged strings will appear in Publican beta + builds of the document.</para></listitem> +</itemizedlist> + + +</section> + +</section> + +<!-- +<section id="Tapset_Reference_Guide-Test-Section_2_Test"> + <title>Section 2 Test</title> + <para> + Test of a section + </para> +</section> +--> +</chapter> + diff --git a/doc/Tapset_Reference_Guide/en-US/Tapset_Reference_Guide.ent b/doc/Tapset_Reference_Guide/en-US/Tapset_Reference_Guide.ent new file mode 100644 index 00000000..6638d812 --- /dev/null +++ b/doc/Tapset_Reference_Guide/en-US/Tapset_Reference_Guide.ent @@ -0,0 +1,5 @@ +<!ENTITY PRODUCT "Red_Hat_Enterprise_Linux"> +<!ENTITY BOOKID "Tapset_Reference_Guide"> +<!ENTITY YEAR "2008"> +<!ENTITY RHEL "Red Hat Enterprise Linux 5"> +<!ENTITY APH "'">
\ No newline at end of file diff --git a/doc/Tapset_Reference_Guide/en-US/images/icon.svg b/doc/Tapset_Reference_Guide/en-US/images/icon.svg new file mode 100644 index 00000000..c471a607 --- /dev/null +++ b/doc/Tapset_Reference_Guide/en-US/images/icon.svg @@ -0,0 +1,3936 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<!-- Created with Inkscape (http://www.inkscape.org/) --> +<svg + xmlns:ns="http://ns.adobe.com/AdobeSVGViewerExtensions/3/" + xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/" + xmlns:dc="http://purl.org/dc/elements/1.1/" + xmlns:cc="http://web.resource.org/cc/" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns="http://www.w3.org/2000/svg" + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + version="1.0" + width="32" + height="32" + id="svg3017" + sodipodi:version="0.32" + inkscape:version="0.44+devel" + sodipodi:docname="book.svg" + sodipodi:docbase="/home/andy/Desktop"> + <metadata + id="metadata489"> + <rdf:RDF> + <cc:Work + rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type + rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> + </cc:Work> + </rdf:RDF> + </metadata> + <sodipodi:namedview + inkscape:window-height="480" + inkscape:window-width="858" + inkscape:pageshadow="0" + inkscape:pageopacity="0.0" + guidetolerance="10.0" + gridtolerance="10.0" + objecttolerance="10.0" + borderopacity="1.0" + bordercolor="#666666" + pagecolor="#ffffff" + id="base" + inkscape:zoom="1" + inkscape:cx="16" + inkscape:cy="15.944056" + inkscape:window-x="0" + inkscape:window-y="33" + inkscape:current-layer="svg3017" /> + <defs + id="defs3019"> + <linearGradient + id="linearGradient2381"> + <stop + style="stop-color:white;stop-opacity:1" + offset="0" + id="stop2383" /> + <stop + style="stop-color:white;stop-opacity:0" + offset="1" + id="stop2385" /> + </linearGradient> + <linearGradient + x1="415.73831" + y1="11.854" + x2="418.13361" + y2="18.8104" + id="XMLID_1758_" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.8362,0.5206,-1.1904,0.992,147.62,-30.9374)"> + <stop + style="stop-color:#ccc;stop-opacity:1" + offset="0" + id="stop3903" /> + <stop + style="stop-color:#f2f2f2;stop-opacity:1" + offset="1" + id="stop3905" /> + <a:midPointStop + style="stop-color:#CCCCCC" + offset="0" /> + <a:midPointStop + style="stop-color:#CCCCCC" + offset="0.5" /> + <a:midPointStop + style="stop-color:#F2F2F2" + offset="1" /> + </linearGradient> + <linearGradient + x1="500.70749" + y1="-13.2441" + x2="513.46442" + y2="-2.1547" + id="XMLID_1757_" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.6868,0.4269,-0.9821,0.821,111.6149,-5.7901)"> + <stop + style="stop-color:#5387ba;stop-opacity:1" + offset="0" + id="stop3890" /> + <stop + style="stop-color:#96bad6;stop-opacity:1" + offset="1" + id="stop3892" /> + <a:midPointStop + style="stop-color:#5387BA" + offset="0" /> + <a:midPointStop + style="stop-color:#5387BA" + offset="0.5" /> + <a:midPointStop + style="stop-color:#96BAD6" + offset="1" /> + </linearGradient> + <clipPath + id="XMLID_1755_"> + <use + id="use3874" + x="0" + y="0" + width="744.09448" + height="600" + xlink:href="#XMLID_343_" /> + </clipPath> + <linearGradient + x1="505.62939" + y1="-14.9526" + x2="527.49402" + y2="-0.7536" + id="XMLID_1756_" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.6868,0.4269,-0.9821,0.821,111.6149,-5.7901)"> + <stop + style="stop-color:#b4daea;stop-opacity:1" + offset="0" + id="stop3877" /> + <stop + style="stop-color:#b4daea;stop-opacity:1" + offset="0.51120001" + id="stop3879" /> + <stop + style="stop-color:#5387ba;stop-opacity:1" + offset="0.64609998" + id="stop3881" /> + <stop + style="stop-color:#16336e;stop-opacity:1" + offset="1" + id="stop3883" /> + <a:midPointStop + style="stop-color:#B4DAEA" + offset="0" /> + <a:midPointStop + style="stop-color:#B4DAEA" + offset="0.5" /> + <a:midPointStop + style="stop-color:#B4DAEA" + offset="0.5112" /> + <a:midPointStop + style="stop-color:#B4DAEA" + offset="0.5" /> + <a:midPointStop + style="stop-color:#5387BA" + offset="0.6461" /> + <a:midPointStop + style="stop-color:#5387BA" + offset="0.5" /> + <a:midPointStop + style="stop-color:#16336E" + offset="1" /> + </linearGradient> + <linearGradient + x1="471.0806" + y1="201.07761" + x2="481.91711" + y2="210.4977" + id="XMLID_1754_" + gradientUnits="userSpaceOnUse"> + <stop + style="stop-color:#6498c1;stop-opacity:1" + offset="0.005618" + id="stop3863" /> + <stop + style="stop-color:#79a9cc;stop-opacity:1" + offset="0.2332" + id="stop3865" /> + <stop + style="stop-color:#a4cde2;stop-opacity:1" + offset="0.74049997" + id="stop3867" /> + <stop + style="stop-color:#b4daea;stop-opacity:1" + offset="1" + id="stop3869" /> + <a:midPointStop + style="stop-color:#6498C1" + offset="5.618000e-003" /> + <a:midPointStop + style="stop-color:#6498C1" + offset="0.4438" /> + <a:midPointStop + style="stop-color:#B4DAEA" + offset="1" /> + </linearGradient> + <linearGradient + x1="516.57672" + y1="-15.769" + x2="516.57672" + y2="0.84280002" + id="XMLID_1753_" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.6868,0.4269,-0.9821,0.821,111.6149,-5.7901)"> + <stop + style="stop-color:#b2b2b2;stop-opacity:1" + offset="0" + id="stop3851" /> + <stop + style="stop-color:#f2f2f2;stop-opacity:1" + offset="1" + id="stop3853" /> + <a:midPointStop + style="stop-color:#B2B2B2" + offset="0" /> + <a:midPointStop + style="stop-color:#B2B2B2" + offset="0.5" /> + <a:midPointStop + style="stop-color:#F2F2F2" + offset="1" /> + </linearGradient> + <clipPath + id="XMLID_1751_"> + <use + id="use3837" + x="0" + y="0" + width="744.09448" + height="600" + xlink:href="#XMLID_338_" /> + </clipPath> + <linearGradient + x1="506.09909" + y1="-11.5137" + x2="527.99609" + y2="2.7063999" + id="XMLID_1752_" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.6868,0.4269,-0.9821,0.821,111.6149,-5.7901)"> + <stop + style="stop-color:#b4daea;stop-opacity:1" + offset="0" + id="stop3840" /> + <stop + style="stop-color:#b4daea;stop-opacity:1" + offset="0.51120001" + id="stop3842" /> + <stop + style="stop-color:#5387ba;stop-opacity:1" + offset="0.64609998" + id="stop3844" /> + <stop + style="stop-color:#16336e;stop-opacity:1" + offset="1" + id="stop3846" /> + <a:midPointStop + style="stop-color:#B4DAEA" + offset="0" /> + <a:midPointStop + style="stop-color:#B4DAEA" + offset="0.5" /> + <a:midPointStop + style="stop-color:#B4DAEA" + offset="0.5112" /> + <a:midPointStop + style="stop-color:#B4DAEA" + offset="0.5" /> + <a:midPointStop + style="stop-color:#5387BA" + offset="0.6461" /> + <a:midPointStop + style="stop-color:#5387BA" + offset="0.5" /> + <a:midPointStop + style="stop-color:#16336E" + offset="1" /> + </linearGradient> + <linearGradient + x1="468.2915" + y1="204.7612" + x2="479.39871" + y2="214.4166" + id="XMLID_1750_" + gradientUnits="userSpaceOnUse"> + <stop + style="stop-color:#5387ba;stop-opacity:1" + offset="0" + id="stop3830" /> + <stop + style="stop-color:#96bad6;stop-opacity:1" + offset="1" + id="stop3832" /> + <a:midPointStop + style="stop-color:#5387BA" + offset="0" /> + <a:midPointStop + style="stop-color:#5387BA" + offset="0.5" /> + <a:midPointStop + style="stop-color:#96BAD6" + offset="1" /> + </linearGradient> + <linearGradient + x1="502.70749" + y1="115.3013" + x2="516.39001" + y2="127.1953" + id="XMLID_1749_" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.9703,0.2419,-0.2419,0.9703,11.0227,-35.6159)"> + <stop + style="stop-color:#5387ba;stop-opacity:1" + offset="0" + id="stop3818" /> + <stop + style="stop-color:#96bad6;stop-opacity:1" + offset="1" + id="stop3820" /> + <a:midPointStop + style="stop-color:#5387BA" + offset="0" /> + <a:midPointStop + style="stop-color:#5387BA" + offset="0.5" /> + <a:midPointStop + style="stop-color:#96BAD6" + offset="1" /> + </linearGradient> + <linearGradient + x1="501.0903" + y1="-19.2544" + x2="531.85413" + y2="0.72390002" + id="XMLID_1748_" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.6868,0.4269,-0.9821,0.821,111.6149,-5.7901)"> + <stop + style="stop-color:#b4daea;stop-opacity:1" + offset="0" + id="stop3803" /> + <stop + style="stop-color:#b4daea;stop-opacity:1" + offset="0.51120001" + id="stop3805" /> + <stop + style="stop-color:#5387ba;stop-opacity:1" + offset="0.64609998" + id="stop3807" /> + <stop + style="stop-color:#16336e;stop-opacity:1" + offset="1" + id="stop3809" /> + <a:midPointStop + style="stop-color:#B4DAEA" + offset="0" /> + <a:midPointStop + style="stop-color:#B4DAEA" + offset="0.5" /> + <a:midPointStop + style="stop-color:#B4DAEA" + offset="0.5112" /> + <a:midPointStop + style="stop-color:#B4DAEA" + offset="0.5" /> + <a:midPointStop + style="stop-color:#5387BA" + offset="0.6461" /> + <a:midPointStop + style="stop-color:#5387BA" + offset="0.5" /> + <a:midPointStop + style="stop-color:#16336E" + offset="1" /> + </linearGradient> + <linearGradient + x1="481.23969" + y1="212.5742" + x2="472.92981" + y2="207.4967" + id="XMLID_2275_" + gradientUnits="userSpaceOnUse"> + <stop + style="stop-color:#f3403f;stop-opacity:1" + offset="0" + id="stop9947" /> + <stop + style="stop-color:#d02a28;stop-opacity:1" + offset="0.37889999" + id="stop9949" /> + <stop + style="stop-color:#b21714;stop-opacity:1" + offset="0.77649999" + id="stop9951" /> + <stop + style="stop-color:#a6100c;stop-opacity:1" + offset="1" + id="stop9953" /> + <a:midPointStop + style="stop-color:#F3403F" + offset="0" /> + <a:midPointStop + style="stop-color:#F3403F" + offset="0.4213" /> + <a:midPointStop + style="stop-color:#A6100C" + offset="1" /> + </linearGradient> + <clipPath + id="XMLID_2273_"> + <use + id="use9933" + x="0" + y="0" + width="744.09448" + height="600" + xlink:href="#XMLID_960_" /> + </clipPath> + <linearGradient + x1="473.7681" + y1="209.17529" + x2="486.98099" + y2="213.2001" + id="XMLID_2274_" + gradientUnits="userSpaceOnUse"> + <stop + style="stop-color:#f3403f;stop-opacity:1" + offset="0" + id="stop9936" /> + <stop + style="stop-color:#d02a28;stop-opacity:1" + offset="0.37889999" + id="stop9938" /> + <stop + style="stop-color:#b21714;stop-opacity:1" + offset="0.77649999" + id="stop9940" /> + <stop + style="stop-color:#a6100c;stop-opacity:1" + offset="1" + id="stop9942" /> + <a:midPointStop + style="stop-color:#F3403F" + offset="0" /> + <a:midPointStop + style="stop-color:#F3403F" + offset="0.4213" /> + <a:midPointStop + style="stop-color:#A6100C" + offset="1" /> + </linearGradient> + <linearGradient + x1="478.21341" + y1="-131.9297" + x2="469.85818" + y2="-140.28481" + id="XMLID_2272_" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.5592,0.829,-0.829,0.5592,101.3357,-104.791)"> + <stop + style="stop-color:#f3403f;stop-opacity:1" + offset="0" + id="stop9917" /> + <stop + style="stop-color:#d02a28;stop-opacity:1" + offset="0.37889999" + id="stop9919" /> + <stop + style="stop-color:#b21714;stop-opacity:1" + offset="0.77649999" + id="stop9921" /> + <stop + style="stop-color:#a6100c;stop-opacity:1" + offset="1" + id="stop9923" /> + <a:midPointStop + style="stop-color:#F3403F" + offset="0" /> + <a:midPointStop + style="stop-color:#F3403F" + offset="0.4213" /> + <a:midPointStop + style="stop-color:#A6100C" + offset="1" /> + </linearGradient> + <marker + refX="0" + refY="0" + orient="auto" + style="overflow:visible" + id="TriangleInM"> + <path + d="M 5.77,0 L -2.88,5 L -2.88,-5 L 5.77,0 z " + transform="scale(-0.4,-0.4)" + style="fill:#5c5c4f" + id="path3197" /> + </marker> + <linearGradient + x1="200.7363" + y1="100.4028" + x2="211.99519" + y2="89.143997" + id="XMLID_3298_" + gradientUnits="userSpaceOnUse"> + <stop + style="stop-color:#bfbfbf;stop-opacity:1" + offset="0" + id="stop20103" /> + <stop + style="stop-color:#f2f2f2;stop-opacity:1" + offset="1" + id="stop20105" /> + <a:midPointStop + offset="0" + style="stop-color:#BFBFBF" /> + <a:midPointStop + offset="0.5" + style="stop-color:#BFBFBF" /> + <a:midPointStop + offset="1" + style="stop-color:#F2F2F2" /> + </linearGradient> + <linearGradient + x1="200.7363" + y1="100.4028" + x2="211.99519" + y2="89.143997" + id="linearGradient36592" + xlink:href="#XMLID_3298_" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1.029078,0,0,1,-183.2624,-79.44655)" /> + <linearGradient + x1="181.2925" + y1="110.8481" + x2="192.6369" + y2="99.5037" + id="XMLID_3297_" + gradientUnits="userSpaceOnUse"> + <stop + style="stop-color:#e5e5e5;stop-opacity:1" + offset="0" + id="stop20096" /> + <stop + style="stop-color:#ccc;stop-opacity:1" + offset="1" + id="stop20098" /> + <a:midPointStop + offset="0" + style="stop-color:#E5E5E5" /> + <a:midPointStop + offset="0.5" + style="stop-color:#E5E5E5" /> + <a:midPointStop + offset="1" + style="stop-color:#CCCCCC" /> + </linearGradient> + <linearGradient + x1="181.2925" + y1="110.8481" + x2="192.6369" + y2="99.5037" + id="linearGradient36595" + xlink:href="#XMLID_3297_" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1.029078,0,0,1,-183.2624,-79.44655)" /> + <linearGradient + x1="211.77589" + y1="105.7749" + x2="212.6619" + y2="108.2092" + id="XMLID_3296_" + gradientUnits="userSpaceOnUse"> + <stop + style="stop-color:#0f6124;stop-opacity:1" + offset="0" + id="stop20087" /> + <stop + style="stop-color:#219630;stop-opacity:1" + offset="1" + id="stop20089" /> + <a:midPointStop + offset="0" + style="stop-color:#0F6124" /> + <a:midPointStop + offset="0.5" + style="stop-color:#0F6124" /> + <a:midPointStop + offset="1" + style="stop-color:#219630" /> + </linearGradient> + <linearGradient + x1="211.77589" + y1="105.7749" + x2="212.6619" + y2="108.2092" + id="linearGradient36677" + xlink:href="#XMLID_3296_" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1.029078,0,0,1,-183.2624,-79.44655)" /> + <linearGradient + x1="208.9834" + y1="116.8296" + x2="200.0811" + y2="96.834602" + id="XMLID_3295_" + gradientUnits="userSpaceOnUse"> + <stop + style="stop-color:#b2b2b2;stop-opacity:1" + offset="0" + id="stop20076" /> + <stop + style="stop-color:#e5e5e5;stop-opacity:1" + offset="0.5" + id="stop20078" /> + <stop + style="stop-color:white;stop-opacity:1" + offset="1" + id="stop20080" /> + <a:midPointStop + offset="0" + style="stop-color:#B2B2B2" /> + <a:midPointStop + offset="0.5" + style="stop-color:#B2B2B2" /> + <a:midPointStop + offset="0.5" + style="stop-color:#E5E5E5" /> + <a:midPointStop + offset="0.5" + style="stop-color:#E5E5E5" /> + <a:midPointStop + offset="1" + style="stop-color:#FFFFFF" /> + </linearGradient> + <linearGradient + x1="208.9834" + y1="116.8296" + x2="200.0811" + y2="96.834602" + id="linearGradient36604" + xlink:href="#XMLID_3295_" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1.029078,0,0,1,-183.2624,-79.44655)" /> + <linearGradient + x1="195.5264" + y1="97.911102" + x2="213.5213" + y2="115.9061" + id="XMLID_3294_" + gradientUnits="userSpaceOnUse"> + <stop + style="stop-color:#ccc;stop-opacity:1" + offset="0" + id="stop20069" /> + <stop + style="stop-color:white;stop-opacity:1" + offset="1" + id="stop20071" /> + <a:midPointStop + offset="0" + style="stop-color:#CCCCCC" /> + <a:midPointStop + offset="0.5" + style="stop-color:#CCCCCC" /> + <a:midPointStop + offset="1" + style="stop-color:#FFFFFF" /> + </linearGradient> + <linearGradient + x1="195.5264" + y1="97.911102" + x2="213.5213" + y2="115.9061" + id="linearGradient36607" + xlink:href="#XMLID_3294_" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1.029078,0,0,1,-183.2624,-79.44655)" /> + <linearGradient + x1="186.1938" + y1="109.1343" + x2="206.6881" + y2="88.639999" + id="XMLID_3293_" + gradientUnits="userSpaceOnUse"> + <stop + style="stop-color:#b2b2b2;stop-opacity:1" + offset="0" + id="stop20056" /> + <stop + style="stop-color:#e5e5e5;stop-opacity:1" + offset="0.16850001" + id="stop20058" /> + <stop + style="stop-color:white;stop-opacity:1" + offset="0.23029999" + id="stop20060" /> + <stop + style="stop-color:#e5e5e5;stop-opacity:1" + offset="0.2809" + id="stop20062" /> + <stop + style="stop-color:#c2c2c2;stop-opacity:1" + offset="0.5" + id="stop20064" /> + <a:midPointStop + offset="0" + style="stop-color:#B2B2B2" /> + <a:midPointStop + offset="0.5" + style="stop-color:#B2B2B2" /> + <a:midPointStop + offset="0.1685" + style="stop-color:#E5E5E5" /> + <a:midPointStop + offset="0.5" + style="stop-color:#E5E5E5" /> + <a:midPointStop + offset="0.2303" + style="stop-color:#FFFFFF" /> + <a:midPointStop + offset="0.5" + style="stop-color:#FFFFFF" /> + <a:midPointStop + offset="0.2809" + style="stop-color:#E5E5E5" /> + <a:midPointStop + offset="0.5" + style="stop-color:#E5E5E5" /> + <a:midPointStop + offset="0.5" + style="stop-color:#C2C2C2" /> + </linearGradient> + <linearGradient + x1="186.1938" + y1="109.1343" + x2="206.6881" + y2="88.639999" + id="linearGradient36610" + xlink:href="#XMLID_3293_" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1.029078,0,0,1,-183.2624,-79.44655)" /> + <linearGradient + x1="184.8569" + y1="112.2676" + x2="211.94099" + y2="89.541397" + id="XMLID_3292_" + gradientUnits="userSpaceOnUse"> + <stop + style="stop-color:#b2b2b2;stop-opacity:1" + offset="0" + id="stop20043" /> + <stop + style="stop-color:#e5e5e5;stop-opacity:1" + offset="0.16850001" + id="stop20045" /> + <stop + style="stop-color:white;stop-opacity:1" + offset="0.23029999" + id="stop20047" /> + <stop + style="stop-color:#e5e5e5;stop-opacity:1" + offset="0.2809" + id="stop20049" /> + <stop + style="stop-color:#ccc;stop-opacity:1" + offset="1" + id="stop20051" /> + <a:midPointStop + offset="0" + style="stop-color:#B2B2B2" /> + <a:midPointStop + offset="0.5" + style="stop-color:#B2B2B2" /> + <a:midPointStop + offset="0.1685" + style="stop-color:#E5E5E5" /> + <a:midPointStop + offset="0.5" + style="stop-color:#E5E5E5" /> + <a:midPointStop + offset="0.2303" + style="stop-color:#FFFFFF" /> + <a:midPointStop + offset="0.5" + style="stop-color:#FFFFFF" /> + <a:midPointStop + offset="0.2809" + style="stop-color:#E5E5E5" /> + <a:midPointStop + offset="0.5" + style="stop-color:#E5E5E5" /> + <a:midPointStop + offset="1" + style="stop-color:#CCCCCC" /> + </linearGradient> + <linearGradient + x1="184.8569" + y1="112.2676" + x2="211.94099" + y2="89.541397" + id="linearGradient36613" + xlink:href="#XMLID_3292_" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1.029078,0,0,1,-183.2624,-79.44655)" /> + <marker + refX="0" + refY="0" + orient="auto" + style="overflow:visible" + id="TriangleOutM"> + <path + d="M 5.77,0 L -2.88,5 L -2.88,-5 L 5.77,0 z " + transform="scale(0.4,0.4)" + style="fill:#5c5c4f;fill-rule:evenodd;stroke-width:1pt;marker-start:none" + id="path3238" /> + </marker> + <linearGradient + x1="165.3" + y1="99.5" + x2="165.3" + y2="115.9" + id="XMLID_3457_" + gradientUnits="userSpaceOnUse"> + <stop + style="stop-color:#999;stop-opacity:1" + offset="0" + id="stop8309" /> + <stop + style="stop-color:#b2b2b2;stop-opacity:1" + offset="0.30000001" + id="stop8311" /> + <stop + style="stop-color:#b2b2b2;stop-opacity:1" + offset="1" + id="stop8313" /> + <a:midPointstop + offset="0" + style="stop-color:#999999" /> + <a:midPointstop + offset="0.5" + style="stop-color:#999999" /> + <a:midPointstop + offset="0.3" + style="stop-color:#B2B2B2" /> + <a:midPointstop + offset="0.5" + style="stop-color:#B2B2B2" /> + <a:midPointstop + offset="1" + style="stop-color:#B2B2B2" /> + </linearGradient> + <linearGradient + x1="165.3" + y1="99.5" + x2="165.3" + y2="115.9" + id="lg1997" + xlink:href="#XMLID_3457_" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1.2,0,0,1.2,-175.9,-114.6)" /> + <linearGradient + x1="175" + y1="99.800003" + x2="175" + y2="112.5" + id="XMLID_3456_" + gradientUnits="userSpaceOnUse"> + <stop + style="stop-color:#737373;stop-opacity:1" + offset="0" + id="stop8300" /> + <stop + style="stop-color:#191919;stop-opacity:1" + offset="0.60000002" + id="stop8302" /> + <stop + style="stop-color:#191919;stop-opacity:1" + offset="1" + id="stop8304" /> + <a:midPointstop + offset="0" + style="stop-color:#737373" /> + <a:midPointstop + offset="0.5" + style="stop-color:#737373" /> + <a:midPointstop + offset="0.6" + style="stop-color:#191919" /> + <a:midPointstop + offset="0.5" + style="stop-color:#191919" /> + <a:midPointstop + offset="1" + style="stop-color:#191919" /> + </linearGradient> + <linearGradient + x1="175" + y1="99.800003" + x2="175" + y2="112.5" + id="lg2000" + xlink:href="#XMLID_3456_" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1.2,0,0,1.2,-175.9,-114.6)" /> + <linearGradient + x1="168.8" + y1="107.1" + x2="164.5" + y2="110" + id="XMLID_3455_" + gradientUnits="userSpaceOnUse"> + <stop + style="stop-color:#666;stop-opacity:1" + offset="0" + id="stop8291" /> + <stop + style="stop-color:#191919;stop-opacity:1" + offset="0.69999999" + id="stop8293" /> + <stop + style="stop-color:#191919;stop-opacity:1" + offset="1" + id="stop8295" /> + <a:midPointstop + offset="0" + style="stop-color:#666666" /> + <a:midPointstop + offset="0.5" + style="stop-color:#666666" /> + <a:midPointstop + offset="0.7" + style="stop-color:#191919" /> + <a:midPointstop + offset="0.5" + style="stop-color:#191919" /> + <a:midPointstop + offset="1" + style="stop-color:#191919" /> + </linearGradient> + <linearGradient + x1="168.8" + y1="107.1" + x2="164.5" + y2="110" + id="lg2003" + xlink:href="#XMLID_3455_" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1.2,0,0,1.2,-175.9,-114.6)" /> + <linearGradient + id="lg63694"> + <stop + style="stop-color:white;stop-opacity:1" + offset="0" + id="stop63696" /> + <stop + style="stop-color:white;stop-opacity:0" + offset="1" + id="stop63698" /> + </linearGradient> + <linearGradient + x1="458" + y1="483" + x2="465.20001" + y2="271.39999" + id="lg2006" + xlink:href="#lg63694" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(6.3e-2,0,0,6.3e-2,-1.3,-9.8)" /> + <linearGradient + x1="176.3" + y1="110.1" + x2="158.7" + y2="105" + id="XMLID_3453_" + gradientUnits="userSpaceOnUse"> + <stop + style="stop-color:#666;stop-opacity:1" + offset="0" + id="stop8271" /> + <stop + style="stop-color:#737373;stop-opacity:1" + offset="0.2" + id="stop8273" /> + <stop + style="stop-color:white;stop-opacity:1" + offset="1" + id="stop8275" /> + <a:midPointstop + offset="0" + style="stop-color:#666666" /> + <a:midPointstop + offset="0.5" + style="stop-color:#666666" /> + <a:midPointstop + offset="0.2" + style="stop-color:#737373" /> + <a:midPointstop + offset="0.5" + style="stop-color:#737373" /> + <a:midPointstop + offset="1" + style="stop-color:#FFFFFF" /> + </linearGradient> + <linearGradient + x1="176.3" + y1="110.1" + x2="158.7" + y2="105" + id="lg2009" + xlink:href="#XMLID_3453_" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1.2,0,0,1.2,-175.9,-114.6)" /> + <linearGradient + x1="173.60001" + y1="118.9" + x2="172.8" + y2="128.2" + id="XMLID_3449_" + gradientUnits="userSpaceOnUse"> + <stop + style="stop-color:#ecb300;stop-opacity:1" + offset="0" + id="stop8232" /> + <stop + style="stop-color:#fff95e;stop-opacity:1" + offset="0.60000002" + id="stop8234" /> + <stop + style="stop-color:#ecd600;stop-opacity:1" + offset="1" + id="stop8236" /> + <a:midPointstop + offset="0" + style="stop-color:#ECB300" /> + <a:midPointstop + offset="0.5" + style="stop-color:#ECB300" /> + <a:midPointstop + offset="0.6" + style="stop-color:#FFF95E" /> + <a:midPointstop + offset="0.5" + style="stop-color:#FFF95E" /> + <a:midPointstop + offset="1" + style="stop-color:#ECD600" /> + </linearGradient> + <linearGradient + x1="173.60001" + y1="118.9" + x2="172.8" + y2="128.2" + id="lg2016" + xlink:href="#XMLID_3449_" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1.2,0,0,1.2,-175.9,-114.6)" /> + <radialGradient + cx="284.60001" + cy="172.60001" + r="6.5" + fx="284.60001" + fy="172.60001" + id="XMLID_3448_" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1.4,0,0,1.4,-237.3,-126.8)"> + <stop + style="stop-color:#ecb300;stop-opacity:1" + offset="0" + id="stop8219" /> + <stop + style="stop-color:#ecb300;stop-opacity:1" + offset="0.30000001" + id="stop8221" /> + <stop + style="stop-color:#c96b00;stop-opacity:1" + offset="0.89999998" + id="stop8223" /> + <stop + style="stop-color:#9a5500;stop-opacity:1" + offset="1" + id="stop8225" /> + <a:midPointstop + offset="0" + style="stop-color:#ECB300" /> + <a:midPointstop + offset="0.5" + style="stop-color:#ECB300" /> + <a:midPointstop + offset="0.3" + style="stop-color:#ECB300" /> + <a:midPointstop + offset="0.5" + style="stop-color:#ECB300" /> + <a:midPointstop + offset="0.9" + style="stop-color:#C96B00" /> + <a:midPointstop + offset="0.5" + style="stop-color:#C96B00" /> + <a:midPointstop + offset="1" + style="stop-color:#9A5500" /> + </radialGradient> + <radialGradient + cx="284.60001" + cy="172.60001" + r="6.5" + fx="284.60001" + fy="172.60001" + id="rg2020" + xlink:href="#XMLID_3448_" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(2.513992,0,0,2.347576,-689.1621,-378.5717)" /> + <linearGradient + x1="158.10001" + y1="123" + x2="164.2" + y2="126.6" + id="XMLID_3447_" + gradientUnits="userSpaceOnUse"> + <stop + style="stop-color:#ecd600;stop-opacity:1" + offset="0" + id="stop8204" /> + <stop + style="stop-color:#ffffb3;stop-opacity:1" + offset="0.30000001" + id="stop8206" /> + <stop + style="stop-color:white;stop-opacity:1" + offset="1" + id="stop8208" /> + <a:midPointstop + offset="0" + style="stop-color:#ECD600" /> + <a:midPointstop + offset="0.5" + style="stop-color:#ECD600" /> + <a:midPointstop + offset="0.3" + style="stop-color:#FFFFB3" /> + <a:midPointstop + offset="0.5" + style="stop-color:#FFFFB3" /> + <a:midPointstop + offset="1" + style="stop-color:#FFFFFF" /> + </linearGradient> + <linearGradient + x1="158.10001" + y1="123" + x2="164.2" + y2="126.6" + id="lg2026" + xlink:href="#XMLID_3447_" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1.2,0,0,1.2,-175.9,-114.6)" /> + <radialGradient + cx="280.89999" + cy="163.7" + r="10.1" + fx="280.89999" + fy="163.7" + id="XMLID_3446_" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1.4,0,0,1.4,-237.3,-126.8)"> + <stop + style="stop-color:white;stop-opacity:1" + offset="0" + id="stop8197" /> + <stop + style="stop-color:#fff95e;stop-opacity:1" + offset="1" + id="stop8199" /> + <a:midPointstop + offset="0" + style="stop-color:#FFFFFF" /> + <a:midPointstop + offset="0.5" + style="stop-color:#FFFFFF" /> + <a:midPointstop + offset="1" + style="stop-color:#FFF95E" /> + </radialGradient> + <radialGradient + cx="280.89999" + cy="163.7" + r="10.1" + fx="280.89999" + fy="163.7" + id="rg2029" + xlink:href="#XMLID_3446_" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1.7,0,0,1.7,-457.5,-266.8)" /> + <linearGradient + x1="156.5" + y1="122.7" + x2="180.10001" + y2="122.7" + id="XMLID_3445_" + gradientUnits="userSpaceOnUse"> + <stop + style="stop-color:#ecb300;stop-opacity:1" + offset="0" + id="stop8184" /> + <stop + style="stop-color:#ffe900;stop-opacity:1" + offset="0.2" + id="stop8186" /> + <stop + style="stop-color:#ffffb3;stop-opacity:1" + offset="0.30000001" + id="stop8188" /> + <stop + style="stop-color:#ffe900;stop-opacity:1" + offset="0.40000001" + id="stop8190" /> + <stop + style="stop-color:#d68100;stop-opacity:1" + offset="1" + id="stop8192" /> + <a:midPointstop + offset="0" + style="stop-color:#ECB300" /> + <a:midPointstop + offset="0.5" + style="stop-color:#ECB300" /> + <a:midPointstop + offset="0.2" + style="stop-color:#FFE900" /> + <a:midPointstop + offset="0.5" + style="stop-color:#FFE900" /> + <a:midPointstop + offset="0.3" + style="stop-color:#FFFFB3" /> + <a:midPointstop + offset="0.5" + style="stop-color:#FFFFB3" /> + <a:midPointstop + offset="0.4" + style="stop-color:#FFE900" /> + <a:midPointstop + offset="0.5" + style="stop-color:#FFE900" /> + <a:midPointstop + offset="1" + style="stop-color:#D68100" /> + </linearGradient> + <linearGradient + x1="156.5" + y1="122.7" + x2="180.10001" + y2="122.7" + id="lg2032" + xlink:href="#XMLID_3445_" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1.2,0,0,1.2,-175.9,-114.6)" /> + <linearGradient + x1="156.39999" + y1="115.4" + x2="180.10001" + y2="115.4" + id="XMLID_3444_" + gradientUnits="userSpaceOnUse"> + <stop + style="stop-color:#ecb300;stop-opacity:1" + offset="0" + id="stop8171" /> + <stop + style="stop-color:#ffe900;stop-opacity:1" + offset="0.2" + id="stop8173" /> + <stop + style="stop-color:#ffffb3;stop-opacity:1" + offset="0.30000001" + id="stop8175" /> + <stop + style="stop-color:#ffe900;stop-opacity:1" + offset="0.40000001" + id="stop8177" /> + <stop + style="stop-color:#d68100;stop-opacity:1" + offset="1" + id="stop8179" /> + <a:midPointstop + offset="0" + style="stop-color:#ECB300" /> + <a:midPointstop + offset="0.5" + style="stop-color:#ECB300" /> + <a:midPointstop + offset="0.2" + style="stop-color:#FFE900" /> + <a:midPointstop + offset="0.5" + style="stop-color:#FFE900" /> + <a:midPointstop + offset="0.3" + style="stop-color:#FFFFB3" /> + <a:midPointstop + offset="0.5" + style="stop-color:#FFFFB3" /> + <a:midPointstop + offset="0.4" + style="stop-color:#FFE900" /> + <a:midPointstop + offset="0.5" + style="stop-color:#FFE900" /> + <a:midPointstop + offset="1" + style="stop-color:#D68100" /> + </linearGradient> + <linearGradient + x1="156.39999" + y1="115.4" + x2="180.10001" + y2="115.4" + id="lg2035" + xlink:href="#XMLID_3444_" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1.2,0,0,1.2,-175.9,-114.6)" /> + <linearGradient + x1="379.70001" + y1="167.89999" + x2="383.89999" + y2="172.89999" + id="lg4286_" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.8,0.2,-0.2,0.8,78.8,38.1)"> + <stop + style="stop-color:white;stop-opacity:1" + offset="0" + id="s16159" /> + <stop + style="stop-color:white;stop-opacity:1" + offset="0.1" + id="s16161" /> + <stop + style="stop-color:#737373;stop-opacity:1" + offset="1" + id="s16163" /> + <ns:midPointStop + style="stop-color:#FFFFFF" + offset="0" /> + <ns:midPointStop + style="stop-color:#FFFFFF" + offset="0.5" /> + <ns:midPointStop + style="stop-color:#FFFFFF" + offset="0.1" /> + <ns:midPointStop + style="stop-color:#FFFFFF" + offset="0.5" /> + <ns:midPointStop + style="stop-color:#737373" + offset="1" /> + </linearGradient> + <linearGradient + x1="379.60001" + y1="167.8" + x2="383.79999" + y2="172" + id="lg6416" + xlink:href="#lg4286_" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(2.622156,0.623859,-0.623859,2.62182,-882.9706,-673.7921)" /> + <linearGradient + x1="384.20001" + y1="169.8" + x2="384.79999" + y2="170.39999" + id="lg4285_" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.8,0.2,-0.2,0.8,78.8,38.1)"> + <stop + style="stop-color:#737373;stop-opacity:1" + offset="0" + id="s16152" /> + <stop + style="stop-color:#d9d9d9;stop-opacity:1" + offset="1" + id="s16154" /> + <ns:midPointStop + style="stop-color:#737373" + offset="0" /> + <ns:midPointStop + style="stop-color:#737373" + offset="0.5" /> + <ns:midPointStop + style="stop-color:#D9D9D9" + offset="1" /> + </linearGradient> + <linearGradient + x1="384.20001" + y1="169.8" + x2="384.79999" + y2="170.39999" + id="lg6453" + xlink:href="#lg4285_" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(2.6,0.6,-0.6,2.6,-883,-673.8)" /> + <linearGradient + x1="380.5" + y1="172.60001" + x2="382.79999" + y2="173.7" + id="lg4284_" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.8,0.2,-0.2,0.8,78.8,38.1)"> + <stop + style="stop-color:gray;stop-opacity:1" + offset="0" + id="s16145" /> + <stop + style="stop-color:#e5e5e5;stop-opacity:1" + offset="1" + id="s16147" /> + <ns:midPointStop + style="stop-color:#808080" + offset="0" /> + <ns:midPointStop + style="stop-color:#808080" + offset="0.5" /> + <ns:midPointStop + style="stop-color:#E5E5E5" + offset="1" /> + </linearGradient> + <linearGradient + x1="380.5" + y1="172.60001" + x2="382.79999" + y2="173.7" + id="lg6456" + xlink:href="#lg4284_" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(2.6,0.6,-0.6,2.6,-883,-673.8)" /> + <radialGradient + cx="347.29999" + cy="244.5" + r="5.1999998" + fx="347.29999" + fy="244.5" + id="lg4282_" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(3.4,0,0,3.4,-1148,-802)"> + <stop + style="stop-color:#333;stop-opacity:1" + offset="0" + id="s16135" /> + <stop + style="stop-color:#999;stop-opacity:1" + offset="1" + id="s16137" /> + <ns:midPointStop + style="stop-color:#333333" + offset="0" /> + <ns:midPointStop + style="stop-color:#333333" + offset="0.5" /> + <ns:midPointStop + style="stop-color:#999999" + offset="1" /> + </radialGradient> + <linearGradient + x1="310.39999" + y1="397.70001" + x2="310.89999" + y2="399.5" + id="lg4280_" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.7,-0.7,0.7,0.7,-153.4,180.6)"> + <stop + style="stop-color:#ffcd00;stop-opacity:1" + offset="0" + id="s16111" /> + <stop + style="stop-color:#ffffb3;stop-opacity:1" + offset="0.60000002" + id="s16113" /> + <stop + style="stop-color:#ffffb3;stop-opacity:1" + offset="1" + id="s16115" /> + <ns:midPointStop + style="stop-color:#FFCD00" + offset="0" /> + <ns:midPointStop + style="stop-color:#FFCD00" + offset="0.5" /> + <ns:midPointStop + style="stop-color:#FFFFB3" + offset="0.6" /> + <ns:midPointStop + style="stop-color:#FFFFB3" + offset="0.5" /> + <ns:midPointStop + style="stop-color:#FFFFB3" + offset="1" /> + </linearGradient> + <linearGradient + x1="310.39999" + y1="397.70001" + x2="310.89999" + y2="399.5" + id="lg6467" + xlink:href="#lg4280_" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(2.4,-2.4,2.4,2.4,-1663.6,-195)" /> + <linearGradient + x1="310.89999" + y1="395.79999" + x2="313.29999" + y2="403.10001" + id="lg4279_" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.7,-0.7,0.7,0.7,-153.4,180.6)"> + <stop + style="stop-color:#ffffb3;stop-opacity:1" + offset="0" + id="s16100" /> + <stop + style="stop-color:#ffffb3;stop-opacity:1" + offset="0.40000001" + id="s16102" /> + <stop + style="stop-color:#ffcd00;stop-opacity:1" + offset="0.89999998" + id="s16104" /> + <stop + style="stop-color:#ffcd00;stop-opacity:1" + offset="1" + id="s16106" /> + <ns:midPointStop + style="stop-color:#FFFFB3" + offset="0" /> + <ns:midPointStop + style="stop-color:#FFFFB3" + offset="0.5" /> + <ns:midPointStop + style="stop-color:#FFFFB3" + offset="0.4" /> + <ns:midPointStop + style="stop-color:#FFFFB3" + offset="0.5" /> + <ns:midPointStop + style="stop-color:#FFCD00" + offset="0.9" /> + <ns:midPointStop + style="stop-color:#FFCD00" + offset="0.5" /> + <ns:midPointStop + style="stop-color:#FFCD00" + offset="1" /> + </linearGradient> + <linearGradient + x1="310.89999" + y1="395.79999" + x2="313.29999" + y2="403.10001" + id="lg6465" + xlink:href="#lg4279_" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(2.4,-2.4,2.4,2.4,-1663.6,-195)" /> + <linearGradient + x1="307.79999" + y1="395.20001" + x2="313.79999" + y2="413.60001" + id="lg4278_" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.7,-0.7,0.7,0.7,-153.4,180.6)"> + <stop + style="stop-color:#ffffb3;stop-opacity:1" + offset="0" + id="s16091" /> + <stop + style="stop-color:#fcd72f;stop-opacity:1" + offset="0.40000001" + id="s16093" /> + <stop + style="stop-color:#ffcd00;stop-opacity:1" + offset="1" + id="s16095" /> + <ns:midPointStop + style="stop-color:#FFFFB3" + offset="0" /> + <ns:midPointStop + style="stop-color:#FFFFB3" + offset="0.5" /> + <ns:midPointStop + style="stop-color:#FCD72F" + offset="0.4" /> + <ns:midPointStop + style="stop-color:#FCD72F" + offset="0.5" /> + <ns:midPointStop + style="stop-color:#FFCD00" + offset="1" /> + </linearGradient> + <linearGradient + x1="306.5" + y1="393" + x2="309" + y2="404" + id="lg6400" + xlink:href="#lg4278_" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(2.4,-2.4,2.4,2.4,-1663.6,-195)" /> + <linearGradient + x1="352.10001" + y1="253.60001" + x2="348.5" + y2="237.8" + id="lg4276_" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(3.4,0,0,3.4,-1148,-802)"> + <stop + style="stop-color:#ffff87;stop-opacity:1" + offset="0" + id="s16077" /> + <stop + style="stop-color:#ffad00;stop-opacity:1" + offset="1" + id="s16079" /> + <ns:midPointStop + style="stop-color:#FFFF87" + offset="0" /> + <ns:midPointStop + style="stop-color:#FFFF87" + offset="0.5" /> + <ns:midPointStop + style="stop-color:#FFAD00" + offset="1" /> + </linearGradient> + <linearGradient + x1="335.60001" + y1="354.79999" + x2="337.89999" + y2="354.79999" + id="lg4275_" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.9,-0.5,0.5,0.9,-121.7,105.1)"> + <stop + style="stop-color:#d9d9d9;stop-opacity:1" + offset="0" + id="s16057" /> + <stop + style="stop-color:white;stop-opacity:1" + offset="0.80000001" + id="s16059" /> + <stop + style="stop-color:white;stop-opacity:1" + offset="1" + id="s16061" /> + <ns:midPointStop + style="stop-color:#D9D9D9" + offset="0" /> + <ns:midPointStop + style="stop-color:#D9D9D9" + offset="0.5" /> + <ns:midPointStop + style="stop-color:#FFFFFF" + offset="0.8" /> + <ns:midPointStop + style="stop-color:#FFFFFF" + offset="0.5" /> + <ns:midPointStop + style="stop-color:#FFFFFF" + offset="1" /> + </linearGradient> + <linearGradient + x1="335.60001" + y1="354.79999" + x2="337.89999" + y2="354.79999" + id="lg6463" + xlink:href="#lg4275_" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(2.9,-1.7,1.7,2.9,-1557,-448.7)" /> + <linearGradient + x1="337.39999" + y1="353.10001" + x2="339.39999" + y2="357.10001" + id="lg4274_" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.9,-0.5,0.5,0.9,-121.7,105.1)"> + <stop + style="stop-color:white;stop-opacity:1" + offset="0" + id="s16048" /> + <stop + style="stop-color:white;stop-opacity:1" + offset="0.1" + id="s16050" /> + <stop + style="stop-color:#ccc;stop-opacity:1" + offset="1" + id="s16052" /> + <ns:midPointStop + style="stop-color:#FFFFFF" + offset="0" /> + <ns:midPointStop + style="stop-color:#FFFFFF" + offset="0.5" /> + <ns:midPointStop + style="stop-color:#FFFFFF" + offset="0.1" /> + <ns:midPointStop + style="stop-color:#FFFFFF" + offset="0.5" /> + <ns:midPointStop + style="stop-color:#CCCCCC" + offset="1" /> + </linearGradient> + <linearGradient + x1="337.39999" + y1="353.10001" + x2="339.39999" + y2="357.10001" + id="lg6461" + xlink:href="#lg4274_" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(2.9,-1.7,1.7,2.9,-1557,-448.7)" /> + <linearGradient + x1="334.39999" + y1="355.5" + x2="335.5" + y2="356.79999" + id="lg4273_" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.9,-0.5,0.5,0.9,-121.7,105.1)"> + <stop + style="stop-color:white;stop-opacity:1" + offset="0" + id="s16041" /> + <stop + style="stop-color:#ccc;stop-opacity:1" + offset="1" + id="s16043" /> + <ns:midPointStop + style="stop-color:#FFFFFF" + offset="5.6e-003" /> + <ns:midPointStop + style="stop-color:#FFFFFF" + offset="0.5" /> + <ns:midPointStop + style="stop-color:#CCCCCC" + offset="1" /> + </linearGradient> + <linearGradient + x1="334.39999" + y1="355.5" + x2="335.5" + y2="356.79999" + id="lg6381" + xlink:href="#lg4273_" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(2.9,-1.7,1.7,2.9,-1557,-448.7)" /> + <linearGradient + x1="348.39999" + y1="247.39999" + x2="354.10001" + y2="242" + id="lg4271_" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(3.4,0,0,3.4,-1148,-802)"> + <stop + style="stop-color:#f2f2f2;stop-opacity:1" + offset="0" + id="s16025" /> + <stop + style="stop-color:#9e9e9e;stop-opacity:1" + offset="0.40000001" + id="s16027" /> + <stop + style="stop-color:black;stop-opacity:1" + offset="1" + id="s16029" /> + <ns:midPointStop + style="stop-color:#F2F2F2" + offset="0" /> + <ns:midPointStop + style="stop-color:#F2F2F2" + offset="0.5" /> + <ns:midPointStop + style="stop-color:#000000" + offset="1" /> + </linearGradient> + <linearGradient + x1="351.29999" + y1="257.29999" + x2="346.29999" + y2="235.5" + id="lg4270_" + gradientUnits="userSpaceOnUse"> + <stop + style="stop-color:#ffff87;stop-opacity:1" + offset="0" + id="s16007" /> + <stop + style="stop-color:#ffad00;stop-opacity:1" + offset="1" + id="s16009" /> + <ns:midPointStop + style="stop-color:#FFFF87" + offset="0" /> + <ns:midPointStop + style="stop-color:#FFFF87" + offset="0.5" /> + <ns:midPointStop + style="stop-color:#FFAD00" + offset="1" /> + </linearGradient> + <linearGradient + x1="351.29999" + y1="257.29999" + x2="346.29999" + y2="235.5" + id="lg6459" + xlink:href="#lg4270_" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(3.4,0,0,3.4,-1148,-802)" /> + <linearGradient + x1="43.799999" + y1="32.5" + x2="63.299999" + y2="66.400002" + id="XMLID_2708_" + gradientUnits="userSpaceOnUse"> + <stop + style="stop-color:white;stop-opacity:1" + offset="0" + id="stop75318" /> + <stop + style="stop-color:#fffcea;stop-opacity:1" + offset="1" + id="stop75320" /> + <a:midPointStop + style="stop-color:#FFFFFF" + offset="0" /> + <a:midPointStop + style="stop-color:#FFFFFF" + offset="0.5" /> + <a:midPointStop + style="stop-color:#FFFCEA" + offset="1" /> + </linearGradient> + <linearGradient + x1="43.799999" + y1="32.5" + x2="63.299999" + y2="66.400002" + id="lg1907" + xlink:href="#XMLID_2708_" + gradientUnits="userSpaceOnUse" + gradientTransform="translate(-29,-22.6)" /> + <linearGradient + x1="52.5" + y1="40.400002" + x2="58.200001" + y2="64" + id="XMLID_2707_" + gradientUnits="userSpaceOnUse"> + <stop + style="stop-color:#ffdea0;stop-opacity:1" + offset="0" + id="stop75305" /> + <stop + style="stop-color:#ffd89e;stop-opacity:1" + offset="0.30000001" + id="stop75307" /> + <stop + style="stop-color:#ffd79e;stop-opacity:1" + offset="0.30000001" + id="stop75309" /> + <stop + style="stop-color:#dbaf6d;stop-opacity:1" + offset="0.69999999" + id="stop75311" /> + <stop + style="stop-color:#6f4c24;stop-opacity:1" + offset="1" + id="stop75313" /> + <a:midPointStop + style="stop-color:#FFDEA0" + offset="0" /> + <a:midPointStop + style="stop-color:#FFDEA0" + offset="0.6" /> + <a:midPointStop + style="stop-color:#FFD79E" + offset="0.3" /> + <a:midPointStop + style="stop-color:#FFD79E" + offset="0.5" /> + <a:midPointStop + style="stop-color:#DBAF6D" + offset="0.7" /> + <a:midPointStop + style="stop-color:#DBAF6D" + offset="0.5" /> + <a:midPointStop + style="stop-color:#6F4C24" + offset="1" /> + </linearGradient> + <linearGradient + x1="52.5" + y1="40.400002" + x2="58.200001" + y2="64" + id="lg1910" + xlink:href="#XMLID_2707_" + gradientUnits="userSpaceOnUse" + gradientTransform="translate(-29,-22.6)" /> + <linearGradient + x1="58" + y1="73.199997" + x2="44.5" + y2="19" + id="XMLID_2704_" + gradientUnits="userSpaceOnUse" + gradientTransform="translate(-29,-22.6)"> + <stop + style="stop-color:#d4a96c;stop-opacity:1" + offset="0.5" + id="stop75284" /> + <stop + style="stop-color:#dcb273;stop-opacity:1" + offset="0.60000002" + id="stop75286" /> + <stop + style="stop-color:#f0ca87;stop-opacity:1" + offset="0.80000001" + id="stop75288" /> + <stop + style="stop-color:#ffdc96;stop-opacity:1" + offset="0.69999999" + id="stop75290" /> + <stop + style="stop-color:#c18a42;stop-opacity:1" + offset="1" + id="stop75292" /> + <a:midPointStop + style="stop-color:#D4A96C" + offset="0.5" /> + <a:midPointStop + style="stop-color:#D4A96C" + offset="0.6" /> + <a:midPointStop + style="stop-color:#FFDC96" + offset="0.7" /> + <a:midPointStop + style="stop-color:#FFDC96" + offset="0.5" /> + <a:midPointStop + style="stop-color:#C18A42" + offset="1" /> + </linearGradient> + <linearGradient + x1="53.700001" + y1="32" + x2="53.700001" + y2="64.599998" + id="XMLID_2703_" + gradientUnits="userSpaceOnUse"> + <stop + style="stop-color:#e5c9b0;stop-opacity:1" + offset="0" + id="stop75268" /> + <stop + style="stop-color:#e5c9b0;stop-opacity:1" + offset="0.40000001" + id="stop75270" /> + <stop + style="stop-color:#c0aa94;stop-opacity:1" + offset="1" + id="stop75272" /> + <a:midPointStop + style="stop-color:#E5C9B0" + offset="0" /> + <a:midPointStop + style="stop-color:#E5C9B0" + offset="0.5" /> + <a:midPointStop + style="stop-color:#E5C9B0" + offset="0.4" /> + <a:midPointStop + style="stop-color:#E5C9B0" + offset="0.5" /> + <a:midPointStop + style="stop-color:#C0AA94" + offset="1" /> + </linearGradient> + <linearGradient + x1="53.700001" + y1="32" + x2="53.700001" + y2="64.599998" + id="lg1916" + xlink:href="#XMLID_2703_" + gradientUnits="userSpaceOnUse" + gradientTransform="translate(-29,-22.6)" /> + <linearGradient + x1="224.31" + y1="19.450001" + x2="214.33" + y2="11.46" + id="XMLID_419_" + gradientUnits="userSpaceOnUse"> + <stop + style="stop-color:#404040;stop-opacity:1" + offset="0" + id="s1903" /> + <stop + style="stop-color:#6d6d6d;stop-opacity:1" + offset="0.33000001" + id="s1905" /> + <stop + style="stop-color:#e9e9e9;stop-opacity:1" + offset="1" + id="s1907" /> + <a:midPointStop + offset="0" + style="stop-color:#404040" /> + <a:midPointStop + offset="0.5" + style="stop-color:#404040" /> + <a:midPointStop + offset="0.33" + style="stop-color:#6D6D6D" /> + <a:midPointStop + offset="0.5" + style="stop-color:#6D6D6D" /> + <a:midPointStop + offset="1" + style="stop-color:#E9E9E9" /> + </linearGradient> + <linearGradient + x1="221.84" + y1="32.779999" + x2="212.2" + y2="20.27" + id="lg1988" + xlink:href="#XMLID_419_" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1.33,0,0,1.31,-274.2,-5.2)" /> + <linearGradient + x1="228.35001" + y1="33.279999" + x2="215.42999" + y2="33.279999" + id="lg1900" + gradientUnits="userSpaceOnUse"> + <stop + style="stop-color:white;stop-opacity:1" + offset="0" + id="s1902" /> + <stop + style="stop-color:white;stop-opacity:0" + offset="1" + id="s1906" /> + <a:midPointStop + style="stop-color:#575757" + offset="0" /> + <a:midPointStop + style="stop-color:#575757" + offset="0.5" /> + <a:midPointStop + style="stop-color:#6D6D6D" + offset="0.33" /> + <a:midPointStop + style="stop-color:#6D6D6D" + offset="0.5" /> + <a:midPointStop + style="stop-color:#D3D3D3" + offset="1" /> + </linearGradient> + <linearGradient + x1="234.81" + y1="33.279999" + x2="228.27" + y2="33.279999" + id="lg1908" + xlink:href="#lg1900" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1.33,0,0,1.31,-274.2,-5.2)" /> + <linearGradient + x1="228.35001" + y1="33.279999" + x2="215.42999" + y2="33.279999" + id="XMLID_416_" + gradientUnits="userSpaceOnUse"> + <stop + style="stop-color:#575757;stop-opacity:1" + offset="0" + id="s1874" /> + <stop + style="stop-color:#6d6d6d;stop-opacity:1" + offset="0.33000001" + id="s1876" /> + <stop + style="stop-color:#d3d3d3;stop-opacity:1" + offset="1" + id="s1878" /> + <a:midPointStop + offset="0" + style="stop-color:#575757" /> + <a:midPointStop + offset="0.5" + style="stop-color:#575757" /> + <a:midPointStop + offset="0.33" + style="stop-color:#6D6D6D" /> + <a:midPointStop + offset="0.5" + style="stop-color:#6D6D6D" /> + <a:midPointStop + offset="1" + style="stop-color:#D3D3D3" /> + </linearGradient> + <linearGradient + x1="228.35001" + y1="33.279999" + x2="215.42999" + y2="33.279999" + id="lg1991" + xlink:href="#XMLID_416_" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1.33,0,0,1.31,-274.2,-5.2)" /> + <radialGradient + cx="603.19" + cy="230.77" + r="1.67" + fx="603.19" + fy="230.77" + id="x5010_" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1.1,0,0,1.1,-54.33,-75.4)"> + <stop + style="stop-color:#c9ffc9;stop-opacity:1" + offset="0" + id="stop29201" /> + <stop + style="stop-color:#23a11f;stop-opacity:1" + offset="1" + id="stop29203" /> + <a:midPointStop + offset="0" + style="stop-color:#C9FFC9" /> + <a:midPointStop + offset="0.5" + style="stop-color:#C9FFC9" /> + <a:midPointStop + offset="1" + style="stop-color:#23A11F" /> + </radialGradient> + <radialGradient + cx="603.19" + cy="230.77" + r="1.67" + fx="603.19" + fy="230.77" + id="radialGradient5711" + xlink:href="#x5010_" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1.23,0,0,1.23,-709.93,-245.02)" /> + <linearGradient + x1="592.31" + y1="162.60001" + x2="609.32001" + y2="145.59" + id="lg5722" + xlink:href="#x5003_" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1.12,0,0,1.12,-649.08,-160.62)" /> + <linearGradient + x1="601.48999" + y1="170.16" + x2="613.84003" + y2="170.16" + id="x5002_" + gradientUnits="userSpaceOnUse"> + <stop + style="stop-color:#d9d9d9;stop-opacity:1" + offset="0" + id="stop29134" /> + <stop + style="stop-color:white;stop-opacity:1" + offset="0.2" + id="stop29136" /> + <stop + style="stop-color:#999;stop-opacity:1" + offset="1" + id="stop29138" /> + <a:midPointStop + offset="0" + style="stop-color:#D9D9D9" /> + <a:midPointStop + offset="0.5" + style="stop-color:#D9D9D9" /> + <a:midPointStop + offset="0.20" + style="stop-color:#FFFFFF" /> + <a:midPointStop + offset="0.5" + style="stop-color:#FFFFFF" /> + <a:midPointStop + offset="1" + style="stop-color:#999999" /> + </linearGradient> + <linearGradient + x1="601.48999" + y1="170.16" + x2="613.84003" + y2="170.16" + id="lg5725" + xlink:href="#x5002_" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1.12,0,0,1.12,-649.08,-160.62)" /> + <linearGradient + x1="592.20001" + y1="156.45" + x2="609.98999" + y2="174.23" + id="x5004_" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1.12,0,0,1.12,-649.08,-160.62)"> + <stop + style="stop-color:#d9d9d9;stop-opacity:1" + offset="0" + id="stop29157" /> + <stop + style="stop-color:white;stop-opacity:1" + offset="1" + id="stop29159" /> + <a:midPointStop + offset="0" + style="stop-color:#D9D9D9" /> + <a:midPointStop + offset="0.5" + style="stop-color:#D9D9D9" /> + <a:midPointStop + offset="1" + style="stop-color:#FFFFFF" /> + </linearGradient> + <linearGradient + x1="592.20001" + y1="156.45" + x2="609.98999" + y2="174.23" + id="lg5728" + xlink:href="#x5004_" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1.12,0,0,1.12,-649.08,-160.62)" /> + <linearGradient + x1="592.31" + y1="162.60001" + x2="609.32001" + y2="145.59" + id="x5003_" + gradientUnits="userSpaceOnUse"> + <stop + style="stop-color:#f2f2f2;stop-opacity:1" + offset="0" + id="stop29143" /> + <stop + style="stop-color:#e5e5e5;stop-opacity:1" + offset="1" + id="stop29145" /> + <a:midPointStop + offset="0" + style="stop-color:#F2F2F2" /> + <a:midPointStop + offset="0.5" + style="stop-color:#F2F2F2" /> + <a:midPointStop + offset="1" + style="stop-color:#E5E5E5" /> + </linearGradient> + <linearGradient + x1="592.31" + y1="162.60001" + x2="609.32001" + y2="145.59" + id="lg5732" + xlink:href="#x5003_" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1.12,0,0,1.12,-649.08,-160.62)" /> + <linearGradient + x1="592.20001" + y1="156.45" + x2="609.98999" + y2="174.24001" + id="x5000_" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1.12,0,0,1.12,-649.08,-160.62)"> + <stop + style="stop-color:#d9d9d9;stop-opacity:1" + offset="0" + id="stop29124" /> + <stop + style="stop-color:white;stop-opacity:1" + offset="1" + id="stop29126" /> + <a:midPointStop + offset="0" + style="stop-color:#D9D9D9" /> + <a:midPointStop + offset="0.5" + style="stop-color:#D9D9D9" /> + <a:midPointStop + offset="1" + style="stop-color:#FFFFFF" /> + </linearGradient> + <linearGradient + x1="592.20001" + y1="156.45" + x2="609.98999" + y2="174.24001" + id="lg5735" + xlink:href="#x5000_" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1.12,0,0,1.12,-649.08,-160.62)" /> + <linearGradient + x1="308.54999" + y1="149.89999" + x2="299.72" + y2="148.83" + id="XMLID_2433_" + gradientUnits="userSpaceOnUse"> + <stop + style="stop-color:#d6d6d6;stop-opacity:1" + offset="0" + id="71615" /> + <stop + style="stop-color:#a5a5a5;stop-opacity:1" + offset="1" + id="71617" /> + <a:midPointStop + offset="0" + style="stop-color:#D6D6D6" /> + <a:midPointStop + offset="0.5" + style="stop-color:#D6D6D6" /> + <a:midPointStop + offset="1" + style="stop-color:#A5A5A5" /> + </linearGradient> + <linearGradient + x1="308.54999" + y1="149.89999" + x2="299.72" + y2="148.83" + id="lg1952" + xlink:href="#XMLID_2433_" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1.03,0,0,1.03,-279.57,-124.36)" /> + <radialGradient + cx="307.39999" + cy="121" + r="23.35" + fx="307.39999" + fy="121" + id="XMLID_2432_" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.98,0,0,0.98,2.88,2.75)"> + <stop + style="stop-color:#d2d2d2;stop-opacity:1" + offset="0.19" + id="71592" /> + <stop + style="stop-color:#cfcfcf;stop-opacity:1" + offset="0.44999999" + id="71594" /> + <stop + style="stop-color:#c7c7c7;stop-opacity:1" + offset="0.60000002" + id="71596" /> + <stop + style="stop-color:#b9b9b9;stop-opacity:1" + offset="0.74000001" + id="71598" /> + <stop + style="stop-color:#a4a4a4;stop-opacity:1" + offset="0.86000001" + id="71600" /> + <stop + style="stop-color:#8a8a8a;stop-opacity:1" + offset="0.95999998" + id="71602" /> + <stop + style="stop-color:gray;stop-opacity:1" + offset="1" + id="71604" /> + <a:midPointStop + offset="0.19" + style="stop-color:#D2D2D2" /> + <a:midPointStop + offset="0.8" + style="stop-color:#D2D2D2" /> + <a:midPointStop + offset="1" + style="stop-color:#808080" /> + </radialGradient> + <radialGradient + cx="307.39999" + cy="121" + r="23.35" + fx="307.39999" + fy="121" + id="radialGradient2331" + xlink:href="#XMLID_2432_" + gradientUnits="userSpaceOnUse" + gradientTransform="translate(-276.62,-121.54)" /> + <linearGradient + x1="294.13" + y1="127.07" + x2="294.13" + y2="142.2" + id="XMLID_2430_" + gradientUnits="userSpaceOnUse"> + <stop + style="stop-color:#b5d8ff;stop-opacity:1" + offset="0" + id="71582" /> + <stop + style="stop-color:black;stop-opacity:1" + offset="1" + id="71584" /> + <a:midPointStop + offset="0" + style="stop-color:#B5D8FF" /> + <a:midPointStop + offset="0.5" + style="stop-color:#B5D8FF" /> + <a:midPointStop + offset="1" + style="stop-color:#000000" /> + </linearGradient> + <linearGradient + x1="294.13" + y1="127.07" + x2="294.13" + y2="142.2" + id="lg2820" + xlink:href="#XMLID_2430_" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1.03,0,0,1.03,-279.57,-124.36)" /> + <linearGradient + x1="279.10999" + y1="148.03" + x2="309.16" + y2="148.03" + id="XMLID_2429_" + gradientUnits="userSpaceOnUse"> + <stop + style="stop-color:#e1e1e1;stop-opacity:1" + offset="0" + id="71564" /> + <stop + style="stop-color:#e1e1e1;stop-opacity:1" + offset="0.25" + id="71566" /> + <stop + style="stop-color:#a5a5a5;stop-opacity:1" + offset="0.44" + id="71568" /> + <stop + style="stop-color:#a5a5a5;stop-opacity:1" + offset="1" + id="71570" /> + <a:midPointStop + offset="0" + style="stop-color:#E1E1E1" /> + <a:midPointStop + offset="0.5" + style="stop-color:#E1E1E1" /> + <a:midPointStop + offset="0.25" + style="stop-color:#E1E1E1" /> + <a:midPointStop + offset="0.5" + style="stop-color:#E1E1E1" /> + <a:midPointStop + offset="0.44" + style="stop-color:#A5A5A5" /> + <a:midPointStop + offset="0.5" + style="stop-color:#A5A5A5" /> + <a:midPointStop + offset="1" + style="stop-color:#A5A5A5" /> + </linearGradient> + <linearGradient + x1="279.10999" + y1="148.03" + x2="309.16" + y2="148.03" + id="lg2818" + xlink:href="#XMLID_2429_" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1.03,0,0,1.03,-279.57,-124.36)" /> + <radialGradient + cx="622.34302" + cy="14.449" + r="26.496" + fx="622.34302" + fy="14.449" + id="lg3499_" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.851,0,0,0.849,69.297,51.658)"> + <stop + style="stop-color:#23468e;stop-opacity:1" + offset="0" + id="stop10972" /> + <stop + style="stop-color:#012859;stop-opacity:1" + offset="1" + id="stop10974" /> + <a:midPointStop + offset="0" + style="stop-color:#23468E" /> + <a:midPointStop + offset="0.5" + style="stop-color:#23468E" /> + <a:midPointStop + offset="1" + style="stop-color:#012859" /> + </radialGradient> + <radialGradient + cx="622.34302" + cy="14.449" + r="26.496" + fx="622.34302" + fy="14.449" + id="rg5791" + xlink:href="#lg3499_" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.858,0,0,0.857,-511.7,9.02)" /> + <linearGradient + x1="616.112" + y1="76.247002" + x2="588.14099" + y2="60.742001" + id="lg3497_" + gradientUnits="userSpaceOnUse"> + <stop + style="stop-color:#01326e;stop-opacity:1" + offset="0" + id="stop10962" /> + <stop + style="stop-color:#012859;stop-opacity:1" + offset="1" + id="stop10964" /> + <a:midPointStop + offset="0" + style="stop-color:#01326E" /> + <a:midPointStop + offset="0.5" + style="stop-color:#01326E" /> + <a:midPointStop + offset="1" + style="stop-color:#012859" /> + </linearGradient> + <linearGradient + x1="617.698" + y1="82.445999" + x2="585.95203" + y2="54.848999" + id="lg3496_" + gradientUnits="userSpaceOnUse"> + <stop + style="stop-color:#e5e5e5;stop-opacity:1" + offset="0" + id="stop10950" /> + <stop + style="stop-color:#ccc;stop-opacity:1" + offset="1" + id="stop10952" /> + <a:midPointStop + offset="0" + style="stop-color:#E5E5E5" /> + <a:midPointStop + offset="0.5" + style="stop-color:#E5E5E5" /> + <a:midPointStop + offset="1" + style="stop-color:#CCCCCC" /> + </linearGradient> + <linearGradient + x1="617.698" + y1="82.445999" + x2="585.95203" + y2="54.848999" + id="lg5794" + xlink:href="#lg3496_" + gradientUnits="userSpaceOnUse" /> + <linearGradient + x1="601.39001" + y1="55.341" + x2="588.29199" + y2="71.515999" + id="lg3495_" + gradientUnits="userSpaceOnUse"> + <stop + style="stop-color:#d9d9d9;stop-opacity:1" + offset="0" + id="stop10941" /> + <stop + style="stop-color:#f2f2f2;stop-opacity:1" + offset="0.52200001" + id="stop10943" /> + <stop + style="stop-color:#ccc;stop-opacity:1" + offset="1" + id="stop10945" /> + <a:midPointStop + offset="0" + style="stop-color:#D9D9D9" /> + <a:midPointStop + offset="0.5" + style="stop-color:#D9D9D9" /> + <a:midPointStop + offset="0.522" + style="stop-color:#F2F2F2" /> + <a:midPointStop + offset="0.5" + style="stop-color:#F2F2F2" /> + <a:midPointStop + offset="1" + style="stop-color:#CCCCCC" /> + </linearGradient> + <linearGradient + x1="601.39001" + y1="55.341" + x2="588.29199" + y2="71.515999" + id="lg5771" + xlink:href="#lg3495_" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1.009,0,0,1.009,-581.615,-43.098)" /> + <linearGradient + x1="611.34601" + y1="55.279999" + x2="590.39001" + y2="81.157997" + id="lg3494_" + gradientUnits="userSpaceOnUse"> + <stop + style="stop-color:#d9d9d9;stop-opacity:1" + offset="0" + id="stop10932" /> + <stop + style="stop-color:#f2f2f2;stop-opacity:1" + offset="0.52200001" + id="stop10934" /> + <stop + style="stop-color:#ccc;stop-opacity:1" + offset="1" + id="stop10936" /> + <a:midPointStop + offset="0" + style="stop-color:#D9D9D9" /> + <a:midPointStop + offset="0.5" + style="stop-color:#D9D9D9" /> + <a:midPointStop + offset="0.522" + style="stop-color:#F2F2F2" /> + <a:midPointStop + offset="0.5" + style="stop-color:#F2F2F2" /> + <a:midPointStop + offset="1" + style="stop-color:#CCCCCC" /> + </linearGradient> + <linearGradient + x1="611.34601" + y1="55.279999" + x2="590.39001" + y2="81.157997" + id="lg5774" + xlink:href="#lg3494_" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1.009,0,0,1.009,-581.616,-43.098)" /> + <linearGradient + x1="798.72998" + y1="69.839996" + x2="799.04999" + y2="70.709999" + id="g3302_" + gradientUnits="userSpaceOnUse"> + <stop + style="stop-color:#005e00;stop-opacity:1" + offset="0" + id="s6504" /> + <stop + style="stop-color:#23a11f;stop-opacity:1" + offset="1" + id="s6506" /> + <a:midPointstop + style="stop-color:#005E00" + offset="0" /> + <a:midPointstop + style="stop-color:#005E00" + offset="0.5" /> + <a:midPointstop + style="stop-color:#23A11F" + offset="1" /> + </linearGradient> + <linearGradient + x1="798.72998" + y1="69.839996" + x2="799.04999" + y2="70.709999" + id="lg5851" + xlink:href="#g3302_" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1.204,0,0,1.263,-926.036,-60.001)" /> + <linearGradient + x1="779.19" + y1="122.73" + x2="811.69" + y2="149.74001" + id="g3301_" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1,-0.25,0,1,0,129.19)"> + <stop + style="stop-color:#f2f2f2;stop-opacity:1" + offset="0" + id="s6483" /> + <stop + style="stop-color:#eee;stop-opacity:1" + offset="0.17" + id="s6485" /> + <stop + style="stop-color:#e3e3e3;stop-opacity:1" + offset="0.34" + id="s6487" /> + <stop + style="stop-color:#cfcfcf;stop-opacity:1" + offset="0.50999999" + id="s6489" /> + <stop + style="stop-color:#b4b4b4;stop-opacity:1" + offset="0.67000002" + id="s6491" /> + <stop + style="stop-color:#919191;stop-opacity:1" + offset="0.83999997" + id="s6493" /> + <stop + style="stop-color:#666;stop-opacity:1" + offset="1" + id="s6495" /> + <a:midPointstop + style="stop-color:#F2F2F2" + offset="0" /> + <a:midPointstop + style="stop-color:#F2F2F2" + offset="0.71" /> + <a:midPointstop + style="stop-color:#666666" + offset="1" /> + </linearGradient> + <linearGradient + x1="779.19" + y1="122.73" + x2="811.69" + y2="149.74001" + id="lg5855" + xlink:href="#g3301_" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1.204,-0.316,0,1.263,-926.036,103.123)" /> + <clipPath + id="g3299_"> + <use + id="use6469" + x="0" + y="0" + width="1005.92" + height="376.97" + xlink:href="#g101_" /> + </clipPath> + <radialGradient + cx="1189.9301" + cy="100.05" + r="40.400002" + fx="1189.9301" + fy="100.05" + id="g3300_" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.34,-8.46e-2,0,0.34,394.16,137.13)"> + <stop + style="stop-color:white;stop-opacity:1" + offset="0" + id="s6472" /> + <stop + style="stop-color:white;stop-opacity:0" + offset="1" + id="s6474" /> + <a:midPointstop + style="stop-color:#FFFFFF" + offset="0" /> + <a:midPointstop + style="stop-color:#FFFFFF" + offset="0.5" /> + <a:midPointstop + style="stop-color:#000000" + offset="1" /> + </radialGradient> + <radialGradient + cx="1199.74" + cy="97.150002" + r="40.400002" + fx="1199.74" + fy="97.150002" + id="rg5860" + xlink:href="#g3300_" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.409,-0.107,0,0.429,-451.489,113.149)" /> + <linearGradient + x1="796.38" + y1="67.580002" + x2="781.28003" + y2="58.549999" + id="g3298_" + gradientUnits="userSpaceOnUse"> + <stop + style="stop-color:#4c8bca;stop-opacity:1" + offset="0" + id="s6462" /> + <stop + style="stop-color:#b7e9ff;stop-opacity:1" + offset="1" + id="s6464" /> + <a:midPointstop + style="stop-color:#4C8BCA" + offset="0" /> + <a:midPointstop + style="stop-color:#4C8BCA" + offset="0.5" /> + <a:midPointstop + style="stop-color:#B7E9FF" + offset="1" /> + </linearGradient> + <linearGradient + x1="800.97998" + y1="140.72" + x2="777.71997" + y2="121.76" + id="g3297_" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1,-0.25,0,1,0,129.19)"> + <stop + style="stop-color:#e5e5e5;stop-opacity:1" + offset="0" + id="s6448" /> + <stop + style="stop-color:#ccc;stop-opacity:1" + offset="1" + id="s6450" /> + <a:midPointstop + style="stop-color:#E5E5E5" + offset="0" /> + <a:midPointstop + style="stop-color:#E5E5E5" + offset="0.5" /> + <a:midPointstop + style="stop-color:#CCCCCC" + offset="1" /> + </linearGradient> + <linearGradient + x1="800.97998" + y1="140.72" + x2="777.71997" + y2="121.76" + id="lg5890" + xlink:href="#g3297_" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1,-0.25,0,1,0,129.19)" /> + <linearGradient + x1="790.03998" + y1="-16.33" + x2="779.84003" + y2="-3.73" + id="g3296_" + gradientUnits="userSpaceOnUse" + gradientTransform="translate(0,70.17)"> + <stop + style="stop-color:#d9d9d9;stop-opacity:1" + offset="0" + id="s6439" /> + <stop + style="stop-color:#f2f2f2;stop-opacity:1" + offset="0.51999998" + id="s6441" /> + <stop + style="stop-color:#ccc;stop-opacity:1" + offset="1" + id="s6443" /> + <a:midPointstop + style="stop-color:#D9D9D9" + offset="0" /> + <a:midPointstop + style="stop-color:#D9D9D9" + offset="0.5" /> + <a:midPointstop + style="stop-color:#F2F2F2" + offset="0.52" /> + <a:midPointstop + style="stop-color:#F2F2F2" + offset="0.5" /> + <a:midPointstop + style="stop-color:#CCCCCC" + offset="1" /> + </linearGradient> + <linearGradient + x1="790.03998" + y1="-16.33" + x2="779.84003" + y2="-3.73" + id="lg5866" + xlink:href="#g3296_" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1.204,0,0,1.263,-926.036,28.6)" /> + <linearGradient + x1="785.84003" + y1="72.989998" + x2="785.26001" + y2="76.279999" + id="g3293_" + gradientUnits="userSpaceOnUse"> + <stop + style="stop-color:white;stop-opacity:1" + offset="0" + id="s6412" /> + <stop + style="stop-color:#737373;stop-opacity:1" + offset="1" + id="s6414" /> + <a:midPointstop + style="stop-color:#FFFFFF" + offset="0" /> + <a:midPointstop + style="stop-color:#FFFFFF" + offset="0.5" /> + <a:midPointstop + style="stop-color:#737373" + offset="1" /> + </linearGradient> + <linearGradient + x1="785.84003" + y1="72.989998" + x2="785.26001" + y2="76.279999" + id="lg5871" + xlink:href="#g3293_" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1.204,0,0,1.263,-926.036,-60.001)" /> + <linearGradient + x1="789.37" + y1="69.879997" + x2="791.03998" + y2="77.120003" + id="g3292_" + gradientUnits="userSpaceOnUse"> + <stop + style="stop-color:#999;stop-opacity:1" + offset="0" + id="s6403" /> + <stop + style="stop-color:#f2f2f2;stop-opacity:1" + offset="0.28" + id="s6405" /> + <stop + style="stop-color:#666;stop-opacity:1" + offset="1" + id="s6407" /> + <a:midPointstop + style="stop-color:#999999" + offset="0" /> + <a:midPointstop + style="stop-color:#999999" + offset="0.5" /> + <a:midPointstop + style="stop-color:#F2F2F2" + offset="0.28" /> + <a:midPointstop + style="stop-color:#F2F2F2" + offset="0.5" /> + <a:midPointstop + style="stop-color:#666666" + offset="1" /> + </linearGradient> + <linearGradient + x1="789.37" + y1="69.879997" + x2="791.03998" + y2="77.120003" + id="lg5874" + xlink:href="#g3292_" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1.204,0,0,1.263,-926.036,-60.001)" /> + <linearGradient + x1="786.65997" + y1="136.12" + x2="786.71002" + y2="134.33" + id="g3290_" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1,-0.25,0,1,0,137.29)"> + <stop + style="stop-color:#d9d9d9;stop-opacity:1" + offset="0" + id="s6380" /> + <stop + style="stop-color:#b2b2b2;stop-opacity:1" + offset="1" + id="s6382" /> + <a:midPointstop + style="stop-color:#D9D9D9" + offset="0" /> + <a:midPointstop + style="stop-color:#D9D9D9" + offset="0.5" /> + <a:midPointstop + style="stop-color:#B2B2B2" + offset="1" /> + </linearGradient> + <linearGradient + x1="786.65997" + y1="136.12" + x2="786.71002" + y2="134.33" + id="lg5878" + xlink:href="#g3290_" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1.204,-0.316,0,1.263,-926.036,113.351)" /> + <radialGradient + cx="1458.77" + cy="-5.0999999" + r="35.130001" + fx="1458.77" + fy="-5.0999999" + id="g3289_" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.42,0,0,0.42,167.09,79.84)"> + <stop + style="stop-color:white;stop-opacity:1" + offset="0" + id="s6371" /> + <stop + style="stop-color:#999;stop-opacity:1" + offset="1" + id="s6373" /> + <a:midPointstop + style="stop-color:#FFFFFF" + offset="0" /> + <a:midPointstop + style="stop-color:#FFFFFF" + offset="0.5" /> + <a:midPointstop + style="stop-color:#999999" + offset="1" /> + </radialGradient> + <radialGradient + cx="1458.77" + cy="-5.0999999" + r="35.130001" + fx="1458.77" + fy="-5.0999999" + id="rg5881" + xlink:href="#g3289_" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.505,0,0,0.53,-724.957,40.636)" /> + <radialGradient + cx="1612.98" + cy="-4.4699998" + r="36.580002" + fx="1612.98" + fy="-4.4699998" + id="g3288_" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.34,0,0,0.36,238.56,86.87)"> + <stop + style="stop-color:#e5e5e5;stop-opacity:1" + offset="0" + id="s6362" /> + <stop + style="stop-color:#b2b2b2;stop-opacity:1" + offset="0.63999999" + id="s6364" /> + <stop + style="stop-color:#737373;stop-opacity:1" + offset="1" + id="s6366" /> + <a:midPointstop + style="stop-color:#E5E5E5" + offset="0" /> + <a:midPointstop + style="stop-color:#E5E5E5" + offset="0.5" /> + <a:midPointstop + style="stop-color:#B2B2B2" + offset="0.64" /> + <a:midPointstop + style="stop-color:#B2B2B2" + offset="0.5" /> + <a:midPointstop + style="stop-color:#737373" + offset="1" /> + </radialGradient> + <radialGradient + cx="1612.98" + cy="-4.4699998" + r="36.580002" + fx="1612.98" + fy="-4.4699998" + id="rg5884" + xlink:href="#g3288_" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.408,0,0,0.448,-638.943,49.495)" /> + <radialGradient + cx="1470.5" + cy="-10.21" + r="33.290001" + fx="1470.5" + fy="-10.21" + id="g3287_" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.42,0,0,0.42,167.09,79.84)"> + <stop + style="stop-color:#e5e5e5;stop-opacity:1" + offset="0" + id="s6347" /> + <stop + style="stop-color:#b2b2b2;stop-opacity:1" + offset="0.38999999" + id="s6349" /> + <stop + style="stop-color:#b1b1b1;stop-opacity:1" + offset="0.75" + id="s6351" /> + <stop + style="stop-color:#aaa;stop-opacity:1" + offset="0.88" + id="s6353" /> + <stop + style="stop-color:#9e9e9e;stop-opacity:1" + offset="0.97000003" + id="s6355" /> + <stop + style="stop-color:#999;stop-opacity:1" + offset="1" + id="s6357" /> + <a:midPointstop + style="stop-color:#E5E5E5" + offset="0" /> + <a:midPointstop + style="stop-color:#E5E5E5" + offset="0.5" /> + <a:midPointstop + style="stop-color:#B2B2B2" + offset="0.39" /> + <a:midPointstop + style="stop-color:#B2B2B2" + offset="0.87" /> + <a:midPointstop + style="stop-color:#999999" + offset="1" /> + </radialGradient> + <radialGradient + cx="1470.5" + cy="-10.21" + r="33.290001" + fx="1470.5" + fy="-10.21" + id="rg5887" + xlink:href="#g3287_" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.505,0,0,0.53,-724.957,40.636)" /> + <pattern + patternTransform="matrix(0.592927,0,0,0.592927,78,462)" + id="cream-spots" + height="32" + width="32" + patternUnits="userSpaceOnUse"> + <g + transform="translate(-365.3146,-513.505)" + id="g3047"> + id="path2858" /> + <path + inkscape:label="#path2854" + sodipodi:nodetypes="czzzz" + style="fill:#e3dcc0" + id="path3060" + d="M 390.31462,529.50504 C 390.31462,534.47304 386.28262,538.50504 381.31462,538.50504 C 376.34662,538.50504 372.31462,534.47304 372.31462,529.50504 C 372.31462,524.53704 376.34662,520.50504 381.31462,520.50504 C 386.28262,520.50504 390.31462,524.53704 390.31462,529.50504 z " /> +</g> + </pattern> + <pattern + patternTransform="matrix(0.733751,0,0,0.733751,67,367)" + id="dark-cream-spots" + height="32" + width="32" + patternUnits="userSpaceOnUse"> + <g + transform="translate(-408.0946,-513.505)" + id="dark-cream-spot" + inkscape:label="#g3043"> + <path + sodipodi:nodetypes="czzzz" + style="fill:#c8c5ac" + d="M 433.09458,529.50504 C 433.09458,534.47304 429.06258,538.50504 424.09458,538.50504 C 419.12658,538.50504 415.09458,534.47304 415.09458,529.50504 C 415.09458,524.53704 419.12658,520.50504 424.09458,520.50504 C 429.06258,520.50504 433.09458,524.53704 433.09458,529.50504 z " + id="path2953" /> + </g> + </pattern> + <pattern + patternTransform="matrix(0.375,0,0,0.375,379,400)" + id="white-spots" + height="32" + width="32" + patternUnits="userSpaceOnUse"> + <g + transform="translate(-484.3997,-513.505)" + id="white-spot" + inkscape:label="#g3035"> + <path + style="opacity:0.25;fill:white" + id="path3033" + d="M 509.39967,529.50504 C 509.39967,534.47304 505.36767,538.50504 500.39967,538.50504 C 495.43167,538.50504 491.39967,534.47304 491.39967,529.50504 C 491.39967,524.53704 495.43167,520.50504 500.39967,520.50504 C 505.36767,520.50504 509.39967,524.53704 509.39967,529.50504 z " + sodipodi:nodetypes="czzzz" /> + </g> + </pattern> + <pattern + patternTransform="matrix(0.455007,0,0,0.455007,-5e-5,1.9e-5)" + id="black-spots" + height="32" + width="32" + patternUnits="userSpaceOnUse"> + <g + transform="translate(-448.3997,-513.505)" + id="black-spot" + inkscape:label="#g3039"> + <path + sodipodi:nodetypes="czzzz" + d="M 473.39967,529.50504 C 473.39967,534.47304 469.36767,538.50504 464.39967,538.50504 C 459.43167,538.50504 455.39967,534.47304 455.39967,529.50504 C 455.39967,524.53704 459.43167,520.50504 464.39967,520.50504 C 469.36767,520.50504 473.39967,524.53704 473.39967,529.50504 z " + id="path2961" + style="opacity:0.25;fill:black" /> + </g> + </pattern> + <linearGradient + x1="501.0903" + y1="-19.2544" + x2="531.85413" + y2="0.72390002" + id="linearGradient17334" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.6868,0.4269,-0.9821,0.821,111.6149,-5.7901)"> + <stop + style="stop-color:#b4daea;stop-opacity:1" + offset="0" + id="stop17336" /> + <stop + style="stop-color:#b4daea;stop-opacity:1" + offset="0.51120001" + id="stop17338" /> + <stop + style="stop-color:#5387ba;stop-opacity:1" + offset="0.64609998" + id="stop17340" /> + <stop + style="stop-color:#16336e;stop-opacity:1" + offset="1" + id="stop17342" /> + <a:midPointStop + offset="0" + style="stop-color:#B4DAEA" /> + <a:midPointStop + offset="0.5" + style="stop-color:#B4DAEA" /> + <a:midPointStop + offset="0.5112" + style="stop-color:#B4DAEA" /> + <a:midPointStop + offset="0.5" + style="stop-color:#B4DAEA" /> + <a:midPointStop + offset="0.6461" + style="stop-color:#5387BA" /> + <a:midPointStop + offset="0.5" + style="stop-color:#5387BA" /> + <a:midPointStop + offset="1" + style="stop-color:#16336E" /> + </linearGradient> + <linearGradient + x1="415.73831" + y1="11.854" + x2="418.13361" + y2="18.8104" + id="linearGradient17426" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.8362,0.5206,-1.1904,0.992,147.62,-30.9374)"> + <stop + style="stop-color:#ccc;stop-opacity:1" + offset="0" + id="stop17428" /> + <stop + style="stop-color:#f2f2f2;stop-opacity:1" + offset="1" + id="stop17430" /> + <a:midPointStop + offset="0" + style="stop-color:#CCCCCC" /> + <a:midPointStop + offset="0.5" + style="stop-color:#CCCCCC" /> + <a:midPointStop + offset="1" + style="stop-color:#F2F2F2" /> + </linearGradient> + <linearGradient + x1="478.21341" + y1="-131.9297" + x2="469.85818" + y2="-140.28481" + id="linearGradient17434" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.5592,0.829,-0.829,0.5592,101.3357,-104.791)"> + <stop + style="stop-color:#f3403f;stop-opacity:1" + offset="0" + id="stop17436" /> + <stop + style="stop-color:#d02a28;stop-opacity:1" + offset="0.37889999" + id="stop17438" /> + <stop + style="stop-color:#b21714;stop-opacity:1" + offset="0.77649999" + id="stop17440" /> + <stop + style="stop-color:#a6100c;stop-opacity:1" + offset="1" + id="stop17442" /> + <a:midPointStop + offset="0" + style="stop-color:#F3403F" /> + <a:midPointStop + offset="0.4213" + style="stop-color:#F3403F" /> + <a:midPointStop + offset="1" + style="stop-color:#A6100C" /> + </linearGradient> + <linearGradient + x1="502.70749" + y1="115.3013" + x2="516.39001" + y2="127.1953" + id="linearGradient17709" + xlink:href="#XMLID_1749_" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.9703,0.2419,-0.2419,0.9703,11.0227,-35.6159)" /> + <linearGradient + x1="506.09909" + y1="-11.5137" + x2="527.99609" + y2="2.7063999" + id="linearGradient17711" + xlink:href="#XMLID_1752_" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.6868,0.4269,-0.9821,0.821,111.6149,-5.7901)" /> + <linearGradient + x1="516.57672" + y1="-15.769" + x2="516.57672" + y2="0.84280002" + id="linearGradient17713" + xlink:href="#XMLID_1753_" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.6868,0.4269,-0.9821,0.821,111.6149,-5.7901)" /> + <linearGradient + x1="505.62939" + y1="-14.9526" + x2="527.49402" + y2="-0.7536" + id="linearGradient17715" + xlink:href="#XMLID_1756_" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.6868,0.4269,-0.9821,0.821,111.6149,-5.7901)" /> + <linearGradient + x1="500.70749" + y1="-13.2441" + x2="513.46442" + y2="-2.1547" + id="linearGradient17717" + xlink:href="#XMLID_1757_" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.6868,0.4269,-0.9821,0.821,111.6149,-5.7901)" /> + <linearGradient + x1="473.7681" + y1="209.17529" + x2="486.98099" + y2="213.2001" + id="linearGradient17721" + xlink:href="#XMLID_2274_" + gradientUnits="userSpaceOnUse" /> + <linearGradient + x1="481.23969" + y1="212.5742" + x2="472.92981" + y2="207.4967" + id="linearGradient17723" + xlink:href="#XMLID_2275_" + gradientUnits="userSpaceOnUse" /> + <linearGradient + x1="500.70749" + y1="-13.2441" + x2="513.46442" + y2="-2.1547" + id="linearGradient17416" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.6868,0.4269,-0.9821,0.821,111.6149,-5.7901)"> + <stop + style="stop-color:#5387ba;stop-opacity:1" + offset="0" + id="stop17418" /> + <stop + style="stop-color:#96bad6;stop-opacity:1" + offset="1" + id="stop17420" /> + <a:midPointStop + style="stop-color:#5387BA" + offset="0" /> + <a:midPointStop + style="stop-color:#5387BA" + offset="0.5" /> + <a:midPointStop + style="stop-color:#96BAD6" + offset="1" /> + </linearGradient> + <defs + id="defs9929"> + <path + d="M 489.21,209.35 L 485.35,203.63 C 483.63,204.25 473.47,208.93 471.5,210.18 C 470.57,210.77 470.17,211.16 469.72,212.48 C 470.93,212.31 471.72,212.49 473.42,213.04 C 473.26,214.77 473.24,215.74 473.57,218.2 C 474.01,216.88 474.41,216.49 475.34,215.9 C 477.33,214.65 487.49,209.97 489.21,209.35 z " + id="XMLID_960_" /> + </defs> + <clipPath + id="clipPath17448"> + <use + id="use17450" + x="0" + y="0" + width="744.09448" + height="600" + xlink:href="#XMLID_960_" /> + </clipPath> + <linearGradient + x1="473.7681" + y1="209.17529" + x2="486.98099" + y2="213.2001" + id="linearGradient17452" + gradientUnits="userSpaceOnUse"> + <stop + style="stop-color:#f3403f;stop-opacity:1" + offset="0" + id="stop17454" /> + <stop + style="stop-color:#d02a28;stop-opacity:1" + offset="0.37889999" + id="stop17456" /> + <stop + style="stop-color:#b21714;stop-opacity:1" + offset="0.77649999" + id="stop17458" /> + <stop + style="stop-color:#a6100c;stop-opacity:1" + offset="1" + id="stop17460" /> + <a:midPointStop + style="stop-color:#F3403F" + offset="0" /> + <a:midPointStop + style="stop-color:#F3403F" + offset="0.4213" /> + <a:midPointStop + style="stop-color:#A6100C" + offset="1" /> + </linearGradient> + <linearGradient + x1="481.23969" + y1="212.5742" + x2="472.92981" + y2="207.4967" + id="linearGradient17463" + gradientUnits="userSpaceOnUse"> + <stop + style="stop-color:#f3403f;stop-opacity:1" + offset="0" + id="stop17465" /> + <stop + style="stop-color:#d02a28;stop-opacity:1" + offset="0.37889999" + id="stop17467" /> + <stop + style="stop-color:#b21714;stop-opacity:1" + offset="0.77649999" + id="stop17469" /> + <stop + style="stop-color:#a6100c;stop-opacity:1" + offset="1" + id="stop17471" /> + <a:midPointStop + style="stop-color:#F3403F" + offset="0" /> + <a:midPointStop + style="stop-color:#F3403F" + offset="0.4213" /> + <a:midPointStop + style="stop-color:#A6100C" + offset="1" /> + </linearGradient> + <linearGradient + x1="481.23969" + y1="212.5742" + x2="472.92981" + y2="207.4967" + id="linearGradient17807" + xlink:href="#XMLID_2275_" + gradientUnits="userSpaceOnUse" + gradientTransform="translate(-177.1654,35.43307)" /> + <linearGradient + x1="473.7681" + y1="209.17529" + x2="486.98099" + y2="213.2001" + id="linearGradient17810" + xlink:href="#XMLID_2274_" + gradientUnits="userSpaceOnUse" + gradientTransform="translate(-177.1654,35.43307)" /> + <linearGradient + x1="502.70749" + y1="115.3013" + x2="516.39001" + y2="127.1953" + id="linearGradient17812" + xlink:href="#XMLID_1749_" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.9703,0.2419,-0.2419,0.9703,11.0227,-35.6159)" /> + <linearGradient + x1="506.09909" + y1="-11.5137" + x2="527.99609" + y2="2.7063999" + id="linearGradient17814" + xlink:href="#XMLID_1752_" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.6868,0.4269,-0.9821,0.821,111.6149,-5.7901)" /> + <linearGradient + x1="516.57672" + y1="-15.769" + x2="516.57672" + y2="0.84280002" + id="linearGradient17816" + xlink:href="#XMLID_1753_" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.6868,0.4269,-0.9821,0.821,111.6149,-5.7901)" /> + <linearGradient + x1="505.62939" + y1="-14.9526" + x2="527.49402" + y2="-0.7536" + id="linearGradient17818" + xlink:href="#XMLID_1756_" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.6868,0.4269,-0.9821,0.821,111.6149,-5.7901)" /> + <linearGradient + x1="502.70749" + y1="115.3013" + x2="516.39001" + y2="127.1953" + id="linearGradient17347" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.9703,0.2419,-0.2419,0.9703,11.0227,-35.6159)"> + <stop + style="stop-color:#5387ba;stop-opacity:1" + offset="0" + id="stop17349" /> + <stop + style="stop-color:#96bad6;stop-opacity:1" + offset="1" + id="stop17351" /> + <a:midPointStop + offset="0" + style="stop-color:#5387BA" /> + <a:midPointStop + offset="0.5" + style="stop-color:#5387BA" /> + <a:midPointStop + offset="1" + style="stop-color:#96BAD6" /> + </linearGradient> + <linearGradient + x1="516.57672" + y1="-15.769" + x2="516.57672" + y2="0.84280002" + id="linearGradient17379" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.6868,0.4269,-0.9821,0.821,111.6149,-5.7901)"> + <stop + style="stop-color:#b2b2b2;stop-opacity:1" + offset="0" + id="stop17381" /> + <stop + style="stop-color:#f2f2f2;stop-opacity:1" + offset="1" + id="stop17383" /> + <a:midPointStop + offset="0" + style="stop-color:#B2B2B2" /> + <a:midPointStop + offset="0.5" + style="stop-color:#B2B2B2" /> + <a:midPointStop + offset="1" + style="stop-color:#F2F2F2" /> + </linearGradient> + <linearGradient + x1="502.70749" + y1="115.3013" + x2="516.39001" + y2="127.1953" + id="linearGradient17862" + xlink:href="#XMLID_1749_" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.9703,0.2419,-0.2419,0.9703,-166.1427,-0.18283)" /> + <linearGradient + x1="505.62939" + y1="-14.9526" + x2="527.49402" + y2="-0.7536" + id="linearGradient17864" + xlink:href="#XMLID_1756_" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.6868,0.4269,-0.9821,0.821,111.6149,-5.7901)" /> + <defs + id="defs3859"> + <polygon + points="465.54,213.52 481.94,217.46 482.74,216.71 487.46,198.05 471.08,194.07 470.26,194.83 465.54,213.52 " + id="XMLID_343_" /> + </defs> + <linearGradient + x1="471.0806" + y1="201.07761" + x2="481.91711" + y2="210.4977" + id="linearGradient17389" + gradientUnits="userSpaceOnUse"> + <stop + style="stop-color:#6498c1;stop-opacity:1" + offset="0.005618" + id="stop17391" /> + <stop + style="stop-color:#79a9cc;stop-opacity:1" + offset="0.2332" + id="stop17393" /> + <stop + style="stop-color:#a4cde2;stop-opacity:1" + offset="0.74049997" + id="stop17395" /> + <stop + style="stop-color:#b4daea;stop-opacity:1" + offset="1" + id="stop17397" /> + <a:midPointStop + style="stop-color:#6498C1" + offset="5.618000e-003" /> + <a:midPointStop + style="stop-color:#6498C1" + offset="0.4438" /> + <a:midPointStop + style="stop-color:#B4DAEA" + offset="1" /> + </linearGradient> + <clipPath + id="clipPath17400"> + <use + id="use17402" + x="0" + y="0" + width="744.09448" + height="600" + xlink:href="#XMLID_343_" /> + </clipPath> + <linearGradient + x1="505.62939" + y1="-14.9526" + x2="527.49402" + y2="-0.7536" + id="linearGradient17404" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.6868,0.4269,-0.9821,0.821,111.6149,-5.7901)"> + <stop + style="stop-color:#b4daea;stop-opacity:1" + offset="0" + id="stop17406" /> + <stop + style="stop-color:#b4daea;stop-opacity:1" + offset="0.51120001" + id="stop17408" /> + <stop + style="stop-color:#5387ba;stop-opacity:1" + offset="0.64609998" + id="stop17410" /> + <stop + style="stop-color:#16336e;stop-opacity:1" + offset="1" + id="stop17412" /> + <a:midPointStop + style="stop-color:#B4DAEA" + offset="0" /> + <a:midPointStop + style="stop-color:#B4DAEA" + offset="0.5" /> + <a:midPointStop + style="stop-color:#B4DAEA" + offset="0.5112" /> + <a:midPointStop + style="stop-color:#B4DAEA" + offset="0.5" /> + <a:midPointStop + style="stop-color:#5387BA" + offset="0.6461" /> + <a:midPointStop + style="stop-color:#5387BA" + offset="0.5" /> + <a:midPointStop + style="stop-color:#16336E" + offset="1" /> + </linearGradient> + <linearGradient + x1="506.09909" + y1="-11.5137" + x2="527.99609" + y2="2.7063999" + id="linearGradient17882" + xlink:href="#XMLID_1752_" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.6868,0.4269,-0.9821,0.821,111.6149,-5.7901)" /> + <defs + id="defs3826"> + <polygon + points="463.52,216.14 480.56,220.24 481.36,219.5 483.03,202.04 469.05,196.69 468.24,197.45 463.52,216.14 " + id="XMLID_338_" /> + </defs> + <linearGradient + x1="468.2915" + y1="204.7612" + x2="479.39871" + y2="214.4166" + id="linearGradient17357" + gradientUnits="userSpaceOnUse"> + <stop + style="stop-color:#5387ba;stop-opacity:1" + offset="0" + id="stop17359" /> + <stop + style="stop-color:#96bad6;stop-opacity:1" + offset="1" + id="stop17361" /> + <a:midPointStop + style="stop-color:#5387BA" + offset="0" /> + <a:midPointStop + style="stop-color:#5387BA" + offset="0.5" /> + <a:midPointStop + style="stop-color:#96BAD6" + offset="1" /> + </linearGradient> + <clipPath + id="clipPath17364"> + <use + id="use17366" + x="0" + y="0" + width="744.09448" + height="600" + xlink:href="#XMLID_338_" /> + </clipPath> + <linearGradient + x1="506.09909" + y1="-11.5137" + x2="527.99609" + y2="2.7063999" + id="linearGradient17368" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.6868,0.4269,-0.9821,0.821,111.6149,-5.7901)"> + <stop + style="stop-color:#b4daea;stop-opacity:1" + offset="0" + id="stop17370" /> + <stop + style="stop-color:#b4daea;stop-opacity:1" + offset="0.51120001" + id="stop17372" /> + <stop + style="stop-color:#5387ba;stop-opacity:1" + offset="0.64609998" + id="stop17374" /> + <stop + style="stop-color:#16336e;stop-opacity:1" + offset="1" + id="stop17376" /> + <a:midPointStop + style="stop-color:#B4DAEA" + offset="0" /> + <a:midPointStop + style="stop-color:#B4DAEA" + offset="0.5" /> + <a:midPointStop + style="stop-color:#B4DAEA" + offset="0.5112" /> + <a:midPointStop + style="stop-color:#B4DAEA" + offset="0.5" /> + <a:midPointStop + style="stop-color:#5387BA" + offset="0.6461" /> + <a:midPointStop + style="stop-color:#5387BA" + offset="0.5" /> + <a:midPointStop + style="stop-color:#16336E" + offset="1" /> + </linearGradient> + <linearGradient + x1="296.4996" + y1="188.81061" + x2="317.32471" + y2="209.69398" + id="linearGradient2387" + xlink:href="#linearGradient2381" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.90776,0,0,0.90776,24.35648,49.24131)" /> + <linearGradient + x1="296.4996" + y1="188.81061" + x2="317.32471" + y2="209.69398" + id="linearGradient5105" + xlink:href="#linearGradient2381" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.90776,0,0,0.90776,24.35648,49.24131)" /> + <linearGradient + x1="296.4996" + y1="188.81061" + x2="317.32471" + y2="209.69398" + id="linearGradient5145" + xlink:href="#linearGradient2381" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.90776,0,0,0.90776,24.35648,49.24131)" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient2381" + id="linearGradient2371" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.90776,0,0,0.90776,24.35648,49.24131)" + x1="296.4996" + y1="188.81061" + x2="317.32471" + y2="209.69398" /> + </defs> + <g + transform="matrix(0.437808,-0.437808,0.437808,0.437808,-220.8237,43.55311)" + id="g5089"> + <path + d="M 8.4382985,-6.28125 C 7.8309069,-6.28125 4.125,-0.33238729 4.125,1.96875 L 4.125,28.6875 C 4.125,29.533884 4.7068159,29.8125 5.28125,29.8125 L 30.84375,29.8125 C 31.476092,29.8125 31.968751,29.319842 31.96875,28.6875 L 31.96875,23.46875 L 32.25,23.46875 C 32.74684,23.46875 33.156249,23.059339 33.15625,22.5625 L 33.15625,-5.375 C 33.15625,-5.8718398 32.74684,-6.28125 32.25,-6.28125 L 8.4382985,-6.28125 z " + transform="translate(282.8327,227.1903)" + style="fill:#5c5c4f;stroke:black;stroke-width:3.23021388;stroke-miterlimit:4;stroke-dasharray:none" + id="path5091" /> + <rect + width="27.85074" + height="29.369793" + rx="1.1414107" + ry="1.1414107" + x="286.96509" + y="227.63805" + style="fill:#032c87" + id="rect5093" /> + <path + d="M 288.43262,225.43675 L 313.67442,225.43675 L 313.67442,254.80655 L 287.29827,254.83069 L 288.43262,225.43675 z " + style="fill:white" + id="rect5095" /> + <path + d="M 302.44536,251.73726 C 303.83227,259.59643 301.75225,263.02091 301.75225,263.02091 C 303.99609,261.41329 305.71651,259.54397 306.65747,257.28491 C 307.62455,259.47755 308.49041,261.71357 310.9319,263.27432 C 310.9319,263.27432 309.33686,256.07392 309.22047,251.73726 L 302.44536,251.73726 z " + style="fill:#a70000;fill-opacity:1;stroke-width:2" + id="path5097" /> + <rect + width="25.241802" + height="29.736675" + rx="0.89682275" + ry="0.89682275" + x="290.73544" + y="220.92249" + style="fill:#809cc9" + id="rect5099" /> + <path + d="M 576.47347,725.93939 L 582.84431,726.35441 L 583.25121,755.8725 C 581.35919,754.55465 576.39694,752.1117 574.98889,754.19149 L 574.98889,727.42397 C 574.98889,726.60151 575.65101,725.93939 576.47347,725.93939 z " + transform="matrix(0.499065,-0.866565,0,1,0,0)" + style="fill:#4573b3;fill-opacity:1" + id="rect5101" /> + <path + d="M 293.2599,221.89363 L 313.99908,221.89363 C 314.45009,221.89363 314.81318,222.25673 314.81318,222.70774 C 315.02865,229.0361 295.44494,244.47124 292.44579,240.30491 L 292.44579,222.70774 C 292.44579,222.25673 292.80889,221.89363 293.2599,221.89363 z " + style="opacity:0.65536726;fill:url(#linearGradient2371);fill-opacity:1" + id="path5103" /> + </g> +</svg> diff --git a/doc/Tapset_Reference_Guide/publicanize.sh b/doc/Tapset_Reference_Guide/publicanize.sh index 96c20a11..d4da6e02 100755 --- a/doc/Tapset_Reference_Guide/publicanize.sh +++ b/doc/Tapset_Reference_Guide/publicanize.sh @@ -1,10 +1,15 @@ #!/bin/bash #copy the automated tapsets.xml -cp ../SystemTap_Tapset_Reference/tapsets.xml en-US/Tapset_Reference_Guide.xml ; +cp ../SystemTap_Tapset_Reference/tapsets.xml temp.xml ; #remove all excess whitespace -sed -i -e 's/^\s*//g' en-US/Tapset_Reference_Guide.xml ; +sed -i -e 's/^\s*//g' temp.xml ; + +#remove marked Intro (starthere to endhere), then copy it to en-US +sed '/starthere/,/endhere/d' temp.xml > Tapset_Reference_Guide.xml +cp Tapset_Reference_Guide.xml en-US/Tapset_Reference_Guide.xml; +rm Tapset_Reference_Guide.xml #re-convert programlisting tags sed -i -e 's/<programlisting>/<programlisting>/g' en-US/Tapset_Reference_Guide.xml; @@ -22,15 +27,24 @@ perl -p -e 'undef $/;s|<para>\nYou should have received a copy of the GNU Genera perl -p -e 'undef $/;s|<para>\nFor more details see the file COPYING in the source\ndistribution of Linux.\n</para>\n</legalnotice>\n</bookinfo>||msg' | perl -p -e 'undef $/;s|<toc></toc>||msg' | perl -p -e 'undef $/;s|\n\n\n\n\n\n\n\n\n\n\n\n\n\n||msg' | -perl -p -e 'undef $/;s|<programlisting>\n|<programlisting>\n<emphasis>(sfunction) <\/emphasis>|msg' | +perl -p -e 'undef $/;s|\n\n\n\n\n\n\n\n\n\n\n||msg' | +perl -p -e 'undef $/;s|<programlisting>\n|<programlisting>\n<emphasis>function <\/emphasis>|msg' | perl -p -e 'undef $/;s|<para>\n</para>||msg' | perl -p -e 'undef $/;s|<para>\n\n</para>||msg' | perl -p -e 'undef $/;s|<para>\n<programlisting>|<programlisting>|msg' | perl -p -e 'undef $/;s|</programlisting>\n</para>|</programlisting>|msg' > clean.xml +#replace Intro with my own +perl -p -i -e 's|<!--markerforxi-->|<xi:include href="Introduction.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />\n<xi:include href="Tapset_Dev_Guide.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />|g' clean.xml + +#for tapset name format section +#perl -p -i -e 'undef $/;s|<screen>\nname:return \(parameters\)\ndefinition\n</screen>|<screen>\n<replaceable>function/probe</replaceable> tapset_name:return \(parameters\)\n</screen>|msg' clean.xml +#perl -p -i -e 's|<para>In this guide, tapset definitions appear in the following format:</para>|<para>In this guide, the synopsis of each tapset appears in the following format:</para>|g' clean.xml +#perl -p -i -e 's|<!-- markerforxi pls dont remove -->|<xi:include href="tapsetnameformat-lastpara.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />\n<xi:include href="refentry-example.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />|g' clean.xml + cp clean.xml en-US/Tapset_Reference_Guide.xml rm clean.xml - + # statements change synopsis tags, as they are still currently unfixed in publican-redhat sed -i -e 's/refsynopsisdiv>/refsect1>/g' en-US/Tapset_Reference_Guide.xml; sed -i -e 's/refsect1>/refsection>/g' en-US/Tapset_Reference_Guide.xml; @@ -45,4 +59,7 @@ sed -i -e 's/<remark>/<remark>/g' en-US/Tapset_Reference_Guide.xml; sed -i -e 's/<\/remark>/<\/remark>/g' en-US/Tapset_Reference_Guide.xml; sed -i -e 's/<command>/<command>/g' en-US/Tapset_Reference_Guide.xml; -sed -i -e 's/<\/command>/<\/command>/g' en-US/Tapset_Reference_Guide.xml;
\ No newline at end of file +sed -i -e 's/<\/command>/<\/command>/g' en-US/Tapset_Reference_Guide.xml; + +#useful marker script; moves content between starthere and endhere to file target +#sed -n '/starthere/,/endhere/ s/.*/&/w target' Tapset_Reference_Guide.xml
\ No newline at end of file @@ -73,6 +73,15 @@ class provider: self.h.write ('#define %s(arg1,arg2,arg3,arg4,arg5) STAP_PROBE%d(provider,%s,arg1,arg2,arg3,arg4,arg5)\n' % (this_probe_canon, c+1, this_probe)) elif (c == 5): self.h.write ('#define %s(arg1,arg2,arg3,arg4,arg5,arg6) STAP_PROBE%d(provider,%s,arg1,arg2,arg3,arg4,arg5,arg6)\n' % (this_probe_canon, c+1, this_probe)) + elif (c == 6): + self.h.write ('#define %s(arg1,arg2,arg3,arg4,arg5,arg6,arg7) STAP_PROBE%d(provider,%s,arg1,arg2,arg3,arg4,arg5,arg6,arg7)\n' % (this_probe_canon, c+1, this_probe)) + elif (c == 7): + self.h.write ('#define %s(arg1,arg2,arg3,arg4,arg5,arg6,arg7,arg8) STAP_PROBE%d(provider,%s,arg1,arg2,arg3,arg4,arg5,arg6,arg7,arg8)\n' % (this_probe_canon, c+1, this_probe)) + elif (c == 8): + self.h.write ('#define %s(arg1,arg2,arg3,arg4,arg5,arg6,arg7,arg8,arg9) STAP_PROBE%d(provider,%s,arg1,arg2,arg3,arg4,arg5,arg6,arg7,arg8,arg9)\n' % (this_probe_canon, c+1, this_probe)) + elif (c == 9): + self.h.write('// X %d %s\n' % (c+1,this_probe_canon)) + self.h.write ('#define %s(arg1,arg2,arg3,arg4,arg5,arg6,arg7,arg8,arg9,arg10) STAP_PROBE%d(provider,%s,arg1,arg2,arg3,arg4,arg5,arg6,arg7,arg8,arg9,arg10)\n' % (this_probe_canon, c+1, this_probe)) self.h.write ('#define %s_ENABLED() 1\n' % this_probe_canon) def get(self, arg): diff --git a/elaborate.cxx b/elaborate.cxx index 0a00ebf2..34e6ab16 100644 --- a/elaborate.cxx +++ b/elaborate.cxx @@ -1448,6 +1448,7 @@ systemtap_session::systemtap_session (): timer_derived_probes(0), profile_derived_probes(0), mark_derived_probes(0), + tracepoint_derived_probes(0), hrtimer_derived_probes(0), perfmon_derived_probes(0), procfs_derived_probes(0), diff --git a/elaborate.h b/elaborate.h index 1e05444f..0ad5b4b2 100644 --- a/elaborate.h +++ b/elaborate.h @@ -124,6 +124,8 @@ struct derived_probe: public probe virtual void join_group (systemtap_session& s) = 0; virtual probe_point* sole_location () const; virtual void printsig (std::ostream &o) const; + //for print arguments of probe if there + virtual void printargs (std::ostream &o) const {} void printsig_nested (std::ostream &o) const; virtual void collect_derivation_chain (std::vector<probe*> &probes_list); diff --git a/includes/sys/sdt.h b/includes/sys/sdt.h index d68fed6c..d6c90192 100644 --- a/includes/sys/sdt.h +++ b/includes/sys/sdt.h @@ -1,22 +1,24 @@ -// Copyright (C) 2005-2009 Red Hat Inc. -// Copyright (C) 2006 Intel Corporation. -// -// This file is part of systemtap, and is free software. You can -// redistribute it and/or modify it under the terms of the GNU General -// Public License (GPL); either version 2, or (at your option) any -// later version. +/* Copyright (C) 2005-2009 Red Hat Inc. + Copyright (C) 2006 Intel Corporation. + + This file is part of systemtap, and is free software. You can + redistribute it and/or modify it under the terms of the GNU General + Public License (GPL); either version 2, or (at your option) any + later version. +*/ #ifndef _SYS_SDT_H #define _SYS_SDT_H 1 #include <string.h> +#include <sys/types.h> #if _LP64 #define STAP_PROBE_STRUCT_ARG(arg) \ - __uint64_t arg; + __uint64_t arg #else #define STAP_PROBE_STRUCT_ARG(arg) \ - long arg __attribute__ ((aligned(8))); + long arg __attribute__ ((aligned(8))) #endif #define STAP_SENTINEL 0x31425250 @@ -28,126 +30,192 @@ struct _probe_ ## probe \ STAP_PROBE_STRUCT_ARG (probe_name); \ STAP_PROBE_STRUCT_ARG (probe_arg); \ }; \ -static char probe ## _ ## probe_name [strlen(#probe)+1] \ +static char probe ## _ ## probe_name [] \ __attribute__ ((section (".probes"))) \ = #probe; \ -static volatile struct _probe_ ## probe _probe_ ## probe __attribute__ ((section (".probes"))) = {STAP_SENTINEL,(size_t)& probe ## _ ## probe_name[0],argc}; +__extension__ static volatile struct _probe_ ## probe _probe_ ## probe __attribute__ ((section (".probes"))) = {STAP_SENTINEL,(size_t)& probe ## _ ## probe_name[0],argc}; -#define STAP_LABEL_REF(probe) \ +/* The goto _probe_ prevents the label from "drifting" */ +#define STAP_LABEL_REF(probe, label) \ if (__builtin_expect(_probe_ ## probe.probe_type < 0, 0)) \ - goto STAP_LABEL(probe,__LINE__); + goto label; +/* These baroque macros are used to create a unique label */ #define STAP_CONCAT(a,b) a ## b -#define STAP_LABEL(p,n) \ - STAP_CONCAT(_stapprobe1_ ## p ## _, n) - -// The goto _probe_ prevents the label from "drifting" -#define STAP_PROBE(provider,probe) \ - { \ -STAP_LABEL(probe,__LINE__): \ - asm volatile ("nop"); \ - STAP_PROBE_STRUCT(probe,(size_t)&& STAP_LABEL(probe,__LINE__)) \ - STAP_LABEL_REF(probe) \ -} - +#define STAP_LABEL_PREFIX(p) _stapprobe1_ ## p +/* __COUNTER__ is not present in gcc 4.1 */ +#if __GNUC__ == 4 && __GNUC_MINOR__ >= 3 +#define STAP_COUNTER STAP_CONCAT(__,COUNTER__) +#else +#define STAP_COUNTER STAP_CONCAT(__,LINE__) +#endif +#define STAP_LABEL(a,b) STAP_CONCAT(a,b) + +#define STAP_PROBE_(probe,label) \ +do { \ + STAP_PROBE_STRUCT(probe,(size_t)&& label) \ + STAP_LABEL_REF(probe,label); \ +label: \ + __asm__ volatile ("nop"); \ + } while (0) + +#define STAP_PROBE1_(probe,label,parm1) \ +do { \ + STAP_PROBE_STRUCT(probe,(size_t)&& label) \ + volatile __typeof__((parm1)) arg1 __attribute__ ((unused)) = parm1; \ +label: \ + __asm__ volatile ("nop /* %0 */" :: "X"( arg1)); \ + STAP_LABEL_REF(probe,label); \ + } while (0) + +#define STAP_PROBE2_(probe,label,parm1,parm2) \ +do { \ + STAP_PROBE_STRUCT(probe,(size_t)&& label) \ + volatile __typeof__((parm1)) arg1 __attribute__ ((unused)) = parm1; \ + volatile __typeof__((parm2)) arg2 __attribute__ ((unused)) = parm2; \ +label: \ + __asm__ volatile ("nop /* %0 %1 */" :: "X"(arg1), "X"(arg2)); \ + STAP_LABEL_REF(probe,label); \ +} while (0) + +#define STAP_PROBE3_(probe,label,parm1,parm2,parm3) \ +do { \ + STAP_PROBE_STRUCT(probe,(size_t)&& label) \ + volatile __typeof__((parm1)) arg1 __attribute__ ((unused)) = parm1; \ + volatile __typeof__((parm2)) arg2 __attribute__ ((unused)) = parm2; \ + volatile __typeof__((parm3)) arg3 __attribute__ ((unused)) = parm3; \ +label: \ + __asm__ volatile ("nop /* %0 %1 %2 */" :: "X"(arg1), "X"(arg2), "X"(arg3)); \ + STAP_LABEL_REF(probe,label); \ +} while (0) + +#define STAP_PROBE4_(probe,label,parm1,parm2,parm3,parm4) \ +do { \ + STAP_PROBE_STRUCT(probe,(size_t)&& label) \ + volatile __typeof__((parm1)) arg1 __attribute__ ((unused)) = parm1; \ + volatile __typeof__((parm2)) arg2 __attribute__ ((unused)) = parm2; \ + volatile __typeof__((parm3)) arg3 __attribute__ ((unused)) = parm3; \ + volatile __typeof__((parm4)) arg4 __attribute__ ((unused)) = parm4; \ +label: \ + __asm__ volatile ("nop /* %0 %1 %2 %3 */" :: "X"(arg1), "X"(arg2), "X"(arg3), "X"(arg4)); \ + STAP_LABEL_REF(probe,label); \ +} while (0) + +#define STAP_PROBE5_(probe,label,parm1,parm2,parm3,parm4,parm5) \ +do { \ + STAP_PROBE_STRUCT(probe,(size_t)&& label) \ + volatile __typeof__((parm1)) arg1 __attribute__ ((unused)) = parm1; \ + volatile __typeof__((parm2)) arg2 __attribute__ ((unused)) = parm2; \ + volatile __typeof__((parm3)) arg3 __attribute__ ((unused)) = parm3; \ + volatile __typeof__((parm4)) arg4 __attribute__ ((unused)) = parm4; \ + volatile __typeof__((parm5)) arg5 __attribute__ ((unused)) = parm5; \ +label: \ + __asm__ volatile ("nop /* %0 %1 %2 %3 %4 */" :: "X"(arg1), "X"(arg2), "X"(arg3), "X"(arg4), "X"(arg5)); \ + STAP_LABEL_REF(probe,label); \ +} while (0) + +#define STAP_PROBE6_(probe,label,parm1,parm2,parm3,parm4,parm5,parm6) \ +do { \ + STAP_PROBE_STRUCT(probe,(size_t)&& label) \ + volatile __typeof__((parm1)) arg1 __attribute__ ((unused)) = parm1; \ + volatile __typeof__((parm2)) arg2 __attribute__ ((unused)) = parm2; \ + volatile __typeof__((parm3)) arg3 __attribute__ ((unused)) = parm3; \ + volatile __typeof__((parm4)) arg4 __attribute__ ((unused)) = parm4; \ + volatile __typeof__((parm5)) arg5 __attribute__ ((unused)) = parm5; \ + volatile __typeof__((parm6)) arg6 __attribute__ ((unused)) = parm6; \ +label: \ + __asm__ volatile ("nop" :: "X"(arg1), "X"(arg2), "X"(arg3), "X"(arg4), "X"(arg5), "X"(arg6)); \ + STAP_LABEL_REF(probe,label); \ +} while (0) + +#define STAP_PROBE7_(probe,label,parm1,parm2,parm3,parm4,parm5,parm6,parm7) \ +do { \ + STAP_PROBE_STRUCT(probe,(size_t)&& label) \ + volatile __typeof__((parm1)) arg1 __attribute__ ((unused)) = parm1; \ + volatile __typeof__((parm2)) arg2 __attribute__ ((unused)) = parm2; \ + volatile __typeof__((parm3)) arg3 __attribute__ ((unused)) = parm3; \ + volatile __typeof__((parm4)) arg4 __attribute__ ((unused)) = parm4; \ + volatile __typeof__((parm5)) arg5 __attribute__ ((unused)) = parm5; \ + volatile __typeof__((parm6)) arg6 __attribute__ ((unused)) = parm6; \ + volatile __typeof__((parm7)) arg7 __attribute__ ((unused)) = parm7; \ +label: \ + __asm__ volatile ("nop" :: "X"(arg1), "X"(arg2), "X"(arg3), "X"(arg4), "X"(arg5), "X"(arg6), "X"(arg7)); \ + STAP_LABEL_REF(probe,label); \ +} while (0) + +#define STAP_PROBE8_(probe,label,parm1,parm2,parm3,parm4,parm5,parm6,parm7,parm8) \ +do { \ + STAP_PROBE_STRUCT(probe,(size_t)&& label) \ + volatile __typeof__((parm1)) arg1 __attribute__ ((unused)) = parm1; \ + volatile __typeof__((parm2)) arg2 __attribute__ ((unused)) = parm2; \ + volatile __typeof__((parm3)) arg3 __attribute__ ((unused)) = parm3; \ + volatile __typeof__((parm4)) arg4 __attribute__ ((unused)) = parm4; \ + volatile __typeof__((parm5)) arg5 __attribute__ ((unused)) = parm5; \ + volatile __typeof__((parm6)) arg6 __attribute__ ((unused)) = parm6; \ + volatile __typeof__((parm7)) arg7 __attribute__ ((unused)) = parm7; \ + volatile __typeof__((parm8)) arg8 __attribute__ ((unused)) = parm8; \ +label: \ + __asm__ volatile ("nop" :: "X"(arg1), "X"(arg2), "X"(arg3), "X"(arg4), "X"(arg5), "X"(arg6), "X"(arg7), "X"(arg8)); \ + STAP_LABEL_REF(probe,label); \ +} while (0) + +#define STAP_PROBE9_(probe,label,parm1,parm2,parm3,parm4,parm5,parm6,parm7,parm8,parm9) \ +do { \ + STAP_PROBE_STRUCT(probe,(size_t)&& label) \ + volatile __typeof__((parm1)) arg1 __attribute__ ((unused)) = parm1; \ + volatile __typeof__((parm2)) arg2 __attribute__ ((unused)) = parm2; \ + volatile __typeof__((parm3)) arg3 __attribute__ ((unused)) = parm3; \ + volatile __typeof__((parm4)) arg4 __attribute__ ((unused)) = parm4; \ + volatile __typeof__((parm5)) arg5 __attribute__ ((unused)) = parm5; \ + volatile __typeof__((parm6)) arg6 __attribute__ ((unused)) = parm6; \ + volatile __typeof__((parm7)) arg7 __attribute__ ((unused)) = parm7; \ + volatile __typeof__((parm8)) arg8 __attribute__ ((unused)) = parm8; \ + volatile __typeof__((parm9)) arg9 __attribute__ ((unused)) = parm9; \ +label: \ + __asm__ volatile ("nop" :: "X"(arg1), "X"(arg2), "X"(arg3), "X"(arg4), "X"(arg5), "X"(arg6), "X"(arg7), "X"(arg8), "X"(arg9)); \ + STAP_LABEL_REF(probe,label); \ +} while (0) + +#define STAP_PROBE10_(probe,label,parm1,parm2,parm3,parm4,parm5,parm6,parm7,parm8,parm9,parm10) \ +do { \ + STAP_PROBE_STRUCT(probe,(size_t)&& label) \ + volatile __typeof__((parm1)) arg1 __attribute__ ((unused)) = parm1; \ + volatile __typeof__((parm2)) arg2 __attribute__ ((unused)) = parm2; \ + volatile __typeof__((parm3)) arg3 __attribute__ ((unused)) = parm3; \ + volatile __typeof__((parm4)) arg4 __attribute__ ((unused)) = parm4; \ + volatile __typeof__((parm5)) arg5 __attribute__ ((unused)) = parm5; \ + volatile __typeof__((parm6)) arg6 __attribute__ ((unused)) = parm6; \ + volatile __typeof__((parm7)) arg7 __attribute__ ((unused)) = parm7; \ + volatile __typeof__((parm8)) arg8 __attribute__ ((unused)) = parm8; \ + volatile __typeof__((parm9)) arg9 __attribute__ ((unused)) = parm9; \ + volatile __typeof__((parm10)) arg10 __attribute__ ((unused)) = parm10; \ +label: \ + __asm__ volatile ("nop" :: "X"(arg1), "X"(arg2), "X"(arg3), "X"(arg4), "X"(arg5), "X"(arg6), "X"(arg7), "X"(arg8), "X"(arg9), "X"(arg10)); \ + STAP_LABEL_REF(probe,label); \ +} while (0) + +#define STAP_PROBE(provider,probe) \ + STAP_PROBE_(probe,STAP_LABEL(STAP_LABEL_PREFIX(probe),STAP_COUNTER)) #define STAP_PROBE1(provider,probe,parm1) \ - {volatile typeof((parm1)) arg1 __attribute__ ((unused)) = parm1; \ -STAP_LABEL(probe,__LINE__): \ - asm volatile ("nop /* %0 */" :: "g"( arg1)); \ - STAP_PROBE_STRUCT(probe,(size_t)&& STAP_LABEL(probe,__LINE__)) \ - STAP_LABEL_REF(probe);} - -#define STAP_PROBE2(provider,probe,parm1,parm2) \ - {volatile typeof((parm1)) arg1 __attribute__ ((unused)) = parm1; \ - volatile typeof((parm2)) arg2 __attribute__ ((unused)) = parm2; \ -STAP_LABEL(probe,__LINE__): \ - asm volatile ("nop /* %0 %1 */" :: "g"(arg1), "g"(arg2)); \ - STAP_PROBE_STRUCT(probe,(size_t)&& STAP_LABEL(probe,__LINE__)) \ - STAP_LABEL_REF(probe);} - -#define STAP_PROBE3(provider,probe,parm1,parm2,parm3) \ - {volatile typeof((parm1)) arg1 __attribute__ ((unused)) = parm1; \ - volatile typeof((parm2)) arg2 __attribute__ ((unused)) = parm2; \ - volatile typeof((parm3)) arg3 __attribute__ ((unused)) = parm3; \ -STAP_LABEL(probe,__LINE__): \ - asm volatile ("nop /* %0 %1 %2 */" :: "g"(arg1), "g"(arg2), "g"(arg3)); \ - STAP_PROBE_STRUCT(probe,(size_t)&& STAP_LABEL(probe,__LINE__)) \ - STAP_LABEL_REF(probe);} - -#define STAP_PROBE4(provider,probe,parm1,parm2,parm3,parm4) \ - {volatile typeof((parm1)) arg1 __attribute__ ((unused)) = parm1; \ - volatile typeof((parm2)) arg2 __attribute__ ((unused)) = parm2; \ - volatile typeof((parm3)) arg3 __attribute__ ((unused)) = parm3; \ - volatile typeof((parm4)) arg4 __attribute__ ((unused)) = parm4; \ -STAP_LABEL(probe,__LINE__): \ - asm volatile ("nop /* %0 %1 %2 %3 */" :: "g"(arg1), "g"(arg2), "g"(arg3), "g"(arg4)); \ - STAP_PROBE_STRUCT(probe,(size_t)&& STAP_LABEL(probe,__LINE__)) \ - STAP_LABEL_REF(probe);} - -#define STAP_PROBE5(provider,probe,parm1,parm2,parm3,parm4,parm5) \ - {volatile typeof((parm1)) arg1 __attribute__ ((unused)) = parm1; \ - volatile typeof((parm2)) arg2 __attribute__ ((unused)) = parm2; \ - volatile typeof((parm3)) arg3 __attribute__ ((unused)) = parm3; \ - volatile typeof((parm4)) arg4 __attribute__ ((unused)) = parm4; \ - volatile typeof((parm5)) arg5 __attribute__ ((unused)) = parm5; \ -STAP_LABEL(probe,__LINE__): \ - asm volatile ("nop /* %0 %1 %2 %3 %4 */" :: "X"(arg1), "X"(arg2), "X"(arg3), "X"(arg4), "X"(arg5)); \ - STAP_PROBE_STRUCT(probe,(size_t)&& STAP_LABEL(probe,__LINE__)) \ - STAP_LABEL_REF(probe);} - -#define STAP_PROBE6(provider,probe,parm1,parm2,parm3,parm4,parm5,parm6) \ - {volatile typeof((parm1)) arg1 __attribute__ ((unused)) = parm1; \ - volatile typeof((parm2)) arg2 __attribute__ ((unused)) = parm2; \ - volatile typeof((parm3)) arg3 __attribute__ ((unused)) = parm3; \ - volatile typeof((parm4)) arg4 __attribute__ ((unused)) = parm4; \ - volatile typeof((parm5)) arg5 __attribute__ ((unused)) = parm5; \ - volatile typeof((parm6)) arg6 __attribute__ ((unused)) = parm6; \ -STAP_LABEL(probe,__LINE__): \ - asm volatile ("nop" :: "X"(arg1), "X"(arg2), "X"(arg3), "X"(arg4), "X"(arg5), "X"(arg6)); \ - STAP_PROBE_STRUCT(probe,(size_t)&& STAP_LABEL(probe,__LINE__)) \ - STAP_LABEL_REF(probe);} - -#define STAP_PROBE7(provider,probe,parm1,parm2,parm3,parm4,parm5,parm6,parm7) \ - {volatile typeof((parm1)) arg1 __attribute__ ((unused)) = parm1; \ - volatile typeof((parm2)) arg2 __attribute__ ((unused)) = parm2; \ - volatile typeof((parm3)) arg3 __attribute__ ((unused)) = parm3; \ - volatile typeof((parm4)) arg4 __attribute__ ((unused)) = parm4; \ - volatile typeof((parm5)) arg5 __attribute__ ((unused)) = parm5; \ - volatile typeof((parm6)) arg6 __attribute__ ((unused)) = parm6; \ - volatile typeof((parm7)) arg7 __attribute__ ((unused)) = parm7; \ -STAP_LABEL(probe,__LINE__): \ - asm volatile ("nop" :: "X"(arg1), "X"(arg2), "X"(arg3), "X"(arg4), "X"(arg5), "X"(arg6), "X"(arg7)); \ - STAP_PROBE_STRUCT(probe,(size_t)&& STAP_LABEL(probe,__LINE__)) \ - STAP_LABEL_REF(probe);} - -#define STAP_PROBE8(provider,probe,parm1,parm2,parm3,parm4,parm5,parm6,parm7,parm8) \ - {volatile typeof((parm1)) arg1 __attribute__ ((unused)) = parm1; \ - volatile typeof((parm2)) arg2 __attribute__ ((unused)) = parm2; \ - volatile typeof((parm3)) arg3 __attribute__ ((unused)) = parm3; \ - volatile typeof((parm4)) arg4 __attribute__ ((unused)) = parm4; \ - volatile typeof((parm5)) arg5 __attribute__ ((unused)) = parm5; \ - volatile typeof((parm6)) arg6 __attribute__ ((unused)) = parm6; \ - volatile typeof((parm7)) arg7 __attribute__ ((unused)) = parm7; \ - volatile typeof((parm8)) arg8 __attribute__ ((unused)) = parm8; \ -STAP_LABEL(probe,__LINE__): \ - asm volatile ("nop" :: "X"(arg1), "X"(arg2), "X"(arg3), "X"(arg4), "X"(arg5), "X"(arg6), "X"(arg7), "X"(arg8)); \ - STAP_PROBE_STRUCT(probe,(size_t)&& STAP_LABEL(probe,__LINE__)) \ - STAP_LABEL_REF(probe);} - -#define STAP_PROBE9(provider,probe,parm1,parm2,parm3,parm4,parm5,parm6,parm7,parm8,parm9) \ - {volatile typeof((parm1)) arg1 __attribute__ ((unused)) = parm1; \ - volatile typeof((parm2)) arg2 __attribute__ ((unused)) = parm2; \ - volatile typeof((parm3)) arg3 __attribute__ ((unused)) = parm3; \ - volatile typeof((parm4)) arg4 __attribute__ ((unused)) = parm4; \ - volatile typeof((parm5)) arg5 __attribute__ ((unused)) = parm5; \ - volatile typeof((parm6)) arg6 __attribute__ ((unused)) = parm6; \ - volatile typeof((parm7)) arg7 __attribute__ ((unused)) = parm7; \ - volatile typeof((parm8)) arg8 __attribute__ ((unused)) = parm8; \ - volatile typeof((parm9)) arg9 __attribute__ ((unused)) = parm9; \ -STAP_LABEL(probe,__LINE__): \ - asm volatile ("nop" :: "X"(arg1), "X"(arg2), "X"(arg3), "X"(arg4), "X"(arg5), "X"(arg6), "X"(arg7), "X"(arg8), "X"(arg9)); \ - STAP_PROBE_STRUCT(probe,(size_t)&& STAP_LABEL(probe,__LINE__)) \ - STAP_LABEL_REF(probe);} + STAP_PROBE1_(probe,STAP_LABEL(STAP_LABEL_PREFIX(probe),STAP_COUNTER),(parm1)) +#define STAP_PROBE2(provider,probe,parm1,parm2) \ + STAP_PROBE2_(probe,STAP_LABEL(STAP_LABEL_PREFIX(probe),STAP_COUNTER),(parm1),(parm2)) +#define STAP_PROBE3(provider,probe,parm1,parm2,parm3) \ + STAP_PROBE3_(probe,STAP_LABEL(STAP_LABEL_PREFIX(probe),STAP_COUNTER),(parm1),(parm2),(parm3)) +#define STAP_PROBE4(provider,probe,parm1,parm2,parm3,parm4) \ + STAP_PROBE4_(probe,STAP_LABEL(STAP_LABEL_PREFIX(probe),STAP_COUNTER),(parm1),(parm2),(parm3),(parm4)) +#define STAP_PROBE5(provider,probe,parm1,parm2,parm3,parm4,parm5) \ + STAP_PROBE5_(probe,STAP_LABEL(STAP_LABEL_PREFIX(probe),STAP_COUNTER),(parm1),(parm2),(parm3),(parm4),(parm5)) +#define STAP_PROBE6(provider,probe,parm1,parm2,parm3,parm4,parm5,parm6) \ + STAP_PROBE6_(probe,STAP_LABEL(STAP_LABEL_PREFIX(probe),STAP_COUNTER),(parm1),(parm2),(parm3),(parm4),(parm5),(parm6)) +#define STAP_PROBE7(provider,probe,parm1,parm2,parm3,parm4,parm5,parm6,parm7) \ + STAP_PROBE7_(probe,STAP_LABEL(STAP_LABEL_PREFIX(probe),STAP_COUNTER),(parm1),(parm2),(parm3),(parm4),(parm5),(parm6),(parm7)) +#define STAP_PROBE8(provider,probe,parm1,parm2,parm3,parm4,parm5,parm6,parm7,parm8) \ + STAP_PROBE8_(probe,STAP_LABEL(STAP_LABEL_PREFIX(probe),STAP_COUNTER),(parm1),(parm2),(parm3),(parm4),(parm5),(parm6),(parm7),(parm8)) +#define STAP_PROBE9(provider,probe,parm1,parm2,parm3,parm4,parm5,parm6,parm7,parm8,parm9) \ + STAP_PROBE9_(probe,STAP_LABEL(STAP_LABEL_PREFIX(probe),STAP_COUNTER),(parm1),(parm2),(parm3),(parm4),(parm5),(parm6),(parm7),(parm8),(parm9)) +#define STAP_PROBE10(provider,probe,parm1,parm2,parm3,parm4,parm5,parm6,parm7,parm8,parm9,parm10) \ + STAP_PROBE10_(probe,STAP_LABEL(STAP_LABEL_PREFIX(probe),STAP_COUNTER),(parm1),(parm2),(parm3),(parm4),(parm5),(parm6),(parm7),(parm8),(parm9),(parm10)) #define DTRACE_PROBE(provider,probe) \ STAP_PROBE(provider,probe) @@ -169,5 +237,5 @@ STAP_PROBE7(provider,probe,parm1,parm2,parm3,parm4,parm5,parm6,parm7) STAP_PROBE8(provider,probe,parm1,parm2,parm3,parm4,parm5,parm6,parm7,parm8) #define DTRACE_PROBE9(provider,probe,parm1,parm2,parm3,parm4,parm5,parm6,parm7,parm8,parm9) \ STAP_PROBE9(provider,probe,parm1,parm2,parm3,parm4,parm5,parm6,parm7,parm8,parm9) - #endif /* sys/sdt.h */ + @@ -134,6 +134,8 @@ usage (systemtap_session& s, int exitcode) #endif // Formerly present --ignore-{vmlinux,dwarf} options are for testsuite use // only, and don't belong in the eyesight of a plain user. + << " --skip-badvars" << endl + << " overlook context of bad $ variables" << endl << endl ; @@ -187,13 +189,16 @@ printscript(systemtap_session& s, ostream& o) { o << pp; // Print the locals for -L mode only - if (s.unoptimized) + if (s.unoptimized) { for (unsigned j=0; j<p->locals.size(); j++) { o << " "; vardecl* v = p->locals[j]; v->printsig (o); } + // Print arguments of probe if there + p->printargs(o); + } o << endl; seen.insert (pp); } @@ -428,12 +433,14 @@ main (int argc, char * const argv []) #define LONG_OPT_IGNORE_VMLINUX 3 #define LONG_OPT_IGNORE_DWARF 4 #define LONG_OPT_VERBOSE_PASS 5 +#define LONG_OPT_SKIP_BADVARS 6 // NB: also see find_hash(), usage(), switch stmt below, stap.1 man page static struct option long_options[] = { { "kelf", 0, &long_opt, LONG_OPT_KELF }, { "kmap", 2, &long_opt, LONG_OPT_KMAP }, { "ignore-vmlinux", 0, &long_opt, LONG_OPT_IGNORE_VMLINUX }, { "ignore-dwarf", 0, &long_opt, LONG_OPT_IGNORE_DWARF }, + { "skip-badvars", 0, &long_opt, LONG_OPT_SKIP_BADVARS }, { "vp", 1, &long_opt, LONG_OPT_VERBOSE_PASS }, { NULL, 0, NULL, 0 } }; @@ -695,6 +702,9 @@ main (int argc, char * const argv []) // NB: we don't do this: s.last_pass = strlen(optarg); break; } + case LONG_OPT_SKIP_BADVARS: + s.skip_badvars = true; + break; default: cerr << "Internal error parsing command arguments." << endl; usage(s, 1); diff --git a/runtime/alloc.c b/runtime/alloc.c index 89d16612..439e8a7e 100644 --- a/runtime/alloc.c +++ b/runtime/alloc.c @@ -233,30 +233,14 @@ static void *_stp_vmalloc(unsigned long size) } -#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,15) static void *_stp_alloc_percpu(size_t size) { -#ifdef DEBUG_MEM +#ifdef STAPCONF_ALLOC_PERCPU_ALIGN void *ret = __alloc_percpu(size, 8); - if (likely(ret)) { - struct _stp_mem_entry *m = kmalloc(sizeof(struct _stp_mem_entry), STP_ALLOC_FLAGS); - if (unlikely(m == NULL)) { - free_percpu(ret); - return NULL; - } - _stp_mem_debug_percpu(m, ret, size); - _stp_allocated_memory += size * num_online_cpus(); - } - return ret; #else - return __alloc_percpu(size, 8); + void *ret = __alloc_percpu(size); #endif -} -#else -static void *_stp_alloc_percpu(size_t size) -{ #ifdef DEBUG_MEM - void *ret = __alloc_percpu(size); if (likely(ret)) { struct _stp_mem_entry *m = kmalloc(sizeof(struct _stp_mem_entry), STP_ALLOC_FLAGS); if (unlikely(m == NULL)) { @@ -266,12 +250,9 @@ static void *_stp_alloc_percpu(size_t size) _stp_mem_debug_percpu(m, ret, size); _stp_allocated_memory += size * num_online_cpus(); } - return ret; -#else - return __alloc_percpu(size); #endif + return ret; } -#endif /* LINUX_VERSION_CODE */ #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,12) #define _stp_kmalloc_node(size,node) _stp_kmalloc(size) diff --git a/runtime/autoconf-alloc-percpu-align.c b/runtime/autoconf-alloc-percpu-align.c new file mode 100644 index 00000000..158d579c --- /dev/null +++ b/runtime/autoconf-alloc-percpu-align.c @@ -0,0 +1,6 @@ +#include <linux/percpu.h> + +/* kernel commit f2a8205c */ +void foo (void) { + (void) __alloc_percpu(sizeof(int), 8); +} diff --git a/runtime/autoconf-save-stack-trace.c b/runtime/autoconf-save-stack-trace.c new file mode 100644 index 00000000..39ded684 --- /dev/null +++ b/runtime/autoconf-save-stack-trace.c @@ -0,0 +1,22 @@ +#include <linux/string.h> +#include <linux/sched.h> +#include <linux/stacktrace.h> +#include <asm/stacktrace.h> + +void foo(struct task_struct *foo) +{ + struct stack_trace trace; + unsigned long backtrace[20]; + memset(&trace, 0, sizeof(trace)); + trace.entries = &backtrace[0]; + trace.max_entries = 20; + trace.skip = 0; + save_stack_trace_tsk(tsk, &trace); +} + +static const struct stacktrace_ops print_stack_ops; + +void dumper(struct task_struct *foo) +{ + dump_trace(foo, 0, 0, 0, &print_stack_ops, 0); +} diff --git a/runtime/itrace.c b/runtime/itrace.c index df18a400..ed32b0bc 100644 --- a/runtime/itrace.c +++ b/runtime/itrace.c @@ -1,6 +1,6 @@ /* * user space instruction tracing - * Copyright (C) 2005, 2006, 2007, 2008 IBM Corp. + * Copyright (C) 2005, 2006, 2007, 2008, 2009 IBM Corp. * * This file is part of systemtap, and is free software. You can * redistribute it and/or modify it under the terms of the GNU General @@ -18,8 +18,6 @@ #include <linux/rcupdate.h> #include <linux/utrace.h> #include <asm/string.h> -#include <asm/tracehook.h> -#include <asm/ptrace.h> #include "uprobes/uprobes.h" #ifndef put_task_struct @@ -65,10 +63,81 @@ static struct itrace_info *create_itrace_info( struct task_struct *tsk, u32 step_flag, struct stap_itrace_probe *itrace_probe); -static u32 usr_itrace_report_signal(struct utrace_attached_engine *engine, +/* + * The kernel's access_process_vm is not exported in kernel.org kernels, although + * some distros export it on some architectures. To workaround this inconsistency, + * we copied and pasted it here. Fortunately, everything it calls is exported. + */ +#include <linux/pagemap.h> +#include <asm/cacheflush.h> +static int __access_process_vm(struct task_struct *tsk, unsigned long addr, void *buf, int len, int write) +{ + struct mm_struct *mm; + struct vm_area_struct *vma; + struct page *page; + void *old_buf = buf; + + mm = get_task_mm(tsk); + if (!mm) + return 0; + + down_read(&mm->mmap_sem); + /* ignore errors, just check how much was sucessfully transfered */ + while (len) { + int bytes, ret, offset; + void *maddr; + + ret = get_user_pages(tsk, mm, addr, 1, + write, 1, &page, &vma); + if (ret <= 0) + break; + + bytes = len; + offset = addr & (PAGE_SIZE-1); + if (bytes > PAGE_SIZE-offset) + bytes = PAGE_SIZE-offset; + + maddr = kmap(page); + if (write) { + copy_to_user_page(vma, page, addr, + maddr + offset, buf, bytes); + set_page_dirty_lock(page); + } else { + copy_from_user_page(vma, page, addr, + buf, maddr + offset, bytes); + } + kunmap(page); + page_cache_release(page); + len -= bytes; + buf += bytes; + addr += bytes; + } + up_read(&mm->mmap_sem); + mmput(mm); + + return buf - old_buf; +} + +static u32 usr_itrace_report_quiesce(enum utrace_resume_action action, + struct utrace_attached_engine *engine, + struct task_struct *tsk, + unsigned long event) +{ + int status; + struct itrace_info *ui; + + ui = rcu_dereference(engine->data); + WARN_ON(!ui); + + return (event == 0 ? ui->step_flag : UTRACE_RESUME); +} + + +static u32 usr_itrace_report_signal(u32 action, + struct utrace_attached_engine *engine, struct task_struct *tsk, struct pt_regs *regs, - u32 action, siginfo_t *info, + siginfo_t *info, const struct k_sigaction *orig_ka, struct k_sigaction *return_ka) { @@ -83,12 +152,10 @@ static u32 usr_itrace_report_signal(struct utrace_attached_engine *engine, WARN_ON(!ui); if (info->si_signo != SIGTRAP || !ui) - return UTRACE_ACTION_RESUME; - - /* normal case: continue stepping, hide this trap from other engines */ - return_flags = ui->step_flag | UTRACE_ACTION_HIDE | UTRACE_SIGNAL_IGN | - UTRACE_ACTION_NEWSTATE; + return UTRACE_RESUME; + /* normal case: continue stepping */ + return_flags = ui->step_flag | UTRACE_SIGNAL_IGN; #ifdef CONFIG_PPC if (ui->ppc_atomic_ss.step_over_atomic) { remove_atomic_ss_breakpoint(tsk, &ui->ppc_atomic_ss.end_bpt); @@ -99,8 +166,7 @@ static u32 usr_itrace_report_signal(struct utrace_attached_engine *engine, } if (handle_ppc_atomic_seq(tsk, regs, &ui->ppc_atomic_ss)) - return_flags = UTRACE_ACTION_RESUME | UTRACE_ACTION_NEWSTATE | - UTRACE_SIGNAL_IGN; + return_flags = UTRACE_RESUME | UTRACE_SIGNAL_IGN; #endif enter_itrace_probe(ui->itrace_probe, regs, (void *)&data); @@ -108,24 +174,26 @@ static u32 usr_itrace_report_signal(struct utrace_attached_engine *engine, return return_flags; } -static u32 usr_itrace_report_clone(struct utrace_attached_engine *engine, +static u32 usr_itrace_report_clone(enum utrace_resume_action action, + struct utrace_attached_engine *engine, struct task_struct *parent, unsigned long clone_flags, struct task_struct *child) { - return UTRACE_ACTION_RESUME; + return UTRACE_RESUME; } static u32 usr_itrace_report_death(struct utrace_attached_engine *e, - struct task_struct *tsk) + struct task_struct *tsk, bool group_dead, int signal) { struct itrace_info *ui = rcu_dereference(e->data); WARN_ON(!ui); - return (UTRACE_ACTION_NEWSTATE | UTRACE_ACTION_DETACH); + return (UTRACE_DETACH); } static const struct utrace_engine_ops utrace_ops = { + .report_quiesce = usr_itrace_report_quiesce, .report_signal = usr_itrace_report_signal, .report_clone = usr_itrace_report_clone, .report_death = usr_itrace_report_death @@ -137,6 +205,7 @@ static struct itrace_info *create_itrace_info( struct stap_itrace_probe *itrace_probe) { struct itrace_info *ui; + int status; if (debug) printk(KERN_INFO "create_itrace_info: tid=%d\n", tsk->pid); @@ -154,20 +223,34 @@ static struct itrace_info *create_itrace_info( /* push ui onto usr_itrace_info */ spin_lock(&itrace_lock); list_add(&ui->link, &usr_itrace_info); + spin_unlock(&itrace_lock); /* attach a single stepping engine */ - ui->engine = utrace_attach(ui->tsk, UTRACE_ATTACH_CREATE, &utrace_ops, ui); + ui->engine = utrace_attach_task(ui->tsk, UTRACE_ATTACH_CREATE, &utrace_ops, ui); if (IS_ERR(ui->engine)) { printk(KERN_ERR "utrace_attach returns %ld\n", PTR_ERR(ui->engine)); - ui = NULL; - } else { - utrace_set_flags(tsk, ui->engine, ui->engine->flags | - ui->step_flag | - UTRACE_EVENT(CLONE) | UTRACE_EVENT_SIGNAL_ALL | - UTRACE_EVENT(DEATH)); + return NULL; } - spin_unlock(&itrace_lock); + status = utrace_set_events(tsk, ui->engine, ui->engine->flags | + UTRACE_EVENT(QUIESCE) | + UTRACE_EVENT(CLONE) | UTRACE_EVENT_SIGNAL_ALL | + UTRACE_EVENT(DEATH)); + if (status < 0) { + printk(KERN_ERR "utrace_attach returns %d\n", status); + return NULL; + } + + status = utrace_control(tsk, ui->engine, UTRACE_STOP); + if (status == 0) { + status = utrace_control(tsk, ui->engine, step_flag); + if (status < 0) { + printk(KERN_ERR "utrace_control(%d) returns %d\n", + step_flag, status); + return NULL; + } + } + return ui; } @@ -193,7 +276,7 @@ static int usr_itrace_init(int single_step, pid_t tid, struct stap_itrace_probe struct task_struct *tsk; rcu_read_lock(); - tsk = find_task_by_pid(tid); + tsk = find_task_by_vpid(tid); if (!tsk) { printk(KERN_ERR "usr_itrace_init: Cannot find process %d\n", tid); rcu_read_unlock(); @@ -203,7 +286,7 @@ static int usr_itrace_init(int single_step, pid_t tid, struct stap_itrace_probe get_task_struct(tsk); ui = create_itrace_info(tsk, (single_step ? - UTRACE_ACTION_SINGLESTEP : UTRACE_ACTION_BLOCKSTEP), p); + UTRACE_SINGLESTEP : UTRACE_BLOCKSTEP), p); if (!ui) return 1; @@ -223,6 +306,7 @@ static int usr_itrace_init(int single_step, pid_t tid, struct stap_itrace_probe void static remove_usr_itrace_info(struct itrace_info *ui) { struct itrace_info *tmp; + int status; if (!ui) return; @@ -232,7 +316,11 @@ void static remove_usr_itrace_info(struct itrace_info *ui) spin_lock(&itrace_lock); if (ui->tsk && ui->engine) { - (void) utrace_detach(ui->tsk, ui->engine); + status = utrace_control(ui->tsk, ui->engine, UTRACE_DETACH); + if (status < 0 && status != -ESRCH && status != -EALREADY) + printk(KERN_ERR + "utrace_control(UTRACE_DETACH) returns %d\n", + status); } list_del(&ui->link); spin_unlock(&itrace_lock); @@ -292,7 +380,7 @@ static void insert_atomic_ss_breakpoint (struct task_struct *tsk, cur_instr = get_instr(bpt->addr, "insert_atomic_ss_breakpoint"); if (cur_instr != BPT_TRAP) { bpt->instr = cur_instr; - WARN_ON(access_process_vm(tsk, bpt->addr, &bp_instr, INSTR_SZ, 1) != + WARN_ON(__access_process_vm(tsk, bpt->addr, &bp_instr, INSTR_SZ, 1) != INSTR_SZ); } } @@ -300,7 +388,7 @@ static void insert_atomic_ss_breakpoint (struct task_struct *tsk, static void remove_atomic_ss_breakpoint (struct task_struct *tsk, struct bpt_info *bpt) { - WARN_ON(access_process_vm(tsk, bpt->addr, &bpt->instr, INSTR_SZ, 1) != + WARN_ON(__access_process_vm(tsk, bpt->addr, &bpt->instr, INSTR_SZ, 1) != INSTR_SZ); } diff --git a/runtime/sduprobes.c b/runtime/sduprobes.c deleted file mode 100644 index 83bc8e72..00000000 --- a/runtime/sduprobes.c +++ /dev/null @@ -1,61 +0,0 @@ -// Copyright (C) 2005-2008 Red Hat Inc. -// Copyright (C) 2006 Intel Corporation. -// -// This file is part of systemtap, and is free software. You can -// redistribute it and/or modify it under the terms of the GNU General -// Public License (GPL); either version 2, or (at your option) any -// later version. - -#include <stddef.h> -#define unused __attribute__ ((unused)) - -int -_stap_probe_0 (char* probe unused) -{ - return 1; -} - -int -_stap_probe_1 (char* probe unused, - size_t arg1 unused) -{ - return 1; -} - -int -_stap_probe_2 (char* probe unused , - size_t arg1 unused, - size_t arg2 unused) -{ - return 1; -} - -int -_stap_probe_3 (char* probe unused, - size_t arg1 unused, - size_t arg2 unused, - size_t arg3 unused) -{ - return 1; -} - -int -_stap_probe_4 (char* probe unused, - size_t arg1 unused, - size_t arg2 unused, - size_t arg3 unused, - size_t arg4 unused) -{ - return 1; -} - -int -_stap_probe_5 (char* probe unused, - size_t arg1 unused, - size_t arg2 unused, - size_t arg3 unused, - size_t arg4 unused, - size_t arg5 unused) -{ - return 1; -} diff --git a/runtime/stack-i386.c b/runtime/stack-i386.c index 206801d8..5a18c9d8 100644 --- a/runtime/stack-i386.c +++ b/runtime/stack-i386.c @@ -14,7 +14,7 @@ static int _stp_valid_stack_ptr(unsigned long context, unsigned long p) } /* DWARF unwinder failed. Just dump intereting addresses on kernel stack. */ -#if ! (defined(CONFIG_STACKTRACE) && LINUX_VERSION_CODE > KERNEL_VERSION(2,6,26)) +#if !defined(STAPCONF_KERNEL_STACKTRACE) static void _stp_stack_print_fallback(unsigned long stack, int verbose, int levels) { unsigned long addr; diff --git a/runtime/stack-x86_64.c b/runtime/stack-x86_64.c index 183de0a0..03d88ef0 100644 --- a/runtime/stack-x86_64.c +++ b/runtime/stack-x86_64.c @@ -10,7 +10,7 @@ /* DWARF unwinder failed. Just dump intereting addresses on kernel stack. */ -#if ! (defined(CONFIG_STACKTRACE) && LINUX_VERSION_CODE > KERNEL_VERSION(2,6,26)) +#if !defined(STAPCONF_KERNEL_STACKTRACE) static void _stp_stack_print_fallback(unsigned long stack, int verbose, int levels) { unsigned long addr; diff --git a/runtime/stack.c b/runtime/stack.c index aa0e6d65..f6b1cd08 100644 --- a/runtime/stack.c +++ b/runtime/stack.c @@ -27,8 +27,7 @@ #define MAXBACKTRACE 20 -#if defined(CONFIG_STACKTRACE) && LINUX_VERSION_CODE > KERNEL_VERSION(2,6,26) -// XXX: PR9866: hacky temporarily restriction to recent kernels +#if defined(STAPCONF_KERNEL_STACKTRACE) #include <linux/stacktrace.h> #include <asm/stacktrace.h> #endif @@ -51,7 +50,7 @@ static void _stp_stack_print_fallback(unsigned long, int, int); #error "Unsupported architecture" #endif -#if defined(CONFIG_STACKTRACE) && LINUX_VERSION_CODE > KERNEL_VERSION(2,6,26) +#if defined(STAPCONF_KERNEL_STACKTRACE) struct print_stack_data { @@ -161,7 +160,7 @@ static void _stp_ustack_print(char *str) void _stp_stack_print_tsk(struct task_struct *tsk, int verbose, int levels) { -#if defined(CONFIG_STACKTRACE) && LINUX_VERSION_CODE > KERNEL_VERSION(2,6,26) +#if defined(STAPCONF_KERNEL_STACKTRACE) int i; unsigned long backtrace[MAXBACKTRACE]; struct stack_trace trace; @@ -37,6 +37,7 @@ struct task_finder_derived_probe_group; struct timer_derived_probe_group; struct profile_derived_probe_group; struct mark_derived_probe_group; +struct tracepoint_derived_probe_group; struct hrtimer_derived_probe_group; struct perfmon_derived_probe_group; struct procfs_derived_probe_group; @@ -122,6 +123,9 @@ struct systemtap_session bool ignore_vmlinux; bool ignore_dwarf; + // Skip bad $ vars + bool skip_badvars; + // temporary directory for module builds etc. // hazardous - it is "rm -rf"'d at exit std::string tmpdir; @@ -162,9 +166,12 @@ struct systemtap_session timer_derived_probe_group* timer_derived_probes; profile_derived_probe_group* profile_derived_probes; mark_derived_probe_group* mark_derived_probes; + tracepoint_derived_probe_group* tracepoint_derived_probes; hrtimer_derived_probe_group* hrtimer_derived_probes; perfmon_derived_probe_group* perfmon_derived_probes; procfs_derived_probe_group* procfs_derived_probes; + // NB: It is very important for all of the above (and below) fields + // to be cleared in the systemtap_session ctor (elaborate.cxx). // unparser data translator_output* op; diff --git a/stap-find-servers b/stap-find-servers index 3038c54e..fde7d9ef 100755 --- a/stap-find-servers +++ b/stap-find-servers @@ -2,7 +2,7 @@ # Find compile servers for systemtap # -# Copyright (C) 2008 Red Hat Inc. +# Copyright (C) 2008, 2009 Red Hat Inc. # # This file is part of systemtap, and is free software. You can # redistribute it and/or modify it under the terms of the GNU General @@ -18,6 +18,7 @@ # function: configuration function configuration { avahi_service_tag=_stap._tcp + timeout=10 # seconds } # function: initialization @@ -30,13 +31,32 @@ function initialization { fi } -# function: find_and_connect_to_server +# function: find_servers # -# Find and establish connection with a compatibale stap server. +# Find and establish connection with a compatible stap server. function find_servers { - # Find a server - avahi-browse $avahi_service_tag --terminate -r 2>/dev/null | match_server - rc=$? + # Create a temp file for the list of servers. We do this instead + # of using a pipe so that we can kill avahi-browse if it + # takes more than a minute. + tmpfile=`mktemp -t stap-serversXXXXXX` || \ + fatal "Cannot create temporary file " $tmpfile + + # Find servers + avahi-browse $avahi_service_tag --terminate -r 2>/dev/null > $tmpfile & + + for ((attempt=0; $attempt < $timeout; ++attempt)) + do + if ! jobs '%avahi-browse' >/dev/null 2>&1; then + break + fi + sleep 1 + done + + # Kill avahi-browse, if it's still running + test $attempt = $timeout && kill -s SIGTERM '%avahi-browse' 2>/dev/null + + match_server < $tmpfile + rm -fr $tmpfile } # function: match_server @@ -47,10 +67,11 @@ function match_server { local server_name local server_sysinfo local server_port - local rc=1 # not found yet + + rc=1 # not found yet # Loop over the avahi service descriptors. - read || exit $rc + read -t $timeout || return while test "X$REPLY" != "X" do server_name= @@ -61,14 +82,14 @@ function match_server { # Examine the next service descriptor # Is it a stap server? if ! echo $REPLY | grep -q "=.* .* IPv4 .*_stap"; then - read || exit $rc + read -t $timeout || return continue fi REPLY= # Get the details of the service local service_tag equal service_data - while read service_tag equal service_data + while read -t $timeout service_tag equal service_data do case $service_tag in hostname ) @@ -113,8 +134,6 @@ function match_server { echo "$server_name $server_ip $server_port '$server_sysinfo'" rc=0 done - - exit $rc } # function client_sysinfo @@ -128,6 +147,15 @@ function client_sysinfo { echo sysinfo=$sysinfo_client } +# function: fatal [ MESSAGE ] +# +# Fatal error +# Prints its arguments to stderr and exits +function fatal { + echo "$0: ERROR:" "$@" >&2 + exit 1 +} + #----------------------------------------------------------------------------- # Beginning of main line execution. #----------------------------------------------------------------------------- diff --git a/stap-report b/stap-report index 8551dc74..944609cf 100755 --- a/stap-report +++ b/stap-report @@ -1,26 +1,21 @@ -#!/usr/bin/python +#! /bin/sh -import sys -import time -import subprocess +run(){ + echo "== $1 ==" + sh -c "$@" +} -ofile = sys.stdout - -def run(command): - ofile.write("== " + command + " ==\n") - ofile.flush() - p = subprocess.Popen(command, shell=True, stdout=ofile, stderr=ofile) - p.wait() - ofile.write("\n") - -if __name__ == "__main__": - run("stap -V") - run("which stap") - run("ls -ald `locate -r '/stap$'` `locate -r '/staprun$'`") - run("printenv | egrep '^PATH=|^LD_LIBRARY_PATH=|^SYSTEMTAP_.*='") - run("gcc -v") - run("uname -a") - run("dmesg | egrep 'stap|systemtap' | tail -n 10") - run("cat /proc/cpuinfo | egrep 'processor|vendor_id|model name'") - run(r"rpm -qa --qf %{name}-%{version}-%{release}.%{arch}\\n | egrep 'systemtap|elfutils|kernel|gcc' | sort") - run(r"egrep 'PROBE|TRACE|MARKER|_DEBUG_' /lib/modules/`uname -r`/build/.config | grep -v not.set | sort | fmt -w 80") +run "stap -V" +run "which stap" +run "locate --regex '/stap(run)?$' | xargs ls -ald" +run "printenv | egrep '^PATH=|^LD_LIBRARY_PATH=|^SYSTEMTAP_.*='" +run "gcc -v" +run "uname -a" +run "dmesg | egrep 'stap|systemtap' | tail -n 10" +run "cat /proc/cpuinfo | egrep 'processor|vendor_id|model name'" +if [ -x /usr/bin/dpkg ]; then + run "dpkg --list | egrep 'systemtap|elfutils|kernel|gcc' | awk '{print \$2,\$3}' | sort" +else + run "rpm -qa --qf '%{name}-%{version} %{release}.%{arch}\\n' | egrep 'systemtap|elfutils|kernel|gcc' | sort" +fi +run "egrep 'PROBE|TRACE|MARKER|_DEBUG_' /lib/modules/`uname -r`/build/.config | grep -v not.set | sort | fmt -w 80" diff --git a/stap-start-server b/stap-start-server index f1f02d2f..d718ed30 100755 --- a/stap-start-server +++ b/stap-start-server @@ -25,17 +25,20 @@ server_pid=$! # Make sure the server is started for ((attempt=0; $attempt < 10; ++attempt)) do - if test $EUID = 0; then - if ! test -f $sysconfdir/systemtap/ssl/server/stap-server.cert; then - sleep 1 - continue; - fi - elif ! test -f $HOME/.systemtap/ssl/server/stap-server.cert; then + # Has the server started? + if ! (ps -a | grep $server_pid) >/dev/null 2>&1; then sleep 1 continue fi - (ps -a | grep $server_pid) >/dev/null 2>&1 && echo $server_pid && exit 0 - sleep 1 + # Is avahi advertizing the server? + if ! (ps -fa | grep avahi-publish-service | grep $server_pid) > /dev/null 2>&1; then + sleep 1 + continue + fi + + # The server is ready + echo $server_pid + exit 0 done exit 1 # server did not start @@ -230,6 +230,9 @@ nor the kernel debugging information can be found. .TP .B \-\-ignore\-dwarf For testing, act as though vmlinux and modules lack debugging information. +.TP +.B \-\-skip\-badvars +Ignore out of context variables and substitute with literal 0. .SH ARGUMENTS @@ -1039,10 +1042,10 @@ Maximum number of soft errors before an exit is triggered, default 0, which means that the first error will exit the script. .TP MAXSKIPPED -.TP Maximum number of skipped probes before an exit is triggered, default 100. Running systemtap with \-t (timing) mode gives more details about skipped probes. +.TP MINSTACKSPACE Minimum number of free kernel stack bytes required in order to run a probe handler, default 1024. This number should be large enough @@ -1053,8 +1056,20 @@ Maximum number of concurrently armed user-space probes (uprobes), default 100 times the number of user-space probe points named in the script. This pool is large because individual uprobe objects are allocated for each process for each script-level probe. + .PP -Multipule scripts can write data into a relay buffer concurrently. A host +With scripts that contain probes on any interrupt path, it is possible that +those interrupts may occur in the middle of another probe handler. The probe +in the interrupt handler would be skipped in this case to avoid reentrance. +To work around this issue, execute stap with the option +.BR \-DINTERRUPTIBLE=0 +to mask interrupts throughout the probe handler. This does add some extra +overhead to the probes, but it may prevent reentrance for common problem +cases. However, probes in NMI handlers and in the callpath of the stap +runtime may still be skipped due to reentrance. + +.PP +Multiple scripts can write data into a relay buffer concurrently. A host script provides an interface for accessing its relay buffer to guest scripts. Then, the output of the guests are merged into the output of the host. To run a script as a host, execute stap with @@ -1096,16 +1111,16 @@ using symbols read from vmlinux and/or the modules in /lib/modules. Systemtap can also read the kernel symbol table from a text file such as /boot/System.map or /proc/kallsyms. See the -.B \-\--kelf +.B \-\-kelf and -.B \-\--kmap +.B \-\-kmap options. .PP If systemtap finds relevant debugging information, it will use it even if you specify -.B \-\--kelf +.B \-\-kelf or -.BR \-\--kmap . +.BR \-\-kmap . .PP Without debugging information, systemtap cannot support the following types of language constructs: diff --git a/stapprobes.5.in b/stapprobes.5.in index 0854be53..70d045c4 100644 --- a/stapprobes.5.in +++ b/stapprobes.5.in @@ -548,6 +548,42 @@ The marker format string associated with a marker is available in And also the marker name string is avalable in .BR $name . +.SS TRACEPOINTS + +This family of probe points hooks up to static probing tracepoints +inserted into the kernel or modules. As with markers, these +tracepoints are special macro calls inserted by kernel developers to +make probing faster and more reliable than with DWARF-based probes, +and DWARF debugging information is not required to probe tracepoints. +Tracepoints have an extra advantage of more strongly-typed parameters +than markers. + +Tracepoint probes begin with +.BR kernel . +The next part names the tracepoint itself: +.BR trace("name") . +The tracepoint name string, which may contain the usual wildcard +characters, is matched against the names defined by the kernel +developers in the tracepoint header files. + +The handler associated with a tracepoint-based probe may read the +optional parameters specified at the macro call site. These are +named according to the declaration by the tracepoint author. For +example, the tracepoint probe +.BR kernel.trace("sched_switch") +provides the parameters +.BR $rq ", " $prev ", and " $next . +If the parameter is a complex type, as in a struct pointer, then a +script can access fields with the same syntax as DWARF $target +variables. Also, tracepoint parameters cannot be modified, but in +guru-mode a script may modify fields of parameters. + +The name of the tracepoint is available in +.BR $$name , +and a string of name=value pairs for all parameters of the tracepoint +is available in +.BR $$vars " or " $$parms . + .SS PERFORMANCE MONITORING HARDWARE The perfmon family of probe points is used to access the performance diff --git a/tapset/aux_syscalls.stp b/tapset/aux_syscalls.stp index 42b2abf8..d2e43903 100644 --- a/tapset/aux_syscalls.stp +++ b/tapset/aux_syscalls.stp @@ -1790,6 +1790,7 @@ function _struct_sigaction_u:string(uaddr:long) function _struct_sigaction32_u:string(uaddr:long) %{ /* pure */ +#ifdef CONFIG_COMPAT #include <linux/compat.h> // There seems to be no public cross arch header that defines this. @@ -1831,4 +1832,5 @@ function _struct_sigaction32_u:string(uaddr:long) else strlcpy (THIS->__retvalue, "UNKNOWN", MAXSTRINGLEN); } +#endif %} diff --git a/tapset/context-symbols.stp b/tapset/context-symbols.stp index 79645f4f..46eab841 100644 --- a/tapset/context-symbols.stp +++ b/tapset/context-symbols.stp @@ -12,14 +12,14 @@ #define STP_NEED_SYMBOL_DATA 1 #endif %} - +// weirdness with print_stack, argument appears in build as undescribed /** * sfunction print_stack - Print out stack from string * @stk: String with list of hexidecimal addresses. (FIXME) * * Perform a symbolic lookup of the addresses in the given string, * which is assumed to be the result of a prior call to - * backtrace(). + * <command>backtrace()</command>. * Print one line per address, including the address, the * name of the function containing the address, and an estimate of * its position within that function. Return nothing. diff --git a/tapset/i686/registers.stp b/tapset/i686/registers.stp index b9eaba5b..a6e5694e 100644 --- a/tapset/i686/registers.stp +++ b/tapset/i686/registers.stp @@ -26,6 +26,16 @@ function _stp_register_regs() { function _stp_get_register_by_offset:long (offset:long) %{ /* pure */ long value; + if (!CONTEXT->regs) { + CONTEXT->last_error = "No registers available in this context"; + return; + } + if (THIS->offset < 0 || THIS->offset > sizeof(struct pt_regs) - sizeof(long)) { + snprintf(CONTEXT->error_buffer, sizeof(CONTEXT->error_buffer), + "Bad register offset: %lld", THIS->offset); + CONTEXT->last_error = CONTEXT->error_buffer; + return; + } memcpy(&value, ((char *)CONTEXT->regs) + THIS->offset, sizeof(value)); THIS->__retvalue = value; %} diff --git a/tapset/inet_sock.stp b/tapset/inet_sock.stp index 59ce7fea..33de9775 100644 --- a/tapset/inet_sock.stp +++ b/tapset/inet_sock.stp @@ -1,42 +1,42 @@ // inet_sock information tapset // Copyright (C) 2006 IBM Corp. // Copyright (C) 2006 Intel Corporation. +// Copyright (C) 2009 Red Hat, Inc. // // This file is part of systemtap, and is free software. You can // redistribute it and/or modify it under the terms of the GNU General // Public License (GPL); either version 2, or (at your option) any // later version. -%{ -#include <linux/version.h> -#include <net/sock.h> -#include <net/tcp.h> -#include <net/ip.h> - -#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,11) -#define LPORT (inet->inet.num) -#define DADDR (&inet->inet.daddr) -#else -#define LPORT (inet->num) -#define DADDR (&inet->daddr) -#endif -%} - -// Get local port number +// Get local port number given a pointer to a kernel socket, +// as for example kernel.function("tcp_accept").return will +// return. function inet_get_local_port:long(sock:long) -%{ /* pure */ - struct inet_sock *inet = (struct inet_sock *) (long) THIS->sock; - THIS->__retvalue = kread(&(LPORT)); - CATCH_DEREF_FAULT(); -%} +{ +%(kernel_v < "2.6.11" %? + port = @cast(sock, "inet_sock", "kernel")->inet->num; +%: + port = @cast(sock, "inet_sock", "kernel")->num; +%) + return port; +} -// Get IP source address string +// Get IP source address string given a pointer to a kernel socket. function inet_get_ip_source:string(sock:long) +{ +%(kernel_v < "2.6.11" %? + daddr = @cast(sock, "inet_sock", "kernel")->inet->daddr; +%: + daddr = @cast(sock, "inet_sock", "kernel")->daddr; +%) + return daddr_to_string(daddr); +} + +// Turns a daddr as found in an inet_sock into a dotted ip string. +function daddr_to_string:string(daddr:long) %{ /* pure */ - struct inet_sock *inet = (struct inet_sock *) (long) THIS->sock; union { __u32 d; unsigned char addr[4]; } u; - u.d = kread(DADDR); + u.d = THIS->daddr; sprintf(THIS->__retvalue, "%d.%d.%d.%d", u.addr[0], u.addr[1], u.addr[2], u.addr[3]); - CATCH_DEREF_FAULT(); %} diff --git a/tapset/networking.stp b/tapset/networking.stp index d6e90259..a147441a 100644 --- a/tapset/networking.stp +++ b/tapset/networking.stp @@ -6,10 +6,6 @@ // Public License (GPL); either version 2, or (at your option) any // later version. -%{ -#include <linux/netdevice.h> -%} - /** * probe netdev.receive - Data recieved from network device. * @dev_name: The name of the device. e.g: eth0, ath1. diff --git a/tapset/nfs.stp b/tapset/nfs.stp index 474b091f..6752747f 100644 --- a/tapset/nfs.stp +++ b/tapset/nfs.stp @@ -135,69 +135,50 @@ function __nfs_wpages:long(inode:long) %{ /* pure */ %} /*Get struct inode from struct page*/ -function __p2i :long(page:long) %{ /* pure */ - struct page *page = (struct page *)((long)THIS->page); - struct address_space *mapping = page? kread(&(page->mapping)) : NULL; - - if (mapping == NULL) - THIS->__retvalue = 0; - else - THIS->__retvalue = (long)kread(&(mapping->host)); - CATCH_DEREF_FAULT(); -%} +function __p2i :long(page:long) +{ + mapping = page? @cast(page, "page", "kernel:nfs")->mapping : 0 + if (mapping == 0) + return 0 + return @cast(mapping, "address_space", "kernel:nfs")->host +} /*Get i_flags from struct page*/ -function __p2i_flag : long (page:long) %{ /* pure */ - struct page *page = (struct page *)((long)THIS->page); - struct address_space *mapping = page? kread(&(page->mapping)) : NULL; - struct inode *host = mapping? kread(&(mapping->host)) : NULL; - - if (host == NULL) - THIS->__retvalue = -1; - else - THIS->__retvalue = kread(&(host->i_flags)); - CATCH_DEREF_FAULT(); -%} +function __p2i_flag : long (page:long) +{ + host = __p2i(page) + if (host == 0) + return -1 + return @cast(host, "inode", "kernel:nfs")->i_flags +} /*Get i_state from struct page*/ -function __p2i_state :long (page:long) %{ /* pure */ - struct page *page = (struct page *)((long)THIS->page); - struct address_space *mapping = page? kread(&(page->mapping)) : NULL; - struct inode *host = mapping? kread(&(mapping->host)) : NULL; - - if (host == NULL) - THIS->__retvalue = -1; - else - THIS->__retvalue = kread(&(host->i_state)); - CATCH_DEREF_FAULT(); -%} +function __p2i_state :long (page:long) +{ + host = __p2i(page) + if (host == 0) + return -1 + return @cast(host, "inode", "kernel:nfs")->i_state +} /*Get i_size from struct page*/ -function __p2i_size :long (page:long) %{ /* pure */ - struct page *page = (struct page *)((long)THIS->page); - struct address_space *mapping = page? kread(&(page->mapping)) : NULL; - struct inode *host = mapping? kread(&(mapping->host)) : NULL; - - if (host == NULL) - THIS->__retvalue = -1; - else - THIS->__retvalue = kread(&(host->i_size)); - CATCH_DEREF_FAULT(); -%} +function __p2i_size :long (page:long) +{ + host = __p2i(page) + if (host == 0) + return -1 + return @cast(host, "inode", "kernel:nfs")->i_size +} /*Get s_flags from struct page*/ -function __p2sb_flag:long (page:long) %{ /* pure */ - struct page *page = (struct page *)((long)THIS->page); - struct address_space *mapping = page? kread(&(page->mapping)) : NULL; - struct inode *host = mapping? kread(&(mapping->host)) : NULL; - struct super_block *i_sb = host? kread(&(host->i_sb)) : NULL; - - if (i_sb == NULL) - THIS->__retvalue = -1; - else - THIS->__retvalue = kread(&(i_sb->s_flags)); - CATCH_DEREF_FAULT(); -%} +function __p2sb_flag:long (page:long) +{ + host = __p2i(page) + i_sb = host? @cast(host, "inode", "kernel:nfs")->i_sb : 0 + if (i_sb == 0) + return -1 + return @cast(i_sb, "super_block", "kernel:nfs")->s_flags +} function __d_loff_t :long (ppos :long) %{ /* pure */ loff_t * ppos = (loff_t *) ((long)THIS->ppos); @@ -209,53 +190,47 @@ function __d_loff_t :long (ppos :long) %{ /* pure */ CATCH_DEREF_FAULT(); %} -function __file_inode:long (file:long) %{ /* pure */ - struct file *file = (struct file *)(long)THIS->file; - struct dentry *dentry = file? kread(&(file->f_dentry)) : NULL; - if (dentry == NULL) - THIS->__retvalue = 0; - else - THIS->__retvalue = (long)kread(&(dentry->d_inode)); - CATCH_DEREF_FAULT(); -%} +function __file_inode:long (file:long) +{ +%( kernel_v >= "2.6.20" %? + dentry = file? @cast(file, "file", "kernel:nfs")->f_path->dentry : 0 +%: + dentry = file? @cast(file, "file", "kernel:nfs")->f_dentry : 0 +%) + if (dentry == 0) + return 0 + return @cast(dentry, "dentry", "kernel:nfs")->d_inode +} -function __file_id:long (file:long) %{ /* pure */ - struct file *file = (struct file *)(long)THIS->file; - struct dentry *dentry = file? kread(&(file->f_dentry)) : NULL; - if (dentry == NULL) - THIS->__retvalue = 0; - else { - struct inode *d_inode = kread(&(dentry->d_inode)); - struct super_block *i_sb = kread(&(d_inode->i_sb)); - THIS->__retvalue = (long)&(i_sb->s_id); - } - CATCH_DEREF_FAULT(); -%} +function __file_id:long (file:long) +{ + d_inode = __file_inode(file) + if (d_inode == 0) + return 0 + return @cast(d_inode, "inode", "kernel:nfs")->i_sb->s_id +} -function __file_mode:long (file:long) %{ /* pure */ - struct file *file = (struct file *)(long)THIS->file; - struct dentry *dentry = file? kread(&(file->f_dentry)) : NULL; - if (dentry == NULL) - THIS->__retvalue = 0; - else { - struct inode *d_inode = kread(&(dentry->d_inode)); - THIS->__retvalue = kread(&(d_inode->i_mode)); - } - CATCH_DEREF_FAULT(); -%} +function __file_mode:long (file:long) +{ + d_inode = __file_inode(file) + if (d_inode == 0) + return 0 + return @cast(d_inode, "inode", "kernel:nfs")->i_mode +} -function __file_parentname:string (file:long) %{ /* pure */ - struct file *file = (struct file *)(long)THIS->file; - struct dentry *dentry = file? kread(&(file->f_dentry)) : NULL; - struct dentry *d_parent = dentry? kread(&(dentry->d_parent)) : NULL; - if (d_parent == NULL) - strlcpy(THIS->__retvalue, "NULL", MAXSTRINGLEN); - else { - const unsigned char *name = kread(&(d_parent->d_name.name)); - deref_string(THIS->__retvalue, name, MAXSTRINGLEN); - } - CATCH_DEREF_FAULT(); -%} +function __file_parentname:string (file:long) +{ +%( kernel_v >= "2.6.20" %? + dentry = file? @cast(file, "file", "kernel:nfs")->f_path->dentry : 0 +%: + dentry = file? @cast(file, "file", "kernel:nfs")->f_dentry : 0 +%) + d_parent = dentry? @cast(dentry, "dentry", "kernel:nfs")->d_parent : 0 + if (d_parent == 0) + return "NULL" + name = @cast(d_parent, "dentry", "kernel:nfs")->d_name->name + return kernel_string(name) +} /* * Combination of generic_segment_checks and iov_length functions @@ -349,8 +324,8 @@ probe nfs.fop.llseek = kernel.function ("nfs_file_llseek") !, { dev = __file_dev($filp) ino = __file_ino($filp) - s_id = __file_id($filp) - devname = kernel_string(s_id) + s_id = __file_id($filp) + devname = kernel_string(s_id) maxbyte = __file_maxbytes($filp) offset = $offset diff --git a/tapset/ppc64/registers.stp b/tapset/ppc64/registers.stp index 6a8ae279..e5decd81 100644 --- a/tapset/ppc64/registers.stp +++ b/tapset/ppc64/registers.stp @@ -64,6 +64,16 @@ function probing_32bit_app() %{ /* pure */ function _stp_get_register_by_offset:long (offset:long) %{ /* pure */ long value; + if (!CONTEXT->regs) { + CONTEXT->last_error = "No registers available in this context"; + return; + } + if (THIS->offset < 0 || THIS->offset > sizeof(struct pt_regs) - sizeof(long)) { + snprintf(CONTEXT->error_buffer, sizeof(CONTEXT->error_buffer), + "Bad register offset: %lld", THIS->offset); + CONTEXT->last_error = CONTEXT->error_buffer; + return; + } memcpy(&value, ((char *)CONTEXT->regs) + THIS->offset, sizeof(value)); THIS->__retvalue = value; %} diff --git a/tapset/rpc.stp b/tapset/rpc.stp index f97117b5..1d47daed 100644 --- a/tapset/rpc.stp +++ b/tapset/rpc.stp @@ -877,60 +877,40 @@ probe sunrpc.sched.delay.return = kernel.function("rpc_delay").return !, *****************************************************************/ function xid_from_clnt:long(clnt:long) -%{ /* pure */ - struct rpc_clnt *clnt = (struct rpc_clnt *)(long)THIS->clnt; - if (clnt == NULL) - THIS->__retvalue = 0; - else { - struct rpc_xprt *cl_xprt = kread(&(clnt->cl_xprt)); - THIS->__retvalue = kread(&(cl_xprt->xid)); - } - CATCH_DEREF_FAULT(); -%} +{ + if (clnt == 0) + return 0 + return @cast(clnt, "rpc_clnt", "kernel:sunrpc")->cl_xprt->xid +} function prog_from_clnt:long(clnt:long) -%{ /* pure */ - struct rpc_clnt *clnt = (struct rpc_clnt *)(long)THIS->clnt; - if (clnt == NULL) - THIS->__retvalue = 0; - else { -#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,19) - THIS->__retvalue = kread(&(clnt->cl_prog)); -#else - struct rpc_portmap *cl_pmap = kread(&(clnt->cl_pmap)); - THIS->__retvalue = kread(&(cl_pmap->pm_prog)); -#endif - } - CATCH_DEREF_FAULT(); -%} +{ + if (clnt == 0) + return 0 +%(kernel_v >= "2.6.19" %? + return @cast(clnt, "rpc_clnt", "kernel:sunrpc")->cl_prog +%: + return @cast(clnt, "rpc_clnt", "kernel:sunrpc")->cl_pmap->pm_prog +%) +} function vers_from_clnt:long(clnt:long) -%{ /* pure */ - struct rpc_clnt *clnt = (struct rpc_clnt *)(long)THIS->clnt; - if (clnt == NULL) - THIS->__retvalue = 0; - else { -#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,19) - THIS->__retvalue = kread(&(clnt->cl_vers)); -#else - struct rpc_portmap *cl_pmap = kread(&(clnt->cl_pmap)); - THIS->__retvalue = kread(&(cl_pmap->pm_vers)); -#endif - } - CATCH_DEREF_FAULT(); -%} +{ + if (clnt == 0) + return 0 +%(kernel_v >= "2.6.19" %? + return @cast(clnt, "rpc_clnt", "kernel:sunrpc")->cl_vers +%: + return @cast(clnt, "rpc_clnt", "kernel:sunrpc")->cl_pmap->pm_vers +%) +} function prot_from_clnt:long(clnt:long) -%{ /* pure */ - struct rpc_clnt *clnt = (struct rpc_clnt *)(long)THIS->clnt; - if (clnt == NULL) - THIS->__retvalue = 0; - else { - struct rpc_xprt *cl_xprt = kread(&(clnt->cl_xprt)); - THIS->__retvalue = kread(&(cl_xprt->prot)); - } - CATCH_DEREF_FAULT(); -%} +{ + if (clnt == 0) + return 0 + return @cast(clnt, "rpc_clnt", "kernel:sunrpc")->cl_xprt->prot +} function port_from_clnt:long(clnt:long) %{ /* pure */ @@ -942,12 +922,14 @@ function port_from_clnt:long(clnt:long) struct sockaddr_in *sap = (struct sockaddr_in *) &cl_xprt->addr; THIS->__retvalue = ntohs(kread(&(sap->sin_port))); + } #else if (cl_xprt && kread(&(cl_xprt->addr.sin_family)) == AF_INET) { /* Now consider ipv4 only */ THIS->__retvalue = ntohs(kread(&(cl_xprt->addr.sin_port))); + } #endif - } else + else THIS->__retvalue = 0; CATCH_DEREF_FAULT(); %} @@ -975,16 +957,11 @@ function tasks_from_clnt:long(clnt:long) %} function proc_from_msg:long(msg:long) -%{ /* pure */ - struct rpc_message *msg = (struct rpc_message *)(long)THIS->msg; - if (msg == NULL) - THIS->__retvalue = 0; - else { - struct rpc_procinfo *rpc_proc = kread(&(msg->rpc_proc)); - THIS->__retvalue = kread(&(rpc_proc->p_proc)); - } - CATCH_DEREF_FAULT(); -%} +{ + if (msg == 0) + return 0 + return @cast(msg, "rpc_message", "kernel:sunrpc")->rpc_proc->p_proc +} function vers_from_prog:long(program:long, vers:long) %{ /* pure */ diff --git a/tapset/s390x/registers.stp b/tapset/s390x/registers.stp index 84e28348..37218d14 100644 --- a/tapset/s390x/registers.stp +++ b/tapset/s390x/registers.stp @@ -56,8 +56,18 @@ function _stp_probing_kernel: long () %{ /* pure */ function _stp_get_register_by_offset:long (offset:long) %{ /* pure */ long value; + if (!CONTEXT->regs) { + CONTEXT->last_error = "No registers available in this context"; + return; + } + if (THIS->offset < 0 || THIS->offset > sizeof(struct pt_regs) - sizeof(unsigned short)) { + snprintf(CONTEXT->error_buffer, sizeof(CONTEXT->error_buffer), + "Bad register offset: %lld", THIS->offset); + CONTEXT->last_error = CONTEXT->error_buffer; + return; + } - if (THIS->offset <= 152) + if (THIS->offset < sizeof(struct pt_regs) - 2 * sizeof(unsigned short)) memcpy(&value, ((char *)CONTEXT->regs) + THIS->offset, sizeof(value)); else { diff --git a/tapset/scsi.stp b/tapset/scsi.stp index 76b9a114..6d332e8b 100644 --- a/tapset/scsi.stp +++ b/tapset/scsi.stp @@ -136,9 +136,7 @@ function scsi_timer_pending:long(var:long) %} function get_devstate_from_req:long(var:long) -%{ /* pure */ - struct request_queue *q = (struct request_queue *)((long)THIS->var); - struct scsi_device *sdev = (struct scsi_device *)kread(&(q->queuedata)); - THIS->__retvalue = kread(&(sdev->sdev_state)); - CATCH_DEREF_FAULT(); -%} +{ + sdev = @cast(var, "request_queue", "kernel:scsi_mod")->queuedata + return @cast(sdev, "scsi_device", "kernel:scsi_mod")->sdev_state +} diff --git a/tapset/signal.stp b/tapset/signal.stp index f40958e6..8fb6fe57 100644 --- a/tapset/signal.stp +++ b/tapset/signal.stp @@ -608,17 +608,15 @@ probe signal.flush = kernel.function("flush_signals") pid_name = kernel_string($t->comm) } -function get_sa_flags:long (act:long) %{ /* pure */ - struct k_sigaction *act = (struct k_sigaction *)((long)THIS->act); - THIS->__retvalue = kread(&act->sa.sa_flags); - CATCH_DEREF_FAULT(); -%} +function get_sa_flags:long (act:long) +{ + return @cast(act, "k_sigaction", "kernel")->sa->sa_flags +} -function get_sa_handler:long (act:long) %{ /* pure */ - struct k_sigaction *act = (struct k_sigaction *)((long)THIS->act); - THIS->__retvalue = (long)kread(&act->sa.sa_handler); - CATCH_DEREF_FAULT(); -%} +function get_sa_handler:long (act:long) +{ + return @cast(act, "k_sigaction", "kernel")->sa->sa_handler +} // sa_mask contains the set of signals to be blocked when executing the // signal handler. This function returns a string, delimited by ",". diff --git a/tapset/socket.stp b/tapset/socket.stp index 842dbfc4..3271d4f7 100644 --- a/tapset/socket.stp +++ b/tapset/socket.stp @@ -922,53 +922,43 @@ function _get_sock_size:long (iov:long, nr_segs:long) %} function _sock_prot_num:long (sock:long) -%{ /* pure */ - struct socket *sktp = (struct socket *)(long)(THIS->sock); - struct sock *skp = sktp? kread(&(sktp->sk)) : NULL; - if (skp == NULL) - THIS->__retvalue = -1; +{ + skp = sock? @cast(sock, "socket", "kernel")->sk : 0 + if (skp == 0) + return -1 else - THIS->__retvalue = kread(&(skp->sk_protocol)); - CATCH_DEREF_FAULT(); -%} + return @cast(skp, "sock", "kernel")->sk_protocol +} function _sock_fam_num:long (sock:long) -%{ /* pure */ - struct socket *sockp = (struct socket *)(long)(THIS->sock); - const struct proto_ops *ops = sockp? kread(&(sockp->ops)) : NULL; - if (ops == NULL) - THIS->__retvalue = -1; +{ + ops = sock? @cast(sock, "socket", "kernel")->ops : 0 + if (ops == 0) + return -1 else - THIS->__retvalue = kread(&(ops->family)); - CATCH_DEREF_FAULT(); -%} + return @cast(ops, "proto_ops", "kernel")->family +} function _sock_state_num:long (sock:long) -%{ /* pure */ - struct socket *sockp = (struct socket *)(long)(THIS->sock); - if (sockp == NULL) - THIS->__retvalue = -1; +{ + if (sock == 0) + return -1 else - THIS->__retvalue = kread(&(sockp->state)); - CATCH_DEREF_FAULT(); -%} + return @cast(sock, "socket", "kernel")->state +} function _sock_type_num:long (sock:long) -%{ /* pure */ - struct socket *sockp = (struct socket *)(long)(THIS->sock); - if (sockp == NULL) - THIS->__retvalue = -1; - else - THIS->__retvalue = kread(&(sockp->type)); - CATCH_DEREF_FAULT(); -%} +{ + if (sock == 0) + return -1 + else + return @cast(sock, "socket", "kernel")->type +} function _sock_flags_num:long (sock:long) -%{ /* pure */ - struct socket *sockp = (struct socket *)(long)(THIS->sock); - if (sockp == NULL) - THIS->__retvalue = -1; - else - THIS->__retvalue = kread(&(sockp->flags)); - CATCH_DEREF_FAULT(); -%} +{ + if (sock == 0) + return -1 + else + return @cast(sock, "socket", "kernel")->flags +} diff --git a/tapset/task.stp b/tapset/task.stp index 684cef93..07337156 100644 --- a/tapset/task.stp +++ b/tapset/task.stp @@ -43,35 +43,31 @@ function task_parent:long (task:long) %{ /* pure */ // TASK_TRACED 8 // EXIT_ZOMBIE 16 // EXIT_DEAD 32 -function task_state:long (task:long) %{ /* pure */ - struct task_struct *t = (struct task_struct *)(long)THIS->task; - THIS->__retvalue = kread(&(t->state)); - CATCH_DEREF_FAULT(); -%} +function task_state:long (task:long) +{ + return @cast(task, "task_struct", "kernel")->state +} // Return the name of the given task -function task_execname:string (task:long) %{ /* pure */ - struct task_struct *t = (struct task_struct *)(long)THIS->task; - deref_string(THIS->__retvalue, t->comm, MAXSTRINGLEN); - CATCH_DEREF_FAULT(); -%} +function task_execname:string (task:long) +{ + return kernel_string(@cast(task, "task_struct", "kernel")->comm) +} // Return the process id of the given task -function task_pid:long (task:long) %{ /* pure */ - struct task_struct *t = (struct task_struct *)(long)THIS->task; - THIS->__retvalue = kread(&(t->tgid)); - CATCH_DEREF_FAULT(); -%} +function task_pid:long (task:long) +{ + return @cast(task, "task_struct", "kernel")->tgid +} // Return the thread id of the given task -function task_tid:long (task:long) %{ /* pure */ - struct task_struct *t = (struct task_struct *)(long)THIS->task; - THIS->__retvalue = kread(&(t->pid)); - CATCH_DEREF_FAULT(); -%} +function task_tid:long (task:long) +{ + return @cast(task, "task_struct", "kernel")->pid +} // Return the group id of the given task @@ -156,22 +152,14 @@ function task_nice:long (task:long) %{ /* pure */ // Return the scheduled cpu for the given task function task_cpu:long (task:long) +{ %( kernel_v >= "2.6.22" %? -%{ /* pure */ - struct task_struct *t = (struct task_struct *)(long)THIS->task; - struct thread_info *ti = kread(&(t->stack)); - THIS->__retvalue = kread(&(ti->cpu)); - CATCH_DEREF_FAULT(); -%} + ti = @cast(task, "task_struct", "kernel")->stack %: -%{ /* pure */ - struct task_struct *t = (struct task_struct *)(long)THIS->task; - struct thread_info *ti = kread(&(t->thread_info)); - THIS->__retvalue = kread(&(ti->cpu)); - CATCH_DEREF_FAULT(); -%} + ti = @cast(task, "task_struct", "kernel")->thread_info %) - + return @cast(ti, "thread_info", "kernel")->cpu +} // Return the number of open file handlers for the given task function task_open_file_handles:long (task:long) diff --git a/tapset/vfs.stp b/tapset/vfs.stp index 43603177..23d95098 100644 --- a/tapset/vfs.stp +++ b/tapset/vfs.stp @@ -51,139 +51,93 @@ function ppos_pos:long (ppos:long) %{ /* pure */ CATCH_DEREF_FAULT(); %} -function __page_ino:long (page:long) %{ /* pure */ - struct page *page = (struct page *)(long)THIS->page; - struct address_space *mapping = page? kread(&(page->mapping)) : NULL; - if (mapping == NULL) { - THIS->__retvalue = -1; - } else { - struct inode *host = kread(&(mapping->host)); - THIS->__retvalue = kread(&(host->i_ino)); - } - CATCH_DEREF_FAULT(); -%} - -function __address_inode:long (page:long) %{ /* pure */ - struct page *page = (struct page *)(long)THIS->page; - struct address_space *mapping = kread(&(page->mapping)); - if (mapping == NULL) { - THIS->__retvalue = -1; - } else { - THIS->__retvalue = (long)kread(&(mapping->host)); - } - CATCH_DEREF_FAULT(); -%} +function __address_inode:long (page:long) +{ + mapping = page? @cast(page, "page", "kernel")->mapping : 0 + if (mapping == 0) + return -1 + else + return @cast(mapping, "address_space", "kernel")->host +} -function __page_dev:long (page:long) %{ /* pure */ - struct page *page = (struct page *)(long)THIS->page; - struct address_space *mapping = page? kread(&(page->mapping)) : NULL; - if (mapping == NULL) { - THIS->__retvalue = -1; - } else { - struct inode *host = kread(&(mapping->host)); - struct super_block *i_sb = kread(&(host->i_sb)); - THIS->__retvalue = kread(&(i_sb->s_dev)); - } - CATCH_DEREF_FAULT(); -%} +function __page_ino:long (page:long) +{ + host = __address_inode(page) + if (host == -1) + return -1 + else + return @cast(host, "inode", "kernel")->i_ino +} -function __page_bdev:long (page:long) %{ /* pure */ - struct page *page = (struct page *)(long)THIS->page; - struct address_space *mapping = page? kread(&(page->mapping)) : NULL; - if (mapping == NULL) { - THIS->__retvalue = 0; - } else { - struct inode *host = kread(&(mapping->host)); - struct super_block *i_sb = kread(&(host->i_sb)); - THIS->__retvalue = (long)kread(&(i_sb->s_bdev)); - } - CATCH_DEREF_FAULT(); -%} +function __page_dev:long (page:long) +{ + host = __address_inode(page) + if (host == -1) + return -1 + return @cast(host, "inode", "kernel")->i_sb->s_dev +} -function __page_index:long (page:long) %{ /* pure */ - struct page *page = (struct page *)(long)THIS->page; - THIS->__retvalue = (long)kread(&(page->index)); - CATCH_DEREF_FAULT(); -%} +function __page_bdev:long (page:long) +{ + host = __address_inode(page) + if (host == -1) + return 0 + return @cast(host, "inode", "kernel")->i_sb->s_bdev +} -function __file_dev:long (file:long) %{ /* pure */ - struct file *file = (struct file *)(long)THIS->file; - struct dentry *dentry = file? kread(&(file->f_dentry)) : NULL; - if (dentry == NULL) { - THIS->__retvalue = 0; - } else { - struct inode *d_inode = kread(&(dentry->d_inode)); - struct super_block *i_sb = kread(&(d_inode->i_sb)); - THIS->__retvalue = kread(&(i_sb->s_dev)); - } - CATCH_DEREF_FAULT(); -%} +function __page_index:long (page:long) +{ + return @cast(page, "page", "kernel")->index +} -function __file_bdev:long (file:long) %{ /* pure */ - struct file *file = (struct file *)(long)THIS->file; - struct dentry *dentry = file? kread(&(file->f_dentry)) : NULL; - if (dentry == NULL) { - THIS->__retvalue = 0; - } else { - struct inode *d_inode = kread(&(dentry->d_inode)); - struct super_block *i_sb = kread(&(d_inode->i_sb)); - THIS->__retvalue = (long)kread(&(i_sb->s_bdev)); - } - CATCH_DEREF_FAULT(); -%} +function __file_dev:long (file:long) +{ + d_inode = __file_inode(file) + if (d_inode == 0) + return 0 + return @cast(d_inode, "inode", "kernel")->i_sb->s_dev +} -function __file_ino:long (file:long) %{ /* pure */ - struct file *file = (struct file *)(long)THIS->file; - struct dentry *dentry = file? kread(&(file->f_dentry)) : NULL; - if (dentry == NULL) { - THIS->__retvalue = 0; - } else { - struct inode *d_inode = kread(&(dentry->d_inode)); - THIS->__retvalue = kread(&(d_inode->i_ino)); - } - CATCH_DEREF_FAULT(); -%} +function __file_bdev:long (file:long) +{ + d_inode = __file_inode(file) + if (d_inode == 0) + return 0 + return @cast(d_inode, "inode", "kernel")->i_sb->s_bdev +} -function __file_maxbytes:long (file:long) %{ /* pure */ - struct file *file = (struct file *)(long)THIS->file; - struct dentry *dentry = file? kread(&(file->f_dentry)) : NULL; - if (dentry == NULL) { - THIS->__retvalue = 0; - } else { - struct inode *d_inode = kread(&(dentry->d_inode)); - struct super_block *i_sb = kread(&(d_inode->i_sb)); - THIS->__retvalue = kread(&(i_sb->s_maxbytes)); - } - CATCH_DEREF_FAULT(); -%} +function __file_ino:long (file:long) +{ + d_inode = __file_inode(file) + if (d_inode == 0) + return 0 + return @cast(d_inode, "inode", "kernel")->i_ino +} -function __file_filename:string (file:long) %{ /* pure */ - struct file *file = (struct file *)(long)THIS->file; - struct dentry *dentry = file? kread(&(file->f_dentry)) : NULL; - const unsigned char *name = dentry? kread(&(dentry->d_name.name)) : NULL; - if (name == NULL) { - strlcpy(THIS->__retvalue, "NULL", MAXSTRINGLEN); - } else { - deref_string(THIS->__retvalue, name, MAXSTRINGLEN); - } - CATCH_DEREF_FAULT(); -%} +function __file_maxbytes:long (file:long) +{ + d_inode = __file_inode(file) + if (d_inode == 0) + return 0 + return @cast(d_inode, "inode", "kernel")->i_sb->s_maxbytes +} -function __inode_num:long(file:long) -%{ - struct file *file = NULL; - struct dentry *dentry = NULL; - struct inode *inode = NULL; - - file = (struct file *)(long)THIS->file; - dentry = file? kread(&(file->f_dentry)) : NULL; - inode = dentry? kread(&(dentry->d_inode)) : NULL; - THIS->__retvalue = inode? (long)(kread(&(inode->i_ino))) : 0; - CATCH_DEREF_FAULT(); -%} +function __file_filename:string (file:long) +{ +%( kernel_v >= "2.6.20" %? + dentry = file? @cast(file, "file", "kernel")->f_path->dentry : 0 +%: + dentry = file? @cast(file, "file", "kernel")->f_dentry : 0 +%) + name = dentry? @cast(dentry, "dentry", "kernel")->d_name->name : 0 + if (name == 0) + return "NULL" + else + return kernel_string(name) +} function _get_fopv_size:long (iov:long, nr_segs:long) -%{ +%{ /* pure */ struct iovec *iovp = (struct iovec *)(long)THIS->iov; if (iovp) { int i; diff --git a/tapset/x86_64/registers.stp b/tapset/x86_64/registers.stp index dd5eefb0..2e21f3eb 100644 --- a/tapset/x86_64/registers.stp +++ b/tapset/x86_64/registers.stp @@ -40,6 +40,16 @@ function _stp_register_regs() { function _stp_get_register_by_offset:long (offset:long) %{ /* pure */ long value; + if (!CONTEXT->regs) { + CONTEXT->last_error = "No registers available in this context"; + return; + } + if (THIS->offset < 0 || THIS->offset > sizeof(struct pt_regs) - sizeof(long)) { + snprintf(CONTEXT->error_buffer, sizeof(CONTEXT->error_buffer), + "Bad register offset: %lld", THIS->offset); + CONTEXT->last_error = CONTEXT->error_buffer; + return; + } memcpy(&value, ((char *)CONTEXT->regs) + THIS->offset, sizeof(value)); THIS->__retvalue = value; %} diff --git a/tapsets.cxx b/tapsets.cxx index 77e2efcc..b02e2cce 100644 --- a/tapsets.cxx +++ b/tapsets.cxx @@ -15,6 +15,7 @@ #include "translate.h" #include "session.h" #include "util.h" +#include "buildrun.h" #include "dwarf_wrappers.h" #include "auto_free.h" @@ -41,7 +42,6 @@ extern "C" { #include <fcntl.h> #include <elfutils/libdwfl.h> #include <elfutils/libdw.h> -#include <elfutils/libebl.h> #include <dwarf.h> #include <elf.h> #include <obstack.h> @@ -158,12 +158,13 @@ be_derived_probe::join_group (systemtap_session& s) // ------------------------------------------------------------------------ void common_probe_entryfn_prologue (translator_output* o, string statestr, - bool overload_processing = true, - bool interruptible = true) + string new_pp, + bool overload_processing = true) { o->newline() << "struct context* __restrict__ c;"; - if (! interruptible) - o->newline() << "unsigned long flags;"; + o->newline() << "#if !INTERRUPTIBLE"; + o->newline() << "unsigned long flags;"; + o->newline() << "#endif"; if (overload_processing) o->newline() << "#if defined(STP_TIMING) || defined(STP_OVERLOAD)"; @@ -181,10 +182,11 @@ common_probe_entryfn_prologue (translator_output* o, string statestr, o->newline() << "static int _pfm_num_pmd_x;"; #endif - if (! interruptible) - o->newline() << "local_irq_save (flags);"; - else - o->newline() << "preempt_disable ();"; + o->newline() << "#if INTERRUPTIBLE"; + o->newline() << "preempt_disable ();"; + o->newline() << "#else"; + o->newline() << "local_irq_save (flags);"; + o->newline() << "#endif"; // Check for enough free enough stack space o->newline() << "if (unlikely ((((unsigned long) (& c)) & (THREAD_SIZE-1))"; // free space @@ -207,6 +209,15 @@ common_probe_entryfn_prologue (translator_output* o, string statestr, o->newline(1) << "atomic_inc (& skipped_count);"; o->newline() << "#ifdef STP_TIMING"; o->newline() << "atomic_inc (& skipped_count_reentrant);"; + o->newline() << "#ifdef DEBUG_REENTRANCY"; + o->newline() << "_stp_warn (\"Skipped %s due to %s residency on cpu %u\\n\", " + << new_pp << ", c->probe_point ?: \"?\", smp_processor_id());"; + // NB: There is a conceivable race condition here with reading + // c->probe_point, knowing that this other probe is sort of running. + // However, in reality, it's interrupted. Plus even if it were able + // to somehow start again, and stop before we read c->probe_point, + // at least we have that ?: "?" bit in there to avoid a NULL deref. + o->newline() << "#endif"; o->newline() << "#endif"; o->newline() << "atomic_dec (& c->busy);"; o->newline() << "goto probe_epilogue;"; @@ -217,16 +228,18 @@ common_probe_entryfn_prologue (translator_output* o, string statestr, o->newline() << "c->nesting = 0;"; o->newline() << "c->regs = 0;"; o->newline() << "c->unwaddr = 0;"; + o->newline() << "c->probe_point = " << new_pp << ";"; // reset unwound address cache o->newline() << "c->pi = 0;"; o->newline() << "c->regparm = 0;"; o->newline() << "c->marker_name = NULL;"; o->newline() << "c->marker_format = NULL;"; - o->newline() << "c->probe_point = 0;"; - if (! interruptible) - o->newline() << "c->actionremaining = MAXACTION;"; - else - o->newline() << "c->actionremaining = MAXACTION_INTERRUPTIBLE;"; + + o->newline() << "#if INTERRUPTIBLE"; + o->newline() << "c->actionremaining = MAXACTION_INTERRUPTIBLE;"; + o->newline() << "#else"; + o->newline() << "c->actionremaining = MAXACTION;"; + o->newline() << "#endif"; o->newline() << "#ifdef STP_TIMING"; o->newline() << "c->statp = 0;"; o->newline() << "#endif"; @@ -245,8 +258,7 @@ common_probe_entryfn_prologue (translator_output* o, string statestr, void common_probe_entryfn_epilogue (translator_output* o, - bool overload_processing = true, - bool interruptible = true) + bool overload_processing = true) { if (overload_processing) o->newline() << "#if defined(STP_TIMING) || defined(STP_OVERLOAD)"; @@ -298,6 +310,7 @@ common_probe_entryfn_epilogue (translator_output* o, o->newline(-1) << "}"; o->newline() << "#endif"; + o->newline() << "c->probe_point = 0;"; // vacated o->newline() << "if (unlikely (c->last_error && c->last_error[0])) {"; o->newline(1) << "if (c->last_stmt != NULL)"; o->newline(1) << "_stp_softerror (\"%s near %s\", c->last_error, c->last_stmt);"; @@ -321,10 +334,11 @@ common_probe_entryfn_epilogue (translator_output* o, o->newline() << "_stp_exit ();"; o->newline(-1) << "}"; - if (! interruptible) - o->newline() << "local_irq_restore (flags);"; - else - o->newline() << "preempt_enable_no_resched ();"; + o->newline() << "#if INTERRUPTIBLE"; + o->newline() << "preempt_enable_no_resched ();"; + o->newline() << "#else"; + o->newline() << "local_irq_restore (flags);"; + o->newline() << "#endif"; } @@ -338,26 +352,23 @@ be_derived_probe_group::emit_module_decls (systemtap_session& s) s.op->newline() << "/* ---- begin/end probes ---- */"; s.op->newline() << "static void enter_begin_probe (void (*fn)(struct context*), const char* pp) {"; s.op->indent(1); - common_probe_entryfn_prologue (s.op, "STAP_SESSION_STARTING", false, true); - s.op->newline() << "c->probe_point = pp;"; + common_probe_entryfn_prologue (s.op, "STAP_SESSION_STARTING", "pp", false); s.op->newline() << "(*fn) (c);"; - common_probe_entryfn_epilogue (s.op, false, true); + common_probe_entryfn_epilogue (s.op, false); s.op->newline(-1) << "}"; s.op->newline() << "static void enter_end_probe (void (*fn)(struct context*), const char* pp) {"; s.op->indent(1); - common_probe_entryfn_prologue (s.op, "STAP_SESSION_STOPPING", false, true); - s.op->newline() << "c->probe_point = pp;"; + common_probe_entryfn_prologue (s.op, "STAP_SESSION_STOPPING", "pp", false); s.op->newline() << "(*fn) (c);"; - common_probe_entryfn_epilogue (s.op, false, true); + common_probe_entryfn_epilogue (s.op, false); s.op->newline(-1) << "}"; s.op->newline() << "static void enter_error_probe (void (*fn)(struct context*), const char* pp) {"; s.op->indent(1); - common_probe_entryfn_prologue (s.op, "STAP_SESSION_ERROR", false, true); - s.op->newline() << "c->probe_point = pp;"; + common_probe_entryfn_prologue (s.op, "STAP_SESSION_ERROR", "pp", false); s.op->newline() << "(*fn) (c);"; - common_probe_entryfn_epilogue (s.op, false, true); + common_probe_entryfn_epilogue (s.op, false); s.op->newline(-1) << "}"; s.op->newline() << "static struct stap_be_probe {"; @@ -466,6 +477,7 @@ static string TOK_STATEMENT("statement"); static string TOK_ABSOLUTE("absolute"); static string TOK_PROCESS("process"); static string TOK_MARK("mark"); +static string TOK_TRACE("trace"); static string TOK_LABEL("label"); // Can we handle this query with just symbol-table info? @@ -959,6 +971,9 @@ struct dwflpp void setup_user(string module_name, bool debuginfo_needed = true) { + if (! sess.module_cache) + sess.module_cache = new module_cache (); + static const char *debuginfo_path_arr = "+:.debug:/usr/lib/debug:build"; static const char *debuginfo_env_arr = getenv("SYSTEMTAP_DEBUGINFO_PATH"); // NB: kernel_build_tree doesn't enter into this, as it's for @@ -1191,8 +1206,9 @@ struct dwflpp return DWARF_CB_OK; } - int iterate_over_functions (int (* callback)(Dwarf_Die * func, void * arg), - void * data); + int iterate_over_functions (int (* callback)(Dwarf_Die * func, base_query * q), + base_query * q, const string& function, + bool has_statement_num=false); int iterate_over_globals (int (* callback)(Dwarf_Die *, void *), void * data); @@ -2297,9 +2313,9 @@ struct dwflpp assert(memstream); fprintf(memstream, "{\n"); - fprintf(memstream, prelude.c_str()); + fprintf(memstream, "%s", prelude.c_str()); bool deref = c_emit_location (memstream, head, 1); - fprintf(memstream, postlude.c_str()); + fprintf(memstream, "%s", postlude.c_str()); fprintf(memstream, " goto out;\n"); // dummy use of deref_fault label, to disable warning if deref() not used @@ -2935,13 +2951,13 @@ dwflpp::iterate_over_globals (int (* callback)(Dwarf_Die *, void *), } int -dwflpp::iterate_over_functions (int (* callback)(Dwarf_Die * func, void * arg), - void * data) +dwflpp::iterate_over_functions (int (* callback)(Dwarf_Die * func, base_query * q), + base_query * q, const string& function, + bool has_statement_num) { int rc = DWARF_CB_OK; assert (module); assert (cu); - dwarf_query * q = static_cast<dwarf_query *>(data); string key = module_name + ":" + cu_name; cu_function_cache_t *v = cu_function_cache[key]; @@ -2954,13 +2970,13 @@ dwflpp::iterate_over_functions (int (* callback)(Dwarf_Die * func, void * arg), clog << "function cache " << key << " size " << v->size() << endl; } - string subkey = q->function; + string subkey = function; if (v->find(subkey) != v->end()) { Dwarf_Die die = v->find(subkey)->second; if (q->sess.verbose > 4) clog << "function cache " << key << " hit " << subkey << endl; - return (*callback)(& die, data); + return (*callback)(& die, q); } else if (name_has_wildcard (subkey)) { @@ -2974,17 +2990,17 @@ dwflpp::iterate_over_functions (int (* callback)(Dwarf_Die * func, void * arg), if (q->sess.verbose > 4) clog << "function cache " << key << " match " << func_name << " vs " << subkey << endl; - rc = (*callback)(& die, data); + rc = (*callback)(& die, q); if (rc != DWARF_CB_OK) break; } } } - else if (q->has_statement_num) // searching all for kernel.statement + else if (has_statement_num) // searching all for kernel.statement { for (cu_function_cache_t::iterator it = v->begin(); it != v->end(); it++) { Dwarf_Die die = it->second; - rc = (*callback)(& die, data); + rc = (*callback)(& die, q); if (rc != DWARF_CB_OK) break; } } @@ -3874,9 +3890,9 @@ query_dwarf_inline_instance (Dwarf_Die * die, void * arg) } static int -query_dwarf_func (Dwarf_Die * func, void * arg) +query_dwarf_func (Dwarf_Die * func, base_query * bq) { - dwarf_query * q = static_cast<dwarf_query *>(arg); + dwarf_query * q = static_cast<dwarf_query *>(bq); try { @@ -3890,7 +3906,7 @@ query_dwarf_func (Dwarf_Die * func, void * arg) if (q->sess.verbose>3) clog << "checking instances of inline " << q->dw.function_name << "\n"; - q->dw.iterate_over_inline_instances (query_dwarf_inline_instance, arg); + q->dw.iterate_over_inline_instances (query_dwarf_inline_instance, q); if (q->dw.function_name_final_match (q->function)) return DWARF_CB_ABORT; @@ -3907,9 +3923,9 @@ query_dwarf_func (Dwarf_Die * func, void * arg) else if (q->has_function_num || q->has_statement_num) { Dwarf_Addr query_addr = - q->dw.module_address_to_global(q->has_function_num ? q->function_num_val : - q->has_statement_num ? q->statement_num_val : - (assert(0) , 0)); + (q->has_function_num ? q->function_num_val : + q->has_statement_num ? q->statement_num_val : + (assert(0) , 0)); Dwarf_Die d; q->dw.function_die (&d); @@ -4024,7 +4040,9 @@ query_cu (Dwarf_Die * cudie, void * arg) // Pick up [entrypc, name, DIE] tuples for all the functions // matching the query, and fill in the prologue endings of them // all in a single pass. - int rc = q->dw.iterate_over_functions (query_dwarf_func, q); + int rc = q->dw.iterate_over_functions (query_dwarf_func, q, + q->function, + q->has_statement_num); if (rc != DWARF_CB_OK) q->query_done = true; @@ -4824,18 +4842,31 @@ dwarf_var_expanding_visitor::visit_target_symbol (target_symbol *e) } catch (const semantic_error& er) { - // We suppress this error message, and pass the unresolved - // target_symbol to the next pass. We hope that this value ends - // up not being referenced after all, so it can be optimized out - // quietly. - provide (e); - semantic_error* saveme = new semantic_error (er); // copy it - saveme->tok1 = e->tok; // XXX: token not passed to q.dw code generation routines - // NB: we can have multiple errors, since a $target variable - // may be expanded in several different contexts: - // function ("*") { $var } - saveme->chain = e->saved_conversion_error; - e->saved_conversion_error = saveme; + if (!q.sess.skip_badvars) + { + // We suppress this error message, and pass the unresolved + // target_symbol to the next pass. We hope that this value ends + // up not being referenced after all, so it can be optimized out + // quietly. + provide (e); + semantic_error* saveme = new semantic_error (er); // copy it + saveme->tok1 = e->tok; // XXX: token not passed to q.dw code generation routines + // NB: we can have multiple errors, since a $target variable + // may be expanded in several different contexts: + // function ("*") { $var } + saveme->chain = e->saved_conversion_error; + e->saved_conversion_error = saveme; + } + else + { + // Upon user request for ignoring context, the symbol is replaced + // with a literal 0 and a warning message displayed + literal_number* ln_zero = new literal_number (0); + ln_zero->tok = e->tok; + provide (ln_zero); + q.sess.print_warning ("Bad variable being substituted with literal 0", + e->tok); + } delete fdecl; delete ec; return; @@ -4895,14 +4926,14 @@ struct dwarf_cast_query : public base_query { const cast_op& e; const bool lvalue; - exp_type& pe_type; - bool resolved; - string code; + exp_type& pe_type; + string& code; - dwarf_cast_query(dwflpp& dw, const cast_op& e, bool lvalue, exp_type& pe_type): - base_query(dw, e.module), e(e), lvalue(lvalue), pe_type(pe_type), resolved(false) {} - const string& get_code(); + dwarf_cast_query(dwflpp& dw, const string& module, const cast_op& e, + bool lvalue, exp_type& pe_type, string& code): + base_query(dw, module), e(e), lvalue(lvalue), + pe_type(pe_type), code(code) {} void handle_query_module(); int handle_query_cu(Dwarf_Die * cudie); @@ -4911,23 +4942,10 @@ struct dwarf_cast_query : public base_query }; -const string& -dwarf_cast_query::get_code() -{ - if (!resolved) - dw.query_modules(this); - - if (!resolved) - throw semantic_error("type definition not found"); - - return code; -} - - void dwarf_cast_query::handle_query_module() { - if (resolved) + if (!code.empty()) return; // look for the type in each CU @@ -4938,7 +4956,7 @@ dwarf_cast_query::handle_query_module() int dwarf_cast_query::handle_query_cu(Dwarf_Die * cudie) { - if (resolved) + if (!code.empty()) return DWARF_CB_ABORT; dw.focus_on_cu (cudie); @@ -4955,10 +4973,7 @@ dwarf_cast_query::handle_query_cu(Dwarf_Die * cudie) // XXX might be better to save the error // and try again in another CU sess.print_error (e); - return DWARF_CB_ABORT; } - - resolved = true; return DWARF_CB_ABORT; } return DWARF_CB_OK; @@ -4994,17 +5009,20 @@ void dwarf_cast_expanding_visitor::visit_cast_op (cast_op* e) if (e->module.empty()) e->module = "kernel"; // "*" may also be reasonable to search all kernel modules - if (! s.module_cache) - s.module_cache = new module_cache (); - string code; exp_type type = pe_long; - try + size_t mod_end = -1; + do { + // split the module string by ':' for alternatives + size_t mod_begin = mod_end + 1; + mod_end = e->module.find(':', mod_begin); + string module = e->module.substr(mod_begin, mod_end - mod_begin); + // NB: This uses '/' to distinguish between kernel modules and userspace, // which means that userspace modules won't get any PATH searching. dwflpp* dw; - if (e->module.find('/') == string::npos) + if (module.find('/') == string::npos) { // kernel or kernel module target if (! db.kern_dw) @@ -5016,36 +5034,37 @@ void dwarf_cast_expanding_visitor::visit_cast_op (cast_op* e) } else { - e->module = find_executable (e->module); // canonicalize it + module = find_executable (module); // canonicalize it // user-space target; we use one dwflpp instance per module name // (= program or shared library) - if (db.user_dw.find(e->module) == db.user_dw.end()) + if (db.user_dw.find(module) == db.user_dw.end()) { dw = new dwflpp(s); - dw->setup_user(e->module); - db.user_dw[e->module] = dw; + dw->setup_user(module); + db.user_dw[module] = dw; } else - dw = db.user_dw[e->module]; + dw = db.user_dw[module]; } - dwarf_cast_query q (*dw, *e, lvalue, type); - code = q.get_code(); + dwarf_cast_query q (*dw, module, *e, lvalue, type, code); + dw->query_modules(&q); } - catch (const semantic_error& er) + while (code.empty() && mod_end != string::npos); + + if (code.empty()) { - // We suppress this error message, and pass the unresolved + // We generate an error message, and pass the unresolved // cast_op to the next pass. We hope that this value ends // up not being referenced after all, so it can be optimized out // quietly. - semantic_error* saveme = new semantic_error (er); // copy it - saveme->tok1 = e->tok; // XXX: token not passed to dw code generation routines + semantic_error* er = new semantic_error ("type definition not found", e->tok); // NB: we can have multiple errors, since a @cast // may be expanded in several different contexts: // function ("*") { @cast(...) } - saveme->chain = e->saved_conversion_error; - e->saved_conversion_error = saveme; + er->chain = e->saved_conversion_error; + e->saved_conversion_error = er; provide (e); return; } @@ -5463,8 +5482,7 @@ dwarf_derived_probe_group::emit_module_decls (systemtap_session& s) s.op->line() << "kprobe_idx:0)"; // NB: at least we avoid memory corruption // XXX: it would be nice to give a more verbose error though; BUG_ON later? s.op->line() << "];"; - common_probe_entryfn_prologue (s.op, "STAP_SESSION_RUNNING"); - s.op->newline() << "c->probe_point = sdp->pp;"; + common_probe_entryfn_prologue (s.op, "STAP_SESSION_RUNNING", "sdp->pp"); s.op->newline() << "c->regs = regs;"; s.op->newline() << "(*sdp->ph) (c);"; common_probe_entryfn_epilogue (s.op); @@ -5486,8 +5504,7 @@ dwarf_derived_probe_group::emit_module_decls (systemtap_session& s) // XXX: it would be nice to give a more verbose error though; BUG_ON later? s.op->line() << "];"; - common_probe_entryfn_prologue (s.op, "STAP_SESSION_RUNNING"); - s.op->newline() << "c->probe_point = sdp->pp;"; + common_probe_entryfn_prologue (s.op, "STAP_SESSION_RUNNING", "sdp->pp"); s.op->newline() << "c->regs = regs;"; s.op->newline() << "c->pi = inst;"; // for assisting runtime's backtrace logic s.op->newline() << "(*sdp->ph) (c);"; @@ -5656,10 +5673,6 @@ dwarf_builder::build(systemtap_session & sess, dwflpp* dw = 0; - if (! sess.module_cache) - sess.module_cache = new module_cache (); - - string module_name; if (has_null_param (parameters, TOK_KERNEL) || get_param (parameters, TOK_MODULE, module_name)) @@ -5707,6 +5720,7 @@ dwarf_builder::build(systemtap_session & sess, size_t shstrndx; Elf_Scn *probe_scn = NULL; bool probe_found = false; + bool dynamic = (dwfl_module_relocations (dw->module) == 1); dwfl_assert ("getshstrndx", elf_getshstrndx (elf, &shstrndx)); GElf_Shdr *shdr = NULL; @@ -5724,8 +5738,10 @@ dwarf_builder::build(systemtap_session & sess, break; } } + if (dynamic || sess.listing_mode) + probe_type = dwarf_no_probes; - if (probe_type == probes_and_dwarf && ! sess.listing_mode) + if (probe_type == probes_and_dwarf) { Elf_Data *pdata = elf_getdata_rawchunk (elf, shdr->sh_offset, shdr->sh_size, ELF_T_BYTE); assert (pdata != NULL); @@ -6363,6 +6379,7 @@ itrace_derived_probe_group::emit_module_decls (systemtap_session& s) s.op->newline(); s.op->newline() << "/* ---- itrace probes ---- */"; + s.op->newline() << "#include \"task_finder.c\""; s.op->newline() << "struct stap_itrace_probe {"; s.op->indent(1); s.op->newline() << "struct stap_task_finder_target tgt;"; @@ -6377,8 +6394,7 @@ itrace_derived_probe_group::emit_module_decls (systemtap_session& s) s.op->newline() << "static void enter_itrace_probe(struct stap_itrace_probe *p, struct pt_regs *regs, void *data) {"; s.op->indent(1); - common_probe_entryfn_prologue (s.op, "STAP_SESSION_RUNNING"); - s.op->newline() << "c->probe_point = p->pp;"; + common_probe_entryfn_prologue (s.op, "STAP_SESSION_RUNNING", "p->pp"); s.op->newline() << "c->regs = regs;"; s.op->newline() << "c->data = data;"; @@ -6970,8 +6986,7 @@ utrace_derived_probe_group::emit_module_decls (systemtap_session& s) s.op->newline() << "static void stap_utrace_probe_handler(struct task_struct *tsk, struct stap_utrace_probe *p) {"; s.op->indent(1); - common_probe_entryfn_prologue (s.op, "STAP_SESSION_RUNNING"); - s.op->newline() << "c->probe_point = p->pp;"; + common_probe_entryfn_prologue (s.op, "STAP_SESSION_RUNNING", "p->pp"); // call probe function s.op->newline() << "(*p->ph) (c);"; @@ -6993,8 +7008,7 @@ utrace_derived_probe_group::emit_module_decls (systemtap_session& s) s.op->indent(1); s.op->newline() << "struct stap_utrace_probe *p = (struct stap_utrace_probe *)engine->data;"; - common_probe_entryfn_prologue (s.op, "STAP_SESSION_RUNNING"); - s.op->newline() << "c->probe_point = p->pp;"; + common_probe_entryfn_prologue (s.op, "STAP_SESSION_RUNNING", "p->pp"); s.op->newline() << "c->regs = regs;"; // call probe function @@ -7482,10 +7496,9 @@ uprobe_derived_probe_group::emit_module_decls (systemtap_session& s) s.op->newline() << "static void enter_uprobe_probe (struct uprobe *inst, struct pt_regs *regs) {"; s.op->newline(1) << "struct stap_uprobe *sup = container_of(inst, struct stap_uprobe, up);"; s.op->newline() << "struct stap_uprobe_spec *sups = &stap_uprobe_specs [sup->spec_index];"; - common_probe_entryfn_prologue (s.op, "STAP_SESSION_RUNNING"); + common_probe_entryfn_prologue (s.op, "STAP_SESSION_RUNNING", "sups->pp"); s.op->newline() << "if (sup->spec_index < 0 ||" << "sup->spec_index >= " << probes.size() << ") return;"; // XXX: should not happen - s.op->newline() << "c->probe_point = sups->pp;"; s.op->newline() << "c->regs = regs;"; s.op->newline() << "(*sups->ph) (c);"; common_probe_entryfn_epilogue (s.op); @@ -7494,10 +7507,9 @@ uprobe_derived_probe_group::emit_module_decls (systemtap_session& s) s.op->newline() << "static void enter_uretprobe_probe (struct uretprobe_instance *inst, struct pt_regs *regs) {"; s.op->newline(1) << "struct stap_uprobe *sup = container_of(inst->rp, struct stap_uprobe, urp);"; s.op->newline() << "struct stap_uprobe_spec *sups = &stap_uprobe_specs [sup->spec_index];"; - common_probe_entryfn_prologue (s.op, "STAP_SESSION_RUNNING"); + common_probe_entryfn_prologue (s.op, "STAP_SESSION_RUNNING", "sups->pp"); s.op->newline() << "if (sup->spec_index < 0 ||" << "sup->spec_index >= " << probes.size() << ") return;"; // XXX: should not happen - s.op->newline() << "c->probe_point = sups->pp;"; // XXX: kretprobes saves "c->pi = inst;" too s.op->newline() << "c->regs = regs;"; s.op->newline() << "(*sups->ph) (c);"; @@ -7824,8 +7836,7 @@ timer_derived_probe_group::emit_module_decls (systemtap_session& s) s.op->line() << ");"; s.op->newline(-1) << "{"; s.op->indent(1); - common_probe_entryfn_prologue (s.op, "STAP_SESSION_RUNNING"); - s.op->newline() << "c->probe_point = stp->pp;"; + common_probe_entryfn_prologue (s.op, "STAP_SESSION_RUNNING", "stp->pp"); s.op->newline() << "(*stp->ph) (c);"; common_probe_entryfn_epilogue (s.op); s.op->newline(-1) << "}"; @@ -7947,8 +7958,8 @@ profile_derived_probe_group::emit_module_decls (systemtap_session& s) s.op->newline() << "static void enter_all_profile_probes (struct pt_regs *regs) {"; s.op->indent(1); - common_probe_entryfn_prologue (s.op, "STAP_SESSION_RUNNING"); - s.op->newline() << "c->probe_point = \"timer.profile\";"; // NB: hard-coded for convenience + string pp = lex_cast_qstring("timer.profile"); // hard-coded for convenience + common_probe_entryfn_prologue (s.op, "STAP_SESSION_RUNNING", pp); s.op->newline() << "c->regs = regs;"; for (unsigned i=0; i<probes.size(); i++) @@ -8204,8 +8215,7 @@ procfs_derived_probe_group::emit_module_decls (systemtap_session& s) s.op->newline() << "int bytes = 0;"; s.op->newline() << "string_t strdata = {'\\0'};"; - common_probe_entryfn_prologue (s.op, "STAP_SESSION_RUNNING"); - s.op->newline() << "c->probe_point = spp->read_pp;"; + common_probe_entryfn_prologue (s.op, "STAP_SESSION_RUNNING", "spp->read_pp"); s.op->newline() << "if (c->data == NULL)"; s.op->newline(1) << "c->data = &strdata;"; @@ -8247,8 +8257,7 @@ procfs_derived_probe_group::emit_module_decls (systemtap_session& s) s.op->newline(1) << "struct stap_procfs_probe *spp = (struct stap_procfs_probe *)data;"; s.op->newline() << "string_t strdata = {'\\0'};"; - common_probe_entryfn_prologue (s.op, "STAP_SESSION_RUNNING"); - s.op->newline() << "c->probe_point = spp->write_pp;"; + common_probe_entryfn_prologue (s.op, "STAP_SESSION_RUNNING", "spp->write_pp"); s.op->newline() << "if (count > (MAXSTRINGLEN - 1))"; s.op->newline(1) << "count = MAXSTRINGLEN - 1;"; @@ -8527,6 +8536,7 @@ struct mark_derived_probe: public derived_probe void join_group (systemtap_session& s); void emit_probe_context_vars (translator_output* o); void initialize_probe_context_vars (translator_output* o); + void printargs (std::ostream &o) const; void parse_probe_format (); }; @@ -8971,6 +8981,27 @@ mark_derived_probe::initialize_probe_context_vars (translator_output* o) o->newline() << "deref_fault: ;"; } +void +mark_derived_probe::printargs(std::ostream &o) const +{ + for (unsigned i = 0; i < mark_args.size(); i++) + { + string localname = "$arg" + lex_cast<string>(i+1); + switch (mark_args[i]->stp_type) + { + case pe_long: + o << " " << localname << ":long"; + break; + case pe_string: + o << " " << localname << ":string"; + break; + default: + o << " " << localname << ":unknown"; + break; + } + } +} + void mark_derived_probe_group::emit_module_decls (systemtap_session& s) @@ -9008,8 +9039,7 @@ mark_derived_probe_group::emit_module_decls (systemtap_session& s) s.op->newline(); s.op->newline() << "static void enter_marker_probe (void *probe_data, void *call_data, const char *fmt, va_list *args) {"; s.op->newline(1) << "struct stap_marker_probe *smp = (struct stap_marker_probe *)probe_data;"; - common_probe_entryfn_prologue (s.op, "STAP_SESSION_RUNNING"); - s.op->newline() << "c->probe_point = smp->pp;"; + common_probe_entryfn_prologue (s.op, "STAP_SESSION_RUNNING", "smp->pp"); s.op->newline() << "c->marker_name = smp->name;"; s.op->newline() << "c->marker_format = smp->format;"; s.op->newline() << "c->mark_va_list = args;"; @@ -9199,6 +9229,759 @@ mark_builder::build(systemtap_session & sess, // ------------------------------------------------------------------------ +// statically inserted kernel-tracepoint derived probes +// ------------------------------------------------------------------------ + +struct tracepoint_arg +{ + string name, c_type; + bool used, isptr; + Dwarf_Die type_die; + tracepoint_arg(): used(false), isptr(false) {} +}; + +struct tracepoint_derived_probe: public derived_probe +{ + tracepoint_derived_probe (systemtap_session& s, + dwflpp& dw, Dwarf_Die& func_die, + const string& tracepoint_name, + probe* base_probe, probe_point* location); + + systemtap_session& sess; + string tracepoint_name, header; + vector <struct tracepoint_arg> args; + + void build_args(dwflpp& dw, Dwarf_Die& func_die); + void printargs (std::ostream &o) const; + void join_group (systemtap_session& s); + void emit_probe_context_vars (translator_output* o); +}; + + +struct tracepoint_derived_probe_group: public generic_dpg<tracepoint_derived_probe> +{ + void emit_module_decls (systemtap_session& s); + void emit_module_init (systemtap_session& s); + void emit_module_exit (systemtap_session& s); +}; + + +struct tracepoint_var_expanding_visitor: public var_expanding_visitor +{ + tracepoint_var_expanding_visitor(dwflpp& dw, const string& probe_name, + vector <struct tracepoint_arg>& args): + dw (dw), probe_name (probe_name), args (args) {} + dwflpp& dw; + const string& probe_name; + vector <struct tracepoint_arg>& args; + + void visit_target_symbol (target_symbol* e); + void visit_target_symbol_arg (target_symbol* e); + void visit_target_symbol_context (target_symbol* e); +}; + + +void +tracepoint_var_expanding_visitor::visit_target_symbol_arg (target_symbol* e) +{ + string argname = e->base_name.substr(1); + + // search for a tracepoint parameter matching this name + tracepoint_arg *arg = NULL; + for (unsigned i = 0; i < args.size(); ++i) + if (args[i].name == argname) + { + arg = &args[i]; + arg->used = true; + break; + } + + if (arg == NULL) + { + stringstream alternatives; + for (unsigned i = 0; i < args.size(); ++i) + alternatives << " $" << args[i].name; + alternatives << " $$name $$parms $$vars"; + + // We hope that this value ends up not being referenced after all, so it + // can be optimized out quietly. + semantic_error* saveme = + new semantic_error("unable to find tracepoint variable '" + e->base_name + + "' (alternatives:" + alternatives.str () + ")", e->tok); + // NB: we can have multiple errors, since a target variable + // may be expanded in several different contexts: + // trace ("*") { $foo->bar } + saveme->chain = e->saved_conversion_error; + e->saved_conversion_error = saveme; + provide (e); + return; + } + + // make sure we're not dereferencing base types + if (!e->components.empty() && !arg->isptr) + switch (e->components[0].first) + { + case target_symbol::comp_literal_array_index: + throw semantic_error("tracepoint variable '" + e->base_name + + "' may not be used as array", e->tok); + case target_symbol::comp_struct_member: + throw semantic_error("tracepoint variable '" + e->base_name + + "' may not be used as a structure", e->tok); + default: + throw semantic_error("invalid use of tracepoint variable '" + + e->base_name + "'", e->tok); + } + + // we can only write to dereferenced fields, and only if guru mode is on + bool lvalue = is_active_lvalue(e); + if (lvalue && (!dw.sess.guru_mode || e->components.empty())) + throw semantic_error("write to tracepoint variable '" + e->base_name + + "' not permitted", e->tok); + + if (e->components.empty()) + { + // Synthesize a simple function to grab the parameter + functiondecl *fdecl = new functiondecl; + fdecl->tok = e->tok; + embeddedcode *ec = new embeddedcode; + ec->tok = e->tok; + + string fname = (string("_tracepoint_tvar_get") + + "_" + e->base_name.substr(1) + + "_" + lex_cast<string>(tick++)); + + fdecl->name = fname; + fdecl->body = ec; + fdecl->type = pe_long; + + ec->code = (string("THIS->__retvalue = CONTEXT->locals[0].") + + probe_name + string(".__tracepoint_arg_") + + arg->name + string (";/* pure */")); + + dw.sess.functions[fdecl->name] = fdecl; + + // Synthesize a functioncall. + functioncall* n = new functioncall; + n->tok = e->tok; + n->function = fname; + n->referent = 0; // NB: must not resolve yet, to ensure inclusion in session + + provide (n); + } + else + { + // Synthesize a function to dereference the dwarf fields, + // with a pointer parameter that is the base tracepoint variable + functiondecl *fdecl = new functiondecl; + fdecl->tok = e->tok; + embeddedcode *ec = new embeddedcode; + ec->tok = e->tok; + + string fname = (string(lvalue ? "_tracepoint_tvar_set" : "_tracepoint_tvar_get") + + "_" + e->base_name.substr(1) + + "_" + lex_cast<string>(tick++)); + + fdecl->name = fname; + fdecl->body = ec; + + try + { + ec->code = dw.literal_stmt_for_pointer (&arg->type_die, e->components, + lvalue, fdecl->type); + } + catch (const semantic_error& er) + { + // We suppress this error message, and pass the unresolved + // variable to the next pass. We hope that this value ends + // up not being referenced after all, so it can be optimized out + // quietly. + semantic_error* saveme = new semantic_error (er); // copy it + saveme->tok1 = e->tok; // XXX: token not passed to dw code generation routines + // NB: we can have multiple errors, since a target variable + // may be expanded in several different contexts: + // trace ("*") { $foo->bar } + saveme->chain = e->saved_conversion_error; + e->saved_conversion_error = saveme; + provide (e); + return; + } + + // Give the fdecl an argument for the raw tracepoint value + vardecl *v1 = new vardecl; + v1->type = pe_long; + v1->name = "pointer"; + v1->tok = e->tok; + fdecl->formal_args.push_back(v1); + + if (lvalue) + { + // Modify the fdecl so it carries a pe_long formal + // argument called "value". + + // FIXME: For the time being we only support setting target + // variables which have base types; these are 'pe_long' in + // stap's type vocabulary. Strings and pointers might be + // reasonable, some day, but not today. + + vardecl *v2 = new vardecl; + v2->type = pe_long; + v2->name = "value"; + v2->tok = e->tok; + fdecl->formal_args.push_back(v2); + } + else + ec->code += "/* pure */"; + + dw.sess.functions[fdecl->name] = fdecl; + + // Synthesize a functioncall. + functioncall* n = new functioncall; + n->tok = e->tok; + n->function = fname; + n->referent = 0; // NB: must not resolve yet, to ensure inclusion in session + + // make the original a bare target symbol for the tracepoint value, + // which will be passed into the dwarf dereferencing code + e->components.clear(); + n->args.push_back(require(e)); + + if (lvalue) + { + // Provide the functioncall to our parent, so that it can be + // used to substitute for the assignment node immediately above + // us. + assert(!target_symbol_setter_functioncalls.empty()); + *(target_symbol_setter_functioncalls.top()) = n; + } + + provide (n); + } +} + + +void +tracepoint_var_expanding_visitor::visit_target_symbol_context (target_symbol* e) +{ + if (is_active_lvalue (e)) + throw semantic_error("write to tracepoint '" + e->base_name + "' not permitted", e->tok); + + if (!e->components.empty()) + switch (e->components[0].first) + { + case target_symbol::comp_literal_array_index: + throw semantic_error("tracepoint '" + e->base_name + "' may not be used as array", + e->tok); + case target_symbol::comp_struct_member: + throw semantic_error("tracepoint '" + e->base_name + "' may not be used as a structure", + e->tok); + default: + throw semantic_error("invalid tracepoint '" + e->base_name + "' use", e->tok); + } + + if (e->base_name == "$$name") + { + // Synthesize a functioncall. + functioncall* n = new functioncall; + n->tok = e->tok; + n->function = "_mark_name_get"; + n->referent = 0; // NB: must not resolve yet, to ensure inclusion in session + provide (n); + } + else if (e->base_name == "$$vars" || e->base_name == "$$parms") + { + target_symbol *tsym = new target_symbol; + print_format* pf = new print_format; + + // Convert $$vars to sprintf of a list of vars which we recursively evaluate + // NB: we synthesize a new token here rather than reusing + // e->tok, because print_format::print likes to use + // its tok->content. + token* pf_tok = new token(*e->tok); + pf_tok->content = "sprintf"; + + pf->tok = pf_tok; + pf->print_to_stream = false; + pf->print_with_format = true; + pf->print_with_delim = false; + pf->print_with_newline = false; + pf->print_char = false; + + for (unsigned i = 0; i < args.size(); ++i) + { + if (i > 0) + pf->raw_components += " "; + pf->raw_components += args[i].name; + tsym->tok = e->tok; + tsym->base_name = "$" + args[i].name; + + // every variable should always be accessible! + tsym->saved_conversion_error = 0; + expression *texp = require (tsym); // NB: throws nothing ... + assert (!tsym->saved_conversion_error); // ... but this is how we know it happened. + + pf->raw_components += "=%#x"; + pf->args.push_back(texp); + } + + pf->components = print_format::string_to_components(pf->raw_components); + provide (pf); + } + else + assert(0); // shouldn't get here +} + +void +tracepoint_var_expanding_visitor::visit_target_symbol (target_symbol* e) +{ + assert(e->base_name.size() > 0 && e->base_name[0] == '$'); + + if (e->base_name == "$$name" || + e->base_name == "$$parms" || + e->base_name == "$$vars") + visit_target_symbol_context (e); + else + visit_target_symbol_arg (e); +} + + + +tracepoint_derived_probe::tracepoint_derived_probe (systemtap_session& s, + dwflpp& dw, Dwarf_Die& func_die, + const string& tracepoint_name, + probe* base, probe_point* loc): + derived_probe (base, new probe_point(*loc) /* .components soon rewritten */), + sess (s), tracepoint_name (tracepoint_name) +{ + // create synthetic probe point name; preserve condition + vector<probe_point::component*> comps; + comps.push_back (new probe_point::component (TOK_KERNEL)); + comps.push_back (new probe_point::component (TOK_TRACE, new literal_string (tracepoint_name))); + this->sole_location()->components = comps; + + // fill out the available arguments in this tracepoint + build_args(dw, func_die); + + // determine which header defined this tracepoint + string decl_file = dwarf_decl_file(&func_die); + size_t header_pos = decl_file.rfind("trace/"); + if (header_pos == string::npos) + throw semantic_error ("cannot parse header location for tracepoint '" + + tracepoint_name + "' in '" + + decl_file + "'"); + header = decl_file.substr(header_pos); + + // tracepoints from FOO_event_types.h should really be included from FOO.h + // XXX can dwarf tell us the include hierarchy? it would be better to + // ... walk up to see which one was directly included by tracequery.c + header_pos = header.find("_event_types"); + if (header_pos != string::npos) + header.erase(header_pos, 12); + + // Now expand the local variables in the probe body + tracepoint_var_expanding_visitor v (dw, name, args); + this->body = v.require (this->body); + + if (sess.verbose > 2) + clog << "tracepoint-based " << name << " tracepoint='" << tracepoint_name + << "'" << endl; +} + + +static bool +dwarf_type_name(Dwarf_Die& type_die, string& c_type) +{ + // if this die has a direct name, then we're done + const char *diename = dwarf_diename_integrate(&type_die); + if (diename != NULL) + { + switch (dwarf_tag(&type_die)) + { + case DW_TAG_structure_type: + c_type.append("struct "); + break; + case DW_TAG_union_type: + c_type.append("union "); + break; + } + c_type.append(diename); + return true; + } + + // otherwise, this die is a type modifier. + + // recurse into the referent type + Dwarf_Attribute subtype_attr; + Dwarf_Die subtype_die; + if (!dwarf_attr_integrate(&type_die, DW_AT_type, &subtype_attr) + || !dwarf_formref_die(&subtype_attr, &subtype_die) + || !dwarf_type_name(subtype_die, c_type)) + return false; + + const char *suffix = NULL; + switch (dwarf_tag(&type_die)) + { + case DW_TAG_pointer_type: + suffix = "*"; + break; + case DW_TAG_array_type: + suffix = "[]"; + break; + case DW_TAG_const_type: + suffix = " const"; + break; + case DW_TAG_volatile_type: + suffix = " volatile"; + break; + default: + return false; + } + c_type.append(suffix); + return true; +} + + +static bool +resolve_tracepoint_arg_type(Dwarf_Die& type_die, bool& isptr) +{ + Dwarf_Attribute type_attr; + switch (dwarf_tag(&type_die)) + { + case DW_TAG_typedef: + case DW_TAG_const_type: + case DW_TAG_volatile_type: + // iterate on the referent type + return (dwarf_attr_integrate(&type_die, DW_AT_type, &type_attr) + && dwarf_formref_die(&type_attr, &type_die) + && resolve_tracepoint_arg_type(type_die, isptr)); + case DW_TAG_base_type: + // base types will simply be treated as script longs + isptr = false; + return true; + case DW_TAG_pointer_type: + // pointers can be either script longs, + // or dereferenced with their referent type + isptr = true; + return (dwarf_attr_integrate(&type_die, DW_AT_type, &type_attr) + && dwarf_formref_die(&type_attr, &type_die)); + default: + // should we consider other types too? + return false; + } +} + + +void +tracepoint_derived_probe::build_args(dwflpp& dw, Dwarf_Die& func_die) +{ + Dwarf_Die arg; + if (dwarf_child(&func_die, &arg) == 0) + do + if (dwarf_tag(&arg) == DW_TAG_formal_parameter) + { + // build a tracepoint_arg for this parameter + tracepoint_arg tparg; + tparg.name = dwarf_diename_integrate(&arg); + + // read the type of this parameter + Dwarf_Attribute type_attr; + if (!dwarf_attr_integrate (&arg, DW_AT_type, &type_attr) + || !dwarf_formref_die (&type_attr, &tparg.type_die) + || !dwarf_type_name(tparg.type_die, tparg.c_type) + || !resolve_tracepoint_arg_type(tparg.type_die, tparg.isptr)) + throw semantic_error ("cannot get type of tracepoint '" + + tracepoint_name + "' parameter '" + + tparg.name + "'"); + + args.push_back(tparg); + if (sess.verbose > 4) + clog << "found parameter for tracepoint '" << tracepoint_name + << "': type:'" << tparg.c_type + << "' name:'" << tparg.name << "'" << endl; + } + while (dwarf_siblingof(&arg, &arg) == 0); +} + +void +tracepoint_derived_probe::printargs(std::ostream &o) const +{ + for (unsigned i = 0; i < args.size(); ++i) + o << " $" << args[i].name << ":" << args[i].c_type; +} + +void +tracepoint_derived_probe::join_group (systemtap_session& s) +{ + if (! s.tracepoint_derived_probes) + s.tracepoint_derived_probes = new tracepoint_derived_probe_group (); + s.tracepoint_derived_probes->enroll (this); +} + + +void +tracepoint_derived_probe::emit_probe_context_vars (translator_output* o) +{ + for (unsigned i = 0; i < args.size(); i++) + if (args[i].used) + o->newline() << "int64_t __tracepoint_arg_" << args[i].name << ";"; +} + + +void +tracepoint_derived_probe_group::emit_module_decls (systemtap_session& s) +{ + if (probes.empty()) + return; + + s.op->newline() << "/* ---- tracepoint probes ---- */"; + s.op->newline(); + + for (unsigned i = 0; i < probes.size(); ++i) + { + tracepoint_derived_probe *p = probes[i]; + + // emit a separate entry function for each probe, since tracepoints + // don't provide any sort of context pointer. + s.op->newline() << "#include <" << p->header << ">"; + s.op->newline() << "static void enter_tracepoint_probe_" << i << "("; + for (unsigned j = 0; j < p->args.size(); ++j) + { + if (j > 0) + s.op->line() << ", "; + s.op->line() << p->args[j].c_type << " __tracepoint_arg_" << p->args[j].name; + } + s.op->line() << ") {"; + s.op->indent(1); + common_probe_entryfn_prologue (s.op, "STAP_SESSION_RUNNING", + lex_cast_qstring (*p->sole_location())); + s.op->newline() << "c->marker_name = " + << lex_cast_qstring (p->tracepoint_name) + << ";"; + for (unsigned j = 0; j < p->args.size(); ++j) + if (p->args[j].used) + { + s.op->newline() << "c->locals[0]." << p->name << ".__tracepoint_arg_" + << p->args[j].name << " = (int64_t)"; + if (p->args[j].isptr) + s.op->line() << "(intptr_t)"; + s.op->line() << "__tracepoint_arg_" << p->args[j].name << ";"; + } + s.op->newline() << p->name << " (c);"; + common_probe_entryfn_epilogue (s.op); + s.op->newline(-1) << "}"; + + // emit normalized registration functions + s.op->newline() << "static int register_tracepoint_probe_" << i << "(void) {"; + s.op->newline(1) << "return register_trace_" << p->tracepoint_name + << "(enter_tracepoint_probe_" << i << ");"; + s.op->newline(-1) << "}"; + s.op->newline() << "static int unregister_tracepoint_probe_" << i << "(void) {"; + s.op->newline(1) << "return unregister_trace_" << p->tracepoint_name + << "(enter_tracepoint_probe_" << i << ");"; + s.op->newline(-1) << "}"; + s.op->newline(); + } + + // emit an array of registration functions for easy init/shutdown + s.op->newline() << "static struct stap_tracepoint_probe {"; + s.op->newline(1) << "int (*reg)(void);"; + s.op->newline(0) << "int (*unreg)(void);"; + s.op->newline(-1) << "} stap_tracepoint_probes[] = {"; + s.op->indent(1); + for (unsigned i = 0; i < probes.size(); ++i) + { + s.op->newline () << "{"; + s.op->line() << " .reg=®ister_tracepoint_probe_" << i << ","; + s.op->line() << " .unreg=&unregister_tracepoint_probe_" << i; + s.op->line() << " },"; + } + s.op->newline(-1) << "};"; + s.op->newline(); +} + + +void +tracepoint_derived_probe_group::emit_module_init (systemtap_session &s) +{ + if (probes.size () == 0) + return; + + s.op->newline() << "/* init tracepoint probes */"; + s.op->newline() << "for (i=0; i<" << probes.size() << "; i++) {"; + s.op->newline(1) << "rc = stap_tracepoint_probes[i].reg();"; + s.op->newline() << "if (rc) {"; + s.op->newline(1) << "for (j=i-1; j>=0; j--)"; // partial rollback + s.op->newline(1) << "stap_tracepoint_probes[j].unreg();"; + s.op->newline(-1) << "break;"; // don't attempt to register any more probes + s.op->newline(-1) << "}"; + s.op->newline(-1) << "}"; + + // This would be technically proper (on those autoconf-detectable + // kernels that include this function in tracepoint.h), however we + // already make several calls to synchronze_sched() during our + // shutdown processes. + + // s.op->newline() << "if (rc)"; + // s.op->newline(1) << "tracepoint_synchronize_unregister();"; + // s.op->indent(-1); +} + + +void +tracepoint_derived_probe_group::emit_module_exit (systemtap_session& s) +{ + if (probes.empty()) + return; + + s.op->newline() << "/* deregister tracepoint probes */"; + s.op->newline() << "for (i=0; i<" << probes.size() << "; i++)"; + s.op->newline(1) << "stap_tracepoint_probes[i].unreg();"; + s.op->indent(-1); + + // Not necessary: see above. + + // s.op->newline() << "tracepoint_synchronize_unregister();"; +} + + +struct tracepoint_query : public base_query +{ + tracepoint_query(dwflpp & dw, const string & tracepoint, + probe * base_probe, probe_point * base_loc, + vector<derived_probe *> & results): + base_query(dw, "*"), tracepoint(tracepoint), + base_probe(base_probe), base_loc(base_loc), + results(results) {} + + const string& tracepoint; + + probe * base_probe; + probe_point * base_loc; + vector<derived_probe *> & results; + + void handle_query_module(); + int handle_query_cu(Dwarf_Die * cudie); + int handle_query_func(Dwarf_Die * func); + + static int tracepoint_query_cu (Dwarf_Die * cudie, void * arg); + static int tracepoint_query_func (Dwarf_Die * func, base_query * query); +}; + + +void +tracepoint_query::handle_query_module() +{ + // look for the tracepoints in each CU + dw.iterate_over_cus(tracepoint_query_cu, this); +} + + +int +tracepoint_query::handle_query_cu(Dwarf_Die * cudie) +{ + dw.focus_on_cu (cudie); + + // look at each function to see if it's a tracepoint + string function = "stapprobe_" + tracepoint; + return dw.iterate_over_functions (tracepoint_query_func, this, function); +} + + +int +tracepoint_query::handle_query_func(Dwarf_Die * func) +{ + dw.focus_on_function (func); + + assert(dw.function_name.compare(0, 10, "stapprobe_") == 0); + string tracepoint_instance = dw.function_name.substr(10); + derived_probe *dp = new tracepoint_derived_probe (dw.sess, dw, *func, + tracepoint_instance, + base_probe, base_loc); + results.push_back (dp); + return DWARF_CB_OK; +} + + +int +tracepoint_query::tracepoint_query_cu (Dwarf_Die * cudie, void * arg) +{ + tracepoint_query * q = static_cast<tracepoint_query *>(arg); + if (pending_interrupts) return DWARF_CB_ABORT; + return q->handle_query_cu(cudie); +} + + +int +tracepoint_query::tracepoint_query_func (Dwarf_Die * func, base_query * query) +{ + tracepoint_query * q = static_cast<tracepoint_query *>(query); + if (pending_interrupts) return DWARF_CB_ABORT; + return q->handle_query_func(func); +} + + +struct tracepoint_builder: public derived_probe_builder +{ +private: + dwflpp *dw; + bool init_dw(systemtap_session& s); + +public: + tracepoint_builder(): dw(0) {} + ~tracepoint_builder() { delete dw; } + + void build_no_more (systemtap_session& s) + { + if (dw && s.verbose > 3) + clog << "tracepoint_builder releasing dwflpp" << endl; + delete dw; + dw = NULL; + } + + void build(systemtap_session& s, + probe *base, probe_point *location, + literal_map_t const& parameters, + vector<derived_probe*>& finished_results); +}; + + +bool +tracepoint_builder::init_dw(systemtap_session& s) +{ + if (dw != NULL) + return true; + + string tracequery_ko; + int rc = make_tracequery(s, tracequery_ko); + if (rc != 0) + return false; + + // TODO cache tracequery.ko + + dw = new dwflpp(s); + dw->setup_user(tracequery_ko); + return true; +} + + +void +tracepoint_builder::build(systemtap_session& s, + probe *base, probe_point *location, + literal_map_t const& parameters, + vector<derived_probe*>& finished_results) +{ + if (!init_dw(s)) + return; + + string tracepoint; + assert(get_param (parameters, TOK_TRACE, tracepoint)); + + tracepoint_query q(*dw, tracepoint, base, location, finished_results); + dw->query_modules(&q); +} + + + +// ------------------------------------------------------------------------ // hrtimer derived probes // ------------------------------------------------------------------------ // This is a new timer interface that provides more flexibility in specifying @@ -9337,8 +10120,7 @@ hrtimer_derived_probe_group::emit_module_decls (systemtap_session& s) s.op->newline(-1) << "}"; s.op->newline() << "{"; s.op->indent(1); - common_probe_entryfn_prologue (s.op, "STAP_SESSION_RUNNING"); - s.op->newline() << "c->probe_point = stp->pp;"; + common_probe_entryfn_prologue (s.op, "STAP_SESSION_RUNNING", "stp->pp"); s.op->newline() << "(*stp->ph) (c);"; common_probe_entryfn_epilogue (s.op); s.op->newline(-1) << "}"; @@ -9702,7 +10484,8 @@ perfmon_derived_probe::emit_probe_entries (translator_output * o) emit_probe_prologue (o, (mode == perfmon_count ? "STAP_SESSION_STARTING" : - "STAP_SESSION_RUNNING")); + "STAP_SESSION_RUNNING"), + "probe_point"); // NB: locals are initialized by probe function itself o->newline() << name << " (c);"; @@ -10000,6 +10783,10 @@ register_standard_tapsets(systemtap_session & s) s.pattern_root->bind(TOK_KERNEL)->bind_str(TOK_MARK)->bind_str(TOK_FORMAT) ->bind(new mark_builder()); + // kernel tracepoint probes + s.pattern_root->bind(TOK_KERNEL)->bind_str(TOK_TRACE) + ->bind(new tracepoint_builder()); + // procfs parts s.pattern_root->bind(TOK_PROCFS)->bind(TOK_READ)->bind(new procfs_builder()); s.pattern_root->bind_str(TOK_PROCFS)->bind(TOK_READ) @@ -10028,6 +10815,7 @@ all_session_groups(systemtap_session& s) DOONE(timer); DOONE(profile); DOONE(mark); + DOONE(tracepoint); DOONE(hrtimer); DOONE(perfmon); DOONE(procfs); diff --git a/testsuite/lib/stap_run2.exp b/testsuite/lib/stap_run2.exp index 9849aefb..cb1c6615 100644 --- a/testsuite/lib/stap_run2.exp +++ b/testsuite/lib/stap_run2.exp @@ -29,5 +29,10 @@ proc stap_run2 { TEST_NAME args } { } incr n } - pass "$TEST_NAME" + if {[expr $n == [llength $expected]]} { + pass "$TEST_NAME" + } else { + fail "$TEST_NAME" + send_log "too few lines of output, got $n, expected [llength $expected]\n" + } } diff --git a/testsuite/semok/badvar.stp b/testsuite/semok/badvar.stp new file mode 100755 index 00000000..b3bd2d67 --- /dev/null +++ b/testsuite/semok/badvar.stp @@ -0,0 +1,7 @@ +#! stap --skip-badvars + +probe syscall.read { + if ($foo == 0) + printf ("Voila! It works..\n") + exit () +} diff --git a/testsuite/semok/cast.stp b/testsuite/semok/cast.stp new file mode 100755 index 00000000..93da18ef --- /dev/null +++ b/testsuite/semok/cast.stp @@ -0,0 +1,13 @@ +#! stap -p2 + +probe begin { + // basic @cast test, with and without specifying kernel + println(@cast(0, "task_struct")->tgid) + println(@cast(0, "task_struct", "kernel")->tgid) + + // check module-search paths + println(@cast(0, "task_struct", "foo:kernel:bar")->tgid) + + // would be nice to test usermode @cast too, + // but who knows what debuginfo is installed... +} diff --git a/testsuite/systemtap.base/cast.exp b/testsuite/systemtap.base/cast.exp new file mode 100644 index 00000000..df3246e8 --- /dev/null +++ b/testsuite/systemtap.base/cast.exp @@ -0,0 +1,4 @@ +set test "cast" +set ::result_string {PID OK +execname OK} +stap_run2 $srcdir/$subdir/$test.stp diff --git a/testsuite/systemtap.base/cast.stp b/testsuite/systemtap.base/cast.stp new file mode 100644 index 00000000..bec0cc9b --- /dev/null +++ b/testsuite/systemtap.base/cast.stp @@ -0,0 +1,22 @@ +probe begin +{ + curr = task_current() + + // Compare PIDs + pid = pid() + cast_pid = @cast(curr, "task_struct")->tgid + if (pid == cast_pid) + println("PID OK") + else + printf("PID %d != %d\n", pid, cast_pid) + + // Compare execnames + name = execname() + cast_name = kernel_string(@cast(curr, "task_struct")->comm) + if (name == cast_name) + println("execname OK") + else + printf("execname \"%s\" != \"%s\"\n", name, cast_name) + + exit() +} diff --git a/testsuite/systemtap.base/ctime.exp b/testsuite/systemtap.base/ctime.exp index f6db096a..d5ae07d5 100644 --- a/testsuite/systemtap.base/ctime.exp +++ b/testsuite/systemtap.base/ctime.exp @@ -13,6 +13,5 @@ a long, long time ago... Tue Jan 19 03:14:07 2038 far far in the future... a long, long time ago... -far far in the future... -} +far far in the future...} stap_run2 $srcdir/$subdir/$test.stp diff --git a/testsuite/systemtap.base/labels.exp b/testsuite/systemtap.base/labels.exp index 9c92d69c..6db81c54 100644 --- a/testsuite/systemtap.base/labels.exp +++ b/testsuite/systemtap.base/labels.exp @@ -13,6 +13,7 @@ if {$utrace_support_found == 0} { untested "$test"; return } # Compile a C program to use as the user-space probing target set label_srcpath "[pwd]/labels.c" set label_exepath "[pwd]/labels.x" +set label_sopath "[pwd]/labels.so" set label_flags "additional_flags=-g" set fp [open $label_srcpath "w"] puts $fp " @@ -54,9 +55,12 @@ if { $res != "" } { pass "compiling labels.c -g" } +# label in an executable + verbose -log "spawn stap -c $label_exepath $label_stppath" spawn stap -c $label_exepath $label_stppath +wait expect { -timeout 180 -re {VARS a=0x0 b=0x0.*VARS a=0x2 b=0x0.*VARS a=0x2 b=0x3 c=0x[a-f01-9]} { incr ok; exp_continue } @@ -64,7 +68,83 @@ expect { eof { } } -wait +if {$ok == 1} { pass "$test exe .label" } { fail "$test exe .label" } + +# address of label in an executable + +set label_shpath "[pwd]/label.sh" +set fp [open $label_shpath "w"] +puts $fp " +readelf --debug-dump $label_exepath | awk \" +/init_another_int/ {have_label=1} +/DW_AT_low_pc/ {if (have_label) {print \$3;exit;}} +\" +" +close $fp +spawn sh $label_shpath +expect { + -re {0x[0-9a-f]*} +} +set nomatch 0 +spawn stap -p2 -l "process\(\"$label_exepath\"\).statement($expect_out(0,string))" +expect { + -timeout 180 + -re {semantic error: no match} { incr nomatch; exp_continue } + timeout { fail "$test (timeout)" } + eof { } +} + +if {$nomatch == 0} { pass "$test exe .statement" } { fail "$test exe .statement" } + +set ok 0 + +set label_flags "additional_flags=-g additional_flags=-shared additional_flags=-fPIC" +set res [target_compile $label_srcpath $label_sopath executable $label_flags] +if { $res != "" } { + verbose "target_compile failed: $res" 2 + fail "compiling labels.c -g" + catch {exec rm -f $label_srcpath $label_stppath} + return +} else { + pass "compiling labels.c -g" +} + +# label in a shared object + +spawn stap -p2 -l "process\(\"$label_sopath\"\).function\(\"\*\"\).label\(\"init_another_int\"\)" +expect { + -timeout 180 + -re {process.*function} { incr ok; exp_continue } + timeout { fail "$test (timeout)" } + eof { } +} + +if {$ok == 1} { pass "$test so .label" } { fail "$test so .label" } + +# address of label in a shared object + +set label_shpath "[pwd]/label.sh" +set fp [open $label_shpath "w"] +puts $fp " +readelf --debug-dump $label_sopath | awk \" +/init_another_int/ {have_label=1} +/DW_AT_low_pc/ {if (have_label) {print \$3;exit;}} +\" +" +close $fp +spawn sh $label_shpath +expect { + -re {0x[0-9a-f]*} +} +set nomatch 0 +spawn stap -p2 -l "process\(\"$label_sopath\"\).statement($expect_out(0,string))" +expect { + -timeout 180 + -re {semantic error: no match} { incr nomatch; exp_continue } + timeout { fail "$test (timeout)" } + eof { } +} + +if {$nomatch == 0} { pass "$test so .statement" } { fail "$test so .statement" } -if {$ok == 1} { pass "$test" } { fail "$test ($ok)" } -catch {exec rm -f $label_srcpath $label_stppath $label_exepath} +catch {exec rm -f $label_srcpath $label_stppath $label_exepath $label_shpath $label_sopath} diff --git a/testsuite/systemtap.base/limits.exp b/testsuite/systemtap.base/limits.exp index c5328e8f..c04d507d 100644 --- a/testsuite/systemtap.base/limits.exp +++ b/testsuite/systemtap.base/limits.exp @@ -32,7 +32,6 @@ Minimum signed 64-bit number -9223372036854775808 0x8000000000000000 -9223372036854775808 0x8000000000000000 -9223372036854775808 0x8000000000000000 --9223372036854775808 0x8000000000000000 -} +-9223372036854775808 0x8000000000000000} stap_run2 $srcdir/$subdir/$test.stp diff --git a/testsuite/systemtap.base/overflow_error.exp b/testsuite/systemtap.base/overflow_error.exp new file mode 100644 index 00000000..33be90a7 --- /dev/null +++ b/testsuite/systemtap.base/overflow_error.exp @@ -0,0 +1,32 @@ +# Test overflow errors point to the correct thing. + +set test "overflow_error" +if {![installtest_p]} { untested $test; return } + +set error_msg1 "ERROR: Array overflow, check size limit (3) near identifier 'overflow1' at $srcdir/$subdir/$test.stp" +set error_msg2 "ERROR: Array overflow, check size limit (5) near identifier 'overflow2' at $srcdir/$subdir/$test.stp" +set exit_warning "WARNING: Number of errors: 2, skipped probes: 0" + +set pass 0 + +spawn stap -DMAXERRORS=1 $srcdir/$subdir/$test.stp +expect { + $error_msg1 {incr pass; exp_continue} + $error_msg2 {incr pass; exp_continue} + $exit_warning {incr pass; exp_continue} + timeout { + exec kill -INT -[exp_pid] + fail "$test timed out" + } + eof {} +} +catch { close } +wait + +if {$pass == 3} { + pass $test +} else { + fail "$test ($pass)" +} + + diff --git a/testsuite/systemtap.base/overflow_error.stp b/testsuite/systemtap.base/overflow_error.stp new file mode 100644 index 00000000..f5a3e917 --- /dev/null +++ b/testsuite/systemtap.base/overflow_error.stp @@ -0,0 +1,22 @@ +# overflow some stuff to see if error message point to the correct thing. +global count; +global overflow1[3]; +global overflow2[5]; + +probe timer.ms(10) +{ + if (count <= 3) + { + overflow1[count++] = gettimeofday_ns(); + } + else + { + overflow2[count++] <<< gettimeofday_ns(); + } +} + +probe timer.s(3) +{ + exit(); +} + diff --git a/testsuite/systemtap.base/sdt.c b/testsuite/systemtap.base/sdt.c new file mode 100644 index 00000000..7c7398e5 --- /dev/null +++ b/testsuite/systemtap.base/sdt.c @@ -0,0 +1,71 @@ +#include "sdt.h" /* Really <sys/sdt.h>, but pick current source version. */ + +static void call1(int a) +{ + STAP_PROBE1(test, mark_a, a); +} + +static void call2(int a, int b) +{ + STAP_PROBE2(test, mark_b, a, b); +} + +static void call3(int a, int b, int c) +{ + STAP_PROBE3(test, mark_c, a, b, c); +} + +static void call4(int a, int b, int c, int d) +{ + STAP_PROBE4(test, mark_d, a, b, c, d); +} + +static void call5(int a, int b, int c, int d, int e) +{ + STAP_PROBE5(test, mark_e, a, b, c, d, e); +} + +static void call6(int a, int b, int c, int d, int e, int f) +{ + STAP_PROBE6(test, mark_f, a, b, c, d, e, f); +} + +static void call7(int a, int b, int c, int d, int e, int f, int g) +{ + STAP_PROBE7(test, mark_g, a, b, c, d, e, f, g); +} + +static void call8(int a, int b, int c, int d, int e, int f, int g, int h) +{ + STAP_PROBE8(test, mark_h, a, b, c, d, e, f, g, h); +} + +static void call9(int a, int b, int c, int d, int e, int f, int g, int h, int i) +{ + STAP_PROBE9(test, mark_i, a, b, c, d, e, f, g, h, i); +} + +static void call10(int a, int b, int c, int d, int e, int f, int g, int h, int i, int j) +{ + STAP_PROBE10(test, mark_j, a, b, c, d, e, f, g, h, i, j); +} + +int +main (int argc, char **argv) +{ + int a, b, c, d, e, f, g, h, i, j; + a = 1; b = 2; c = 3; d = 4; e = 5; f = 6; g = 7; h = 8; i = 9; j = 10; + call1(a); + call2(a, b); + call3(a, b, c); + call4(a, b, c, d); + call5(a, b, c, d, e); + call6(a, b, c, d, e, f); + call7(a, b, c, d, e, f, g); + call8(a, b, c, d, e, f, g, h); + call9(a, b, c, d, e, f, g, h, i); + call10(a, b, c, d, e, f, g, h, i, j); + (void) argv; + (void) argc; + return 0; +} diff --git a/testsuite/systemtap.base/sdt.exp b/testsuite/systemtap.base/sdt.exp new file mode 100644 index 00000000..74818beb --- /dev/null +++ b/testsuite/systemtap.base/sdt.exp @@ -0,0 +1,66 @@ +set test "sdt" +set ::result_string {1 +1 2 +1 2 3 +1 2 3 4 +1 2 3 4 5 +1 2 3 4 5 6 +1 2 3 4 5 6 7 +1 2 3 4 5 6 7 8 +1 2 3 4 5 6 7 8 9 +1 2 3 4 5 6 7 8 9 10} + +set extra_flags {{""} {additional_flags=-std=gnu89} {additional_flags=-ansi} {additional_flags=-pedantic}} + +# Iterate extra_flags, trying each with C and C++ +for {set i 0} {$i < [llength $extra_flags]} {incr i} { +set extra_flag [lindex $extra_flags $i] + +# C +set test_flags "additional_flags=-g" +set test_flags "$test_flags additional_flags=-I$srcdir/../includes/sys" +set test_flags "$test_flags additional_flags=-Wall" +set test_flags "$test_flags additional_flags=-Wextra" +set test_flags "$test_flags additional_flags=-Werror" + +set res [target_compile $srcdir/$subdir/$test.c $test.prog executable "$test_flags $extra_flag"] +if { $res != "" } { + verbose "target_compile failed: $res" 2 + fail "compiling $test.c $extra_flag" + return +} else { + pass "compiling $test.c $extra_flag" +} + +if {[installtest_p]} { +# XXX: we need distinct test names for these + stap_run2 $srcdir/$subdir/$test.stp -c ./$test.prog +} else { + untested "$test $extra_flag" +} + +# C++ +set test_flags "additional_flags=-g" +set test_flags "$test_flags additional_flags=-I$srcdir/../includes/sys" +set test_flags "$test_flags additional_flags=-Wall" +set test_flags "$test_flags additional_flags=-Werror" +set test_flags "$test_flags additional_flags=-x additional_flags=c++" + +set res [target_compile $srcdir/$subdir/$test.c $test.prog executable "$test_flags $extra_flag"] +if { $res != "" } { + verbose "target_compile failed: $res" 2 + fail "compiling $test.c c++ $extra_flag" + return +} else { + pass "compiling $test.c c++ $extra_flag" +} + +if {[installtest_p]} { +# XXX: we need distinct test names for these + stap_run2 $srcdir/$subdir/$test.stp -c ./$test.prog +} else { + untested "$test c++ $extra_flag" +} +} + +catch {exec rm -f $test.prog} diff --git a/testsuite/systemtap.base/sdt.stp b/testsuite/systemtap.base/sdt.stp new file mode 100644 index 00000000..1f075bca --- /dev/null +++ b/testsuite/systemtap.base/sdt.stp @@ -0,0 +1,49 @@ +probe process("sdt.prog").mark("mark_a") +{ + printf("%d\n", $arg1); +} + +probe process("sdt.prog").mark("mark_b") +{ + printf("%d %d\n", $arg1, $arg2); +} + +probe process("sdt.prog").mark("mark_c") +{ + printf("%d %d %d\n", $arg1, $arg2, $arg3); +} + +probe process("sdt.prog").mark("mark_d") +{ + printf("%d %d %d %d\n", $arg1, $arg2, $arg3, $arg4); +} + +probe process("sdt.prog").mark("mark_e") +{ + printf("%d %d %d %d %d\n", $arg1, $arg2, $arg3, $arg4, $arg5); +} + +probe process("sdt.prog").mark("mark_f") +{ + printf("%d %d %d %d %d %d\n", $arg1, $arg2, $arg3, $arg4, $arg5, $arg6); +} + +probe process("sdt.prog").mark("mark_g") +{ + printf("%d %d %d %d %d %d %d\n", $arg1, $arg2, $arg3, $arg4, $arg5, $arg6, $arg7); +} + +probe process("sdt.prog").mark("mark_h") +{ + printf("%d %d %d %d %d %d %d %d\n", $arg1, $arg2, $arg3, $arg4, $arg5, $arg6, $arg7, $arg8); +} + +probe process("sdt.prog").mark("mark_i") +{ + printf("%d %d %d %d %d %d %d %d %d\n", $arg1, $arg2, $arg3, $arg4, $arg5, $arg6, $arg7, $arg8, $arg9); +} + +probe process("sdt.prog").mark("mark_j") +{ + printf("%d %d %d %d %d %d %d %d %d %d\n", $arg1, $arg2, $arg3, $arg4, $arg5, $arg6, $arg7, $arg8, $arg9, $arg10); +} diff --git a/testsuite/systemtap.base/stmt_rel.exp b/testsuite/systemtap.base/stmt_rel.exp index 25156d9b..be51fef9 100644 --- a/testsuite/systemtap.base/stmt_rel.exp +++ b/testsuite/systemtap.base/stmt_rel.exp @@ -3,7 +3,6 @@ set test "stmt_rel" set ::result_string {PASS bio_init PASS line number -PASS wildcard -} +PASS wildcard} stap_run2 $srcdir/$subdir/$test.stp diff --git a/testsuite/systemtap.base/tracepoints.exp b/testsuite/systemtap.base/tracepoints.exp new file mode 100644 index 00000000..bea461c4 --- /dev/null +++ b/testsuite/systemtap.base/tracepoints.exp @@ -0,0 +1,3 @@ +set test "tracepoints" +set ::result_string {tracepoints OK} +stap_run2 $srcdir/$subdir/$test.stp diff --git a/testsuite/systemtap.base/tracepoints.stp b/testsuite/systemtap.base/tracepoints.stp new file mode 100644 index 00000000..bdb4d730 --- /dev/null +++ b/testsuite/systemtap.base/tracepoints.stp @@ -0,0 +1,23 @@ +// This checks that we can compile and register every tracepoint +// we can find, along with all of their context variables. +global hits +probe all_tracepoints = kernel.trace("*") +{ + if ($$name . $$vars . $$parms == "") + next + + // Allow it to quit once we hit our hundredth tracepoint + if (++hits < 100) + next +} + +// If there aren't any tracepoints in the kernel, +// we use "begin" instead to quit right away. +probe all_tracepoints!, begin { + println("tracepoints OK") + exit() +} + +// give hits a use so there's no warning +// when we don't have tracepoints +probe never { hits++ } diff --git a/testsuite/systemtap.maps/exists.exp b/testsuite/systemtap.maps/exists.exp index ea043a6b..bbdac737 100755 --- a/testsuite/systemtap.maps/exists.exp +++ b/testsuite/systemtap.maps/exists.exp @@ -9,8 +9,7 @@ comlete list for b: [0,0] [1,10] [2,20] [3,30] [4,40] [5,50] [6,60] [7,70] [8,80 [0,0] is still there emtpy string there hello there -emtpy string still there -} +emtpy string still there} stap_run2 $srcdir/$subdir/$test.stp diff --git a/testsuite/systemtap.maps/foreach_foreach.exp b/testsuite/systemtap.maps/foreach_foreach.exp index f79d290a..07a2d871 100644 --- a/testsuite/systemtap.maps/foreach_foreach.exp +++ b/testsuite/systemtap.maps/foreach_foreach.exp @@ -114,8 +114,7 @@ bar[21] = 9261 bar[22] = 10648 bar[23] = 12167 bar[24] = 13824 -foo[10] = 100 -} +foo[10] = 100} stap_run2 $srcdir/$subdir/$test.stp diff --git a/testsuite/systemtap.maps/foreach_limit.exp b/testsuite/systemtap.maps/foreach_limit.exp index 97305c4b..4cc87ec8 100644 --- a/testsuite/systemtap.maps/foreach_limit.exp +++ b/testsuite/systemtap.maps/foreach_limit.exp @@ -94,8 +94,7 @@ bucket 69: 13 bucket 70: 28 loop had 71 iterations -Done. -} +Done.} stap_run2 $srcdir/$subdir/$test.stp diff --git a/testsuite/systemtap.maps/foreach_limit2.exp b/testsuite/systemtap.maps/foreach_limit2.exp index 00696fe1..224a0aa7 100644 --- a/testsuite/systemtap.maps/foreach_limit2.exp +++ b/testsuite/systemtap.maps/foreach_limit2.exp @@ -82,8 +82,7 @@ agg_array[6]: count:2 sum:18 avg:9 min:6 max:12 loop had 4 iterations x ended up as 5 -Done. -} +Done.} stap_run2 $srcdir/$subdir/$test.stp diff --git a/testsuite/systemtap.maps/ii.exp b/testsuite/systemtap.maps/ii.exp index f7ce95fb..1f4a972a 100644 --- a/testsuite/systemtap.maps/ii.exp +++ b/testsuite/systemtap.maps/ii.exp @@ -61,8 +61,7 @@ foo[6] = 91 foo[7] = 140 foo[8] = 204 foo[9] = 285 -foo[10] = 385 -} +foo[10] = 385} stap_run2 $srcdir/$subdir/$test.stp diff --git a/testsuite/systemtap.maps/iiiiii.exp b/testsuite/systemtap.maps/iiiiii.exp index 3c8dbaf0..aeddbbac 100644 --- a/testsuite/systemtap.maps/iiiiii.exp +++ b/testsuite/systemtap.maps/iiiiii.exp @@ -64,8 +64,7 @@ foo[1,1,0,1,1] = 4 foo[1,1,1,0,0] = 3 foo[1,1,1,0,1] = 4 foo[1,1,1,1,0] = 4 -foo[1,1,1,1,1] = 5 -} +foo[1,1,1,1,1] = 5} stap_run2 $srcdir/$subdir/$test.stp diff --git a/testsuite/systemtap.maps/is.exp b/testsuite/systemtap.maps/is.exp index 5dffb850..31e96e77 100644 --- a/testsuite/systemtap.maps/is.exp +++ b/testsuite/systemtap.maps/is.exp @@ -61,8 +61,7 @@ foo[6] = # 36 foo[7] = # 49 foo[8] = # 64 foo[9] = # 81 -foo[10] = # 100 -} +foo[10] = # 100} stap_run2 $srcdir/$subdir/$test.stp diff --git a/testsuite/systemtap.maps/ix.exp b/testsuite/systemtap.maps/ix.exp index 578e8e38..11de73c1 100644 --- a/testsuite/systemtap.maps/ix.exp +++ b/testsuite/systemtap.maps/ix.exp @@ -41,8 +41,7 @@ foo[9]: count:4 sum:117 avg:29 min:-2 max:100 foo[10]: count:4 sum:118 avg:29 min:-2 max:100 Run a quick foreach without sorting... -complete sum of foo:1243 -} +complete sum of foo:1243} stap_run2 $srcdir/$subdir/$test.stp diff --git a/testsuite/systemtap.maps/linear.exp b/testsuite/systemtap.maps/linear.exp index 5519ee11..23b5f871 100644 --- a/testsuite/systemtap.maps/linear.exp +++ b/testsuite/systemtap.maps/linear.exp @@ -38,7 +38,6 @@ value |-------------------------------------------------- count 1400 | 3 1450 | 3 1500 | 0 - } stap_run2 $srcdir/$subdir/$test.stp diff --git a/testsuite/systemtap.maps/linear_empty.exp b/testsuite/systemtap.maps/linear_empty.exp index 88a53a31..922ff0b9 100644 --- a/testsuite/systemtap.maps/linear_empty.exp +++ b/testsuite/systemtap.maps/linear_empty.exp @@ -1,8 +1,7 @@ # Test empty linear histogram set test "linear_empty" -set ::result_string {count=0 -} +set ::result_string {count=0} stap_run2 $srcdir/$subdir/$test.stp -w diff --git a/testsuite/systemtap.maps/linear_large.exp b/testsuite/systemtap.maps/linear_large.exp index 51df3c92..d2a03f0a 100644 --- a/testsuite/systemtap.maps/linear_large.exp +++ b/testsuite/systemtap.maps/linear_large.exp @@ -19,7 +19,6 @@ avg=1115333333 900000000 | 0 1000000000 |@@@@ 4 >1000000000 |@ 1 - } stap_run2 $srcdir/$subdir/$test.stp diff --git a/testsuite/systemtap.maps/linear_large_neg.exp b/testsuite/systemtap.maps/linear_large_neg.exp index bdffba7b..470414a3 100644 --- a/testsuite/systemtap.maps/linear_large_neg.exp +++ b/testsuite/systemtap.maps/linear_large_neg.exp @@ -19,7 +19,6 @@ avg=-1284615384 -200000000 | 0 -100000000 |@@ 2 0 |@ 1 - } stap_run2 $srcdir/$subdir/$test.stp diff --git a/testsuite/systemtap.maps/linear_over.exp b/testsuite/systemtap.maps/linear_over.exp index 5b0fafa4..25eca1e1 100644 --- a/testsuite/systemtap.maps/linear_over.exp +++ b/testsuite/systemtap.maps/linear_over.exp @@ -10,7 +10,6 @@ value |-------------------------------------------------- count 90 | 0 100 | 0 >100 |@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@ 9000 - } stap_run2 $srcdir/$subdir/$test.stp -DMAXACTION=10000 diff --git a/testsuite/systemtap.maps/linear_overunder.exp b/testsuite/systemtap.maps/linear_overunder.exp index 80b74c72..e5275524 100644 --- a/testsuite/systemtap.maps/linear_overunder.exp +++ b/testsuite/systemtap.maps/linear_overunder.exp @@ -25,7 +25,6 @@ value |-------------------------------------------------- count 950 |@ 27 1000 |@ 23 >1000 |@@@@@@@ 102 - } stap_run2 $srcdir/$subdir/$test.stp diff --git a/testsuite/systemtap.maps/linear_under.exp b/testsuite/systemtap.maps/linear_under.exp index 8efc45be..28d24886 100644 --- a/testsuite/systemtap.maps/linear_under.exp +++ b/testsuite/systemtap.maps/linear_under.exp @@ -10,7 +10,6 @@ value |-------------------------------------------------- count <1800 |@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@ 100 1800 | 0 1900 | 0 - } stap_run2 $srcdir/$subdir/$test.stp -DMAXACTION=10000 diff --git a/testsuite/systemtap.maps/log.exp b/testsuite/systemtap.maps/log.exp index 2bc54a33..d19082b4 100644 --- a/testsuite/systemtap.maps/log.exp +++ b/testsuite/systemtap.maps/log.exp @@ -130,7 +130,6 @@ set ::result_string { value |------------------------------------- 1152921504606846976 |@ 1 2305843009213693952 |@ 1 4611686018427387904 |@ 1 - } stap_run2 $srcdir/$subdir/$test.stp diff --git a/testsuite/systemtap.maps/log_edge.exp b/testsuite/systemtap.maps/log_edge.exp index 051021b1..6ce546d9 100644 --- a/testsuite/systemtap.maps/log_edge.exp +++ b/testsuite/systemtap.maps/log_edge.exp @@ -43,8 +43,7 @@ value |-------------------------------------------------- count bucket 65: 1 bucket 66: 2 -bucket 67: 1 -} +bucket 67: 1} stap_run2 $srcdir/$subdir/$test.stp diff --git a/testsuite/systemtap.maps/si.exp b/testsuite/systemtap.maps/si.exp index 600687ed..eb1b05c7 100644 --- a/testsuite/systemtap.maps/si.exp +++ b/testsuite/systemtap.maps/si.exp @@ -61,8 +61,7 @@ foo[6] = 91 foo[7] = 140 foo[8] = 204 foo[9] = 285 -foo[10] = 385 -} +foo[10] = 385} stap_run2 $srcdir/$subdir/$test.stp diff --git a/testsuite/systemtap.maps/ss.exp b/testsuite/systemtap.maps/ss.exp index 548a888e..9978ead0 100644 --- a/testsuite/systemtap.maps/ss.exp +++ b/testsuite/systemtap.maps/ss.exp @@ -61,7 +61,6 @@ foo[6] = # 36 foo[7] = # 49 foo[8] = # 64 foo[9] = # 81 -foo[10] = # 100 -} +foo[10] = # 100} stap_run2 $srcdir/$subdir/$test.stp diff --git a/testsuite/systemtap.printf/basic3.exp b/testsuite/systemtap.printf/basic3.exp index e3beb9ed..5c4f7e79 100644 --- a/testsuite/systemtap.printf/basic3.exp +++ b/testsuite/systemtap.printf/basic3.exp @@ -1,5 +1,4 @@ set test "basic3" set ::result_string {Hello -World -} +World} stap_run2 $srcdir/$subdir/$test.stp diff --git a/testsuite/systemtap.printf/bin6.exp b/testsuite/systemtap.printf/bin6.exp Binary files differindex 0de41e78..4c5e7f2b 100644 --- a/testsuite/systemtap.printf/bin6.exp +++ b/testsuite/systemtap.printf/bin6.exp diff --git a/testsuite/systemtap.printf/char1.exp b/testsuite/systemtap.printf/char1.exp index 0e9232e9..35aa479f 100644 --- a/testsuite/systemtap.printf/char1.exp +++ b/testsuite/systemtap.printf/char1.exp @@ -1,4 +1,3 @@ set test "char1" -set ::result_string {stap -} -stap_run2 $srcdir/$subdir/$test.stp
\ No newline at end of file +set ::result_string {stap} +stap_run2 $srcdir/$subdir/$test.stp diff --git a/testsuite/systemtap.printf/int1.exp b/testsuite/systemtap.printf/int1.exp index bb30b4f3..b308848c 100644 --- a/testsuite/systemtap.printf/int1.exp +++ b/testsuite/systemtap.printf/int1.exp @@ -19,6 +19,5 @@ set ::result_string {1,10,9000000000000,-1,-1024 1,12,202757163310000,1777777777777777777777,1777777777777777776000 1,12,202757163310000,1777777777777777777777,1777777777777777776000 1, 12, 202757163310000,1777777777777777777777,1777777777777777776000 -0000000000000001,0000000000000012,0202757163310000,1777777777777777777777,1777777777777777776000 -} +0000000000000001,0000000000000012,0202757163310000,1777777777777777777777,1777777777777777776000} stap_run2 $srcdir/$subdir/$test.stp diff --git a/testsuite/systemtap.printf/memory1.exp b/testsuite/systemtap.printf/memory1.exp index 7b55a3d7..c5f03610 100644 --- a/testsuite/systemtap.printf/memory1.exp +++ b/testsuite/systemtap.printf/memory1.exp @@ -1,4 +1,3 @@ set test "memory1" -set ::result_string {Test passed -} +set ::result_string {Test passed} stap_run2 $srcdir/$subdir/$test.stp diff --git a/testsuite/systemtap.printf/print.exp b/testsuite/systemtap.printf/print.exp index 3a4de529..151de10d 100644 --- a/testsuite/systemtap.printf/print.exp +++ b/testsuite/systemtap.printf/print.exp @@ -13,6 +13,5 @@ foo99 888 123456789 hello999 -999hello -} +999hello} stap_run2 $srcdir/$subdir/$test.stp diff --git a/testsuite/systemtap.printf/print_char.exp b/testsuite/systemtap.printf/print_char.exp index bab056dd..a9d63be6 100644 --- a/testsuite/systemtap.printf/print_char.exp +++ b/testsuite/systemtap.printf/print_char.exp @@ -1,5 +1,4 @@ set test "print_char" set ::result_string {ABC -ABCDEFGHIJKLMNOPQRSTUVWXYZ -} +ABCDEFGHIJKLMNOPQRSTUVWXYZ} stap_run2 $srcdir/$subdir/$test.stp diff --git a/testsuite/systemtap.printf/println.exp b/testsuite/systemtap.printf/println.exp index 8deba53f..fcbe0c82 100644 --- a/testsuite/systemtap.printf/println.exp +++ b/testsuite/systemtap.printf/println.exp @@ -13,6 +13,5 @@ foo99 99foo 123456789 hello999 -999hello -} +999hello} stap_run2 $srcdir/$subdir/$test.stp diff --git a/testsuite/systemtap.printf/ptr.exp b/testsuite/systemtap.printf/ptr.exp index f25a7a02..3eb412a7 100644 --- a/testsuite/systemtap.printf/ptr.exp +++ b/testsuite/systemtap.printf/ptr.exp @@ -29,8 +29,7 @@ if {$::tcl_platform(wordSize) == 8} { 0x000001X 0x12345678X 0x12345678abcdef00X -0x12345678X -" +0x12345678X" } else { set ::result_string "0x00000000 0x00000001 @@ -60,7 +59,6 @@ if {$::tcl_platform(wordSize) == 8} { 0x000001X 0x12345678X 0xabcdef00X -0x12345678X -" +0x12345678X" } stap_run2 $srcdir/$subdir/$test.stp diff --git a/testsuite/systemtap.printf/string1.exp b/testsuite/systemtap.printf/string1.exp index aee0b71a..7c94d645 100644 --- a/testsuite/systemtap.printf/string1.exp +++ b/testsuite/systemtap.printf/string1.exp @@ -1,6 +1,5 @@ set test "string1" set ::result_string {The string is <Foobar!> Foobar!XYZZY -XYZZYFoobar!XYZZYFoobar! -} +XYZZYFoobar!XYZZYFoobar!} stap_run2 $srcdir/$subdir/$test.stp diff --git a/testsuite/systemtap.string/dot.exp b/testsuite/systemtap.string/dot.exp index b1d38172..14f329db 100644 --- a/testsuite/systemtap.string/dot.exp +++ b/testsuite/systemtap.string/dot.exp @@ -5,6 +5,5 @@ helloworld 0 100 -42 -66 -} +66} stap_run2 $srcdir/$subdir/$test.stp diff --git a/testsuite/systemtap.string/isinstr.exp b/testsuite/systemtap.string/isinstr.exp index 986043e8..ed0474de 100644 --- a/testsuite/systemtap.string/isinstr.exp +++ b/testsuite/systemtap.string/isinstr.exp @@ -1,6 +1,5 @@ set test "isinstr" set ::result_string {"foo" is in "abcfoobad" "foo" is NOT in "abcdefg" -"" is in "" -} +"" is in ""} stap_run2 $srcdir/$subdir/$test.stp diff --git a/testsuite/systemtap.string/sprint.exp b/testsuite/systemtap.string/sprint.exp index c8f9826a..b4f0b453 100644 --- a/testsuite/systemtap.string/sprint.exp +++ b/testsuite/systemtap.string/sprint.exp @@ -3,6 +3,5 @@ set ::result_string {helloworld helloworld EQUAL EQUAL -hello-world helloworld FOO helloworld -} +hello-world helloworld FOO helloworld} stap_run2 $srcdir/$subdir/$test.stp diff --git a/testsuite/systemtap.string/strlen.exp b/testsuite/systemtap.string/strlen.exp index 40c790fe..b93564ef 100644 --- a/testsuite/systemtap.string/strlen.exp +++ b/testsuite/systemtap.string/strlen.exp @@ -2,6 +2,5 @@ set test "strlen" set ::result_string {strlen("") = 0 strlen("1") = 1 strlen("0123456789") = 10 -strlen("012345678901234567890123456789012345678901234567890123456789012") = 63 -} +strlen("012345678901234567890123456789012345678901234567890123456789012") = 63} stap_run2 $srcdir/$subdir/$test.stp -DMAXSTRINGLEN=64 diff --git a/testsuite/systemtap.string/strtol.exp b/testsuite/systemtap.string/strtol.exp index 12d63f0d..25cc21a0 100644 --- a/testsuite/systemtap.string/strtol.exp +++ b/testsuite/systemtap.string/strtol.exp @@ -10,6 +10,5 @@ set ::result_string {1 1000 4096 512 -8 -0} +8} stap_run2 $srcdir/$subdir/$test.stp diff --git a/testsuite/systemtap.string/substr.exp b/testsuite/systemtap.string/substr.exp index c9884935..5f1b662b 100644 --- a/testsuite/systemtap.string/substr.exp +++ b/testsuite/systemtap.string/substr.exp @@ -13,6 +13,5 @@ set ::result_string {Hello World! 12,1: 0,10: Hello Worl 0,100: Hello World! -0,100000: Hello World! -} +0,100000: Hello World!} stap_run2 $srcdir/$subdir/$test.stp diff --git a/translate.cxx b/translate.cxx index 135830df..17c37dc3 100644 --- a/translate.cxx +++ b/translate.cxx @@ -1236,6 +1236,11 @@ c_unparser::emit_module_init () o->newline() << getvar (v).fini(); } + // For any partially registered/unregistered kernel facilities. + o->newline() << "#ifdef STAPCONF_SYNCHRONIZE_SCHED"; + o->newline() << "synchronize_sched();"; + o->newline() << "#endif"; + o->newline() << "return rc;"; o->newline(-1) << "}\n"; } @@ -3882,7 +3887,7 @@ c_unparser_assignment::visit_arrayindex (arrayindex *e) assert (rvalue->type == pe_long); mapvar mvar = parent->getmap (array->referent, e->tok); - // o->newline() << "c->last_stmt = " << lex_cast_qstring(*e->tok) << ";"; + o->newline() << "c->last_stmt = " << lex_cast_qstring(*e->tok) << ";"; o->newline() << mvar.add (idx, rvar) << ";"; res = rvar; // no need for these dummy assignments @@ -3892,7 +3897,7 @@ c_unparser_assignment::visit_arrayindex (arrayindex *e) else { mapvar mvar = parent->getmap (array->referent, e->tok); - // o->newline() << "c->last_stmt = " << lex_cast_qstring(*e->tok) << ";"; + o->newline() << "c->last_stmt = " << lex_cast_qstring(*e->tok) << ";"; if (op != "=") // don't bother fetch slot if we will just overwrite it parent->c_assign (lvar, mvar.get(idx), e->tok); c_assignop (res, lvar, rvar, e->tok); @@ -4453,6 +4458,9 @@ dump_unwindsyms (Dwfl_Module *m, string modname = name; + if (pending_interrupts) + return DWARF_CB_ABORT; + // skip modules/files we're not actually interested in if (c->session.unwindsym_modules.find(modname) == c->session.unwindsym_modules.end()) return DWARF_CB_OK; @@ -4900,6 +4908,9 @@ translate_pass (systemtap_session& s) s.op->newline() << "#ifndef MINSTACKSPACE"; s.op->newline() << "#define MINSTACKSPACE 1024"; s.op->newline() << "#endif"; + s.op->newline() << "#ifndef INTERRUPTIBLE"; + s.op->newline() << "#define INTERRUPTIBLE 1"; + s.op->newline() << "#endif"; // Overload processing s.op->newline() << "#ifndef STP_OVERLOAD_INTERVAL"; @@ -4954,21 +4965,23 @@ translate_pass (systemtap_session& s) s.op->newline() << s.embeds[i]->code << "\n"; } - s.op->newline() << "static struct {"; - s.op->indent(1); - for (unsigned i=0; i<s.globals.size(); i++) - { - s.up->emit_global (s.globals[i]); - } - s.op->newline(-1) << "} global = {"; - s.op->newline(1); - for (unsigned i=0; i<s.globals.size(); i++) - { - if (pending_interrupts) return 1; - s.up->emit_global_init (s.globals[i]); - } - s.op->newline(-1) << "};"; - s.op->assert_0_indent(); + if (s.globals.size()>0) { + s.op->newline() << "static struct {"; + s.op->indent(1); + for (unsigned i=0; i<s.globals.size(); i++) + { + s.up->emit_global (s.globals[i]); + } + s.op->newline(-1) << "} global = {"; + s.op->newline(1); + for (unsigned i=0; i<s.globals.size(); i++) + { + if (pending_interrupts) return 1; + s.up->emit_global_init (s.globals[i]); + } + s.op->newline(-1) << "};"; + s.op->assert_0_indent(); + } for (map<string,functiondecl*>::iterator it = s.functions.begin(); it != s.functions.end(); it++) { |
