From 0dee0e75e8a541ad435e9af431c426c53f155d71 Mon Sep 17 00:00:00 2001 From: compudj Date: Thu, 26 Jan 2006 19:55:48 +0000 Subject: [PATCH] parser update git-svn-id: http://ltt.polymtl.ca/svn@1495 04897980-b3bd-0310-b5e0-8ef037075253 --- ltt/branches/poly/configure.in | 2 +- .../doc/developer/lttng-userspace-tracing.txt | 7 +++ ltt/branches/poly/facilities/Makefile.am | 2 + ltt/branches/poly/ltt/parser.c | 51 +++++++++---------- ltt/branches/poly/ltt/parser.h | 23 --------- 5 files changed, 34 insertions(+), 51 deletions(-) diff --git a/ltt/branches/poly/configure.in b/ltt/branches/poly/configure.in index 5ecb494f..e0876f39 100644 --- a/ltt/branches/poly/configure.in +++ b/ltt/branches/poly/configure.in @@ -23,7 +23,7 @@ AC_PREREQ(2.57) AC_INIT(FULL-PACKAGE-NAME, VERSION, BUG-REPORT-ADDRESS) #AC_WITH_LTDL # not needed ? -AM_INIT_AUTOMAKE(LinuxTraceToolkitViewer,0.8.6-20012006) +AM_INIT_AUTOMAKE(LinuxTraceToolkitViewer,0.8.7-26012006) AM_CONFIG_HEADER(config.h) AM_PROG_LIBTOOL diff --git a/ltt/branches/poly/doc/developer/lttng-userspace-tracing.txt b/ltt/branches/poly/doc/developer/lttng-userspace-tracing.txt index beb56cac..bf587907 100644 --- a/ltt/branches/poly/doc/developer/lttng-userspace-tracing.txt +++ b/ltt/branches/poly/doc/developer/lttng-userspace-tracing.txt @@ -219,10 +219,17 @@ SIGRTMIN+3 (like hardware fault and expiring timer : to the thread, see p. 413 of Advances prog. in the UNIX env.) +Signal is sent on tracing create/destroy, start/stop and filter change. + Will update for itself only : it will remove unnecessary concurrency. +Notes : + +It doesn't matter "when" the process receives the update signal after a trace +start : it will receive it in priority, before executing anything else when it +will be scheduled in. diff --git a/ltt/branches/poly/facilities/Makefile.am b/ltt/branches/poly/facilities/Makefile.am index 6e22d790..005ce04e 100644 --- a/ltt/branches/poly/facilities/Makefile.am +++ b/ltt/branches/poly/facilities/Makefile.am @@ -6,6 +6,7 @@ ipc.xml \ kernel.xml \ kernel_arch_i386.xml \ stack_arch_i386.xml \ +locking.xml \ memory.xml \ network.xml \ process.xml \ @@ -20,6 +21,7 @@ ipc.xml \ kernel.xml \ kernel_arch_i386.xml \ stack_arch_i386.xml \ +locking.xml \ memory.xml \ network.xml \ process.xml \ diff --git a/ltt/branches/poly/ltt/parser.c b/ltt/branches/poly/ltt/parser.c index 492f7667..785cb652 100644 --- a/ltt/branches/poly/ltt/parser.c +++ b/ltt/branches/poly/ltt/parser.c @@ -1,25 +1,24 @@ /* - * parser.c: Generate helper declarations and functions to trace events - * from an event description file. - * - * Copyright (C) 2005, Mathieu Desnoyers - * Copyright (C) 2002, Xianxiu Yang - * Copyright (C) 2002, Michel Dagenais - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License Version 2.1 as published by the Free Software Foundation. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. - */ + +parser.c: Generate helper declarations and functions to trace events + from an event description file. + + Copyright (C) 2005, Mathieu Desnoyers + Copyright (C) 2002, Xianxiu Yang + Copyright (C) 2002, Michel Dagenais + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; version 2 of the License. + + 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. + + 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 +*/ /* This program reads the ".xml" event definitions input files and constructs structure for each event. @@ -339,22 +338,20 @@ char *getNameAttribute(parse_file_t *in) while(1) { token = getToken(in); - if(strcmp("/",token) == 0 || strcmp(">",token) == 0){ - ungetToken(in); - break; - } - if(!strcmp("name",token)) { getEqual(in); car = seekNextChar(in); if(car == EOF) in->error(in,"name was expected"); else if(car == '\"') name = allocAndCopy(getQuotedString(in)); else name = allocAndCopy(getName(in)); + } else { + ungetToken(in); + break; } + } if(name == NULL) in->error(in, "Name was expected"); return name; - } diff --git a/ltt/branches/poly/ltt/parser.h b/ltt/branches/poly/ltt/parser.h index 90522298..5a4c5b02 100644 --- a/ltt/branches/poly/ltt/parser.h +++ b/ltt/branches/poly/ltt/parser.h @@ -1,26 +1,3 @@ -/* - * parser.h: Generate helper declarations and functions to trace events - * from an event description file. - * - * Copyright (C) 2005, Mathieu Desnoyers - * Copyright (C) 2002, Xianxiu Yang - * Copyright (C) 2002, Michel Dagenais - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License Version 2.1 as published by the Free Software Foundation. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. - */ - #ifndef PARSER_H #define PARSER_H -- 2.34.1