From ba899d3dc9f7c730c8bf699617d5f7a22d196f37 Mon Sep 17 00:00:00 2001
From: compudj <compudj@04897980-b3bd-0310-b5e0-8ef037075253>
Date: Thu, 6 Apr 2006 23:00:08 +0000
Subject: [PATCH] add scripts

git-svn-id: http://ltt.polymtl.ca/svn@1755 04897980-b3bd-0310-b5e0-8ef037075253
---
 genevent-new/genevent.c       |  68 +++++++-
 scripts/lttng-split-script.sh | 290 ++++++++++++++++++++++++++++++++++
 tests/kernel/Makefile         |   2 +-
 3 files changed, 354 insertions(+), 6 deletions(-)
 create mode 100755 scripts/lttng-split-script.sh

diff --git a/genevent-new/genevent.c b/genevent-new/genevent.c
index a478e03b..88fbde15 100644
--- a/genevent-new/genevent.c
+++ b/genevent-new/genevent.c
@@ -861,6 +861,11 @@ int print_type_alignment_fct(type_descriptor_t * td, FILE *fd,
 	
 	switch(td->type) {
 		case SEQUENCE:
+			if(((field_t*)td->fields.array[1])->type->type_name == NULL) {
+				/* Not a named nested type : we must print its align fct */
+				if(print_type_alignment_fct(((field_t*)td->fields.array[1])->type, fd,
+								0, basename, "")) return 1;
+			}
 			/* Function header */
 			fprintf(fd, "static inline size_t lttng_get_alignment_sequence_%s(\n",
 					basename);
@@ -891,6 +896,15 @@ int print_type_alignment_fct(type_descriptor_t * td, FILE *fd,
 			fprintf(fd, "return align;\n");
 			break;
 		case STRUCT:
+			for(unsigned int i=0;i<td->fields.position;i++){
+				field_t *field = (field_t*)(td->fields.array[i]);
+				type_descriptor_t *type = field->type;
+				if(type->type_name == NULL) {
+					/* Not a named nested type : we must print its align fct */
+					if(print_type_alignment_fct(type, fd,
+								0, basename, field->name)) return 1;
+				}
+			}
 			/* Function header */
 			fprintf(fd, "static inline size_t lttng_get_alignment_struct_%s(\n",
 					basename);
@@ -918,6 +932,15 @@ int print_type_alignment_fct(type_descriptor_t * td, FILE *fd,
 
 			break;
 		case UNION:
+			for(unsigned int i=0;i<td->fields.position;i++){
+				field_t *field = (field_t*)(td->fields.array[i]);
+				type_descriptor_t *type = field->type;
+				if(type->type_name == NULL) {
+					/* Not a named nested type : we must print its align fct */
+					if(print_type_alignment_fct(type, fd,
+								0, basename, field->name)) return 1;
+				}
+			}
 			/* Function header */
 			fprintf(fd, "static inline size_t lttng_get_alignment_union_%s(\n",
 					basename);
@@ -945,6 +968,11 @@ int print_type_alignment_fct(type_descriptor_t * td, FILE *fd,
 
 			break;
 		case ARRAY:
+			if(((field_t*)td->fields.array[0])->type->type_name == NULL) {
+				/* Not a named nested type : we must print its align fct */
+				if(print_type_alignment_fct(((field_t*)td->fields.array[0])->type, fd,
+								0, basename, "")) return 1;
+			}
 			/* Function header */
 			fprintf(fd, "static inline size_t lttng_get_alignment_array_%s(\n",
 					basename);
@@ -1009,9 +1037,41 @@ int print_type_write_fct(type_descriptor_t * td, FILE *fd, unsigned int tabs,
 	
 	switch(td->type) {
 		case SEQUENCE:
+			if(((field_t*)td->fields.array[1])->type->type_name == NULL) {
+				/* Not a named nested type : we must print its write fct */
+				if(print_type_write_fct(((field_t*)td->fields.array[1])->type, fd,
+								0, basename, "")) return 1;
+			}
+			break;
 		case STRUCT:
+			for(unsigned int i=0;i<td->fields.position;i++){
+				field_t *field = (field_t*)(td->fields.array[i]);
+				type_descriptor_t *type = field->type;
+				if(type->type_name == NULL) {
+					/* Not a named nested type : we must print its write fct */
+					if(print_type_write_fct(type, fd,
+								0, basename, field->name)) return 1;
+				}
+			}
+			break;
 		case UNION:
+			for(unsigned int i=0;i<td->fields.position;i++){
+				field_t *field = (field_t*)(td->fields.array[i]);
+				type_descriptor_t *type = field->type;
+				if(type->type_name == NULL) {
+					/* Not a named nested type : we must print its write fct */
+					if(print_type_write_fct(type, fd,
+								0, basename, field->name)) return 1;
+				}
+			}
+			break;
 		case ARRAY:
+			if(((field_t*)td->fields.array[0])->type->type_name == NULL) {
+				/* Not a named nested type : we must print its write fct */
+				if(print_type_write_fct(((field_t*)td->fields.array[0])->type, fd,
+								0, basename, "")) return 1;
+			}
+			break;
 		case STRING:
 			break;
 		default:
@@ -2588,11 +2648,11 @@ int print_loader_c(facility_t *fac)
   fprintf(fd, "\t\n");
   fprintf(fd, "\treturn LTT_FACILITY_SYMBOL;\n");
   fprintf(fd, "}\n");
-  fprintf(fd, "__initcall(facility_init);\n");
-  fprintf(fd, "\n");
   fprintf(fd, "\n");
   fprintf(fd, "#ifndef MODULE\n");
-  fprintf(fd, "\n");
+  fprintf(fd, "__initcall(facility_init);\n");
+  fprintf(fd, "#else\n");
+  fprintf(fd, "module_init(facility_init);\n");
   fprintf(fd, "static void __exit facility_exit(void)\n");
   fprintf(fd, "{\n");
   fprintf(fd, "\tint err;\n");
@@ -2602,10 +2662,8 @@ int print_loader_c(facility_t *fac)
   fprintf(fd, "\t\tprintk(KERN_ERR \"LTT : Error in unregistering facility.\\n\");\n");
   fprintf(fd, "\n");
   fprintf(fd, "}\n");
-  fprintf(fd, "\n");
   fprintf(fd, "module_exit(facility_exit)\n");
   fprintf(fd, "\n");
-  fprintf(fd, "\n");
   fprintf(fd, "MODULE_LICENSE(\"GPL\");\n");
   fprintf(fd, "MODULE_AUTHOR(\"Mathieu Desnoyers\");\n");
   fprintf(fd, "MODULE_DESCRIPTION(\"Linux Trace Toolkit Facility\");\n");
diff --git a/scripts/lttng-split-script.sh b/scripts/lttng-split-script.sh
new file mode 100755
index 00000000..d0ec0f2e
--- /dev/null
+++ b/scripts/lttng-split-script.sh
@@ -0,0 +1,290 @@
+#!/bin/sh
+# LTTng patch creation 
+# Creates a -all patch, and split it.
+# Mathieu Desnoyers, october 2005
+#$1 is the version
+
+function wr () {
+  
+  cat $1 >> $2
+
+}
+
+
+NAME=patch-2.6.16-lttng-$1
+ALL_NAME=$NAME-all.diff
+
+rm -fr tmppatch
+mkdir tmppatch
+./lttng-release-script.sh $ALL_NAME
+
+cd tmppatch
+
+cp ../$ALL_NAME .
+
+splitdiff -a -d $ALL_NAME
+
+
+FILE=../$NAME-instrumentation.diff
+
+IN="?_fs_buffer.c
+?_fs_exec.c
+?_fs_ioctl.c
+?_fs_open.c
+?_fs_read_write.c
+?_fs_select.c
+
+?_ipc_msg.c
+?_ipc_sem.c
+?_ipc_shm.c
+
+?_kernel_irq_handle.c
+?_kernel_itimer.c
+?_kernel_sched.c
+?_kernel_signal.c
+?_kernel_softirq.c
+?_kernel_timer.c
+?_kernel_module.c
+
+?_mm_filemap.c
+?_mm_memory.c
+?_mm_page_alloc.c
+?_mm_page_io.c
+?_net_core_dev.c
+?_net_ipv4_devinet.c
+?_net_socket.c"
+
+for a in $IN; do wr $a $FILE; done
+
+
+FILE=../$NAME-instrumentation-arm.diff
+
+IN="?_arch_arm_kernel_entry-common.S
+?_arch_arm_kernel_calls.S
+?_arch_arm_kernel_irq.c
+?_arch_arm_kernel_process.c
+?_arch_arm_kernel_sys_arm.c
+?_arch_arm_kernel_time.c
+?_arch_arm_kernel_traps.c"
+
+for a in $IN; do wr $a $FILE; done
+
+
+FILE=../$NAME-instrumentation-i386.diff
+
+IN="?_arch_i386_kernel_entry.S
+?_arch_i386_kernel_Makefile
+?_arch_i386_kernel_ltt.c
+?_arch_i386_kernel_syscall_table.S
+?_arch_i386_kernel_process.c
+?_arch_i386_kernel_sys_i386.c
+?_arch_i386_kernel_traps.c
+?_arch_i386_kernel_time.c
+?_arch_i386_mm_fault.c
+?_include_asm-i386_unistd.h
+?_include_asm-i386_system.h"
+
+for a in $IN; do wr $a $FILE; done
+
+
+FILE=../$NAME-instrumentation-mips.diff
+
+IN="?_arch_mips_kernel_irq.c
+?_arch_mips_kernel_traps.c
+?_arch_mips_kernel_unaligned.c
+?_arch_mips_mm_fault.c"
+for a in $IN; do wr $a $FILE; done
+
+
+FILE=../$NAME-instrumentation-ppc.diff
+IN="?_arch_ppc_kernel_entry.S
+?_arch_ppc_kernel_misc.S
+?_arch_ppc_kernel_process.c
+?_arch_ppc_kernel_time.c
+?_arch_ppc_kernel_traps.c
+?_arch_ppc_mm_fault.c"
+for a in $IN; do wr $a $FILE; done
+
+
+FILE=../$NAME-instrumentation-powerpc.diff
+IN="?_arch_powerpc_kernel_syscalls.c"
+
+for a in $IN; do wr $a $FILE; done
+
+
+FILE=../$NAME-instrumentation-s390.diff
+IN="?_arch_s390_kernel_entry.S
+?_arch_s390_kernel_sys_s390.c
+?_arch_s390_kernel_traps.c
+?_arch_s390_mm_fault.c"
+for a in $IN; do wr $a $FILE; done
+
+
+FILE=../$NAME-instrumentation-sh.diff
+IN="?_arch_sh_kernel_irq.c
+?_arch_sh_kernel_process.c
+?_arch_sh_kernel_sys_sh.c
+?_arch_sh_kernel_traps.c
+?_arch_sh_mm_fault.c"
+for a in $IN; do wr $a $FILE; done
+
+
+
+FILE=../$NAME-facilities-headers.diff
+
+IN="?_include_linux_ltt_ltt-facility-core.h
+?_include_linux_ltt_ltt-facility-fs.h
+?_include_linux_ltt_ltt-facility-id-core.h
+?_include_linux_ltt_ltt-facility-id-fs.h
+?_include_linux_ltt_ltt-facility-id-ipc.h
+?_include_linux_ltt_ltt-facility-id-kernel.h
+?_include_linux_ltt_ltt-facility-id-locking.h
+?_include_linux_ltt_ltt-facility-id-memory.h
+?_include_linux_ltt_ltt-facility-id-network.h
+?_include_linux_ltt_ltt-facility-id-network_ip_interface.h
+?_include_linux_ltt_ltt-facility-id-process.h
+?_include_linux_ltt_ltt-facility-id-socket.h
+?_include_linux_ltt_ltt-facility-id-statedump.h
+?_include_linux_ltt_ltt-facility-id-timer.h
+?_include_linux_ltt_ltt-facility-ipc.h
+?_include_linux_ltt_ltt-facility-kernel.h
+?_include_linux_ltt_ltt-facility-locking.h
+?_include_linux_ltt_ltt-facility-memory.h
+?_include_linux_ltt_ltt-facility-network.h
+?_include_linux_ltt_ltt-facility-network_ip_interface.h
+?_include_linux_ltt_ltt-facility-process.h
+?_include_linux_ltt_ltt-facility-socket.h
+?_include_linux_ltt_ltt-facility-statedump.h
+?_include_linux_ltt_ltt-facility-timer.h
+?_include_asm-i386_ltt_ltt-facility-id-kernel_arch_i386.h
+?_include_asm-i386_ltt_ltt-facility-kernel_arch_i386.h
+?_include_asm-i386_ltt_ltt-facility-custom-stack_arch_i386.h
+?_include_asm-i386_ltt_ltt-facility-id-stack_arch_i386.h
+?_include_asm-i386_ltt_ltt-facility-stack_arch_i386.h
+?_include_asm-i386_ltt_ltt-facility-custom-locking.h
+?_include_asm-arm_ltt_ltt-facility-id-kernel_arch_arm.h
+?_include_asm-arm_ltt_ltt-facility-kernel_arch_arm.h
+?_include_asm-mips_ltt_ltt-facility-id-kernel_arch_mips.h
+?_include_asm-mips_ltt_ltt-facility-kernel_arch_mips.h"
+
+for a in $IN; do wr $a $FILE; done
+
+
+FILE=../$NAME-facilities-loader.diff
+
+IN="?_ltt_Makefile
+?_ltt_ltt-facility-loader-core.c
+?_ltt_ltt-facility-loader-core.h
+?_ltt_ltt-facility-loader-fs.c
+?_ltt_ltt-facility-loader-fs.h
+?_ltt_ltt-facility-loader-ipc.c
+?_ltt_ltt-facility-loader-ipc.h
+?_ltt_ltt-facility-loader-kernel.c
+?_ltt_ltt-facility-loader-kernel.h
+?_ltt_ltt-facility-loader-locking.c
+?_ltt_ltt-facility-loader-locking.h
+?_ltt_ltt-facility-loader-memory.c
+?_ltt_ltt-facility-loader-memory.h
+?_ltt_ltt-facility-loader-network.c
+?_ltt_ltt-facility-loader-network.h
+?_ltt_ltt-facility-loader-network_ip_interface.c
+?_ltt_ltt-facility-loader-network_ip_interface.h
+?_ltt_ltt-facility-loader-process.c
+?_ltt_ltt-facility-loader-process.h
+?_ltt_ltt-facility-loader-socket.c
+?_ltt_ltt-facility-loader-socket.h
+?_ltt_ltt-facility-loader-statedump.c
+?_ltt_ltt-facility-loader-statedump.h
+?_ltt_ltt-facility-loader-timer.c
+?_ltt_ltt-facility-loader-timer.h
+?_ltt_ltt-facility-loader-kernel_arch_i386.c
+?_ltt_ltt-facility-loader-kernel_arch_i386.h
+?_ltt_ltt-facility-loader-stack_arch_i386.c
+?_ltt_ltt-facility-loader-stack_arch_i386.h
+?_ltt_ltt-facility-loader-kernel_arch_arm.c
+?_ltt_ltt-facility-loader-kernel_arch_arm.h
+?_ltt_ltt-facility-loader-kernel_arch_mips.c
+?_ltt_ltt-facility-loader-kernel_arch_mips.h"
+
+
+for a in $IN; do wr $a $FILE; done
+
+FILE=../$NAME-facilities.diff
+
+IN="?_include_linux_ltt-facilities.h
+?_kernel_ltt-facilities.c"
+
+for a in $IN; do wr $a $FILE; done
+
+FILE=../$NAME-relayfs.diff
+
+IN="?_Documentation_ioctl-number.txt
+?_include_linux_relayfs_fs.h
+
+?_fs_relayfs_inode.c
+?_fs_relayfs_relay.c"
+
+for a in $IN; do wr $a $FILE; done
+
+FILE=../$NAME-build.diff
+
+IN="?_Makefile"
+
+for a in $IN; do wr $a $FILE; done
+
+FILE=../$NAME-core.diff
+
+IN="?_MAINTAINERS
+
+?_include_asm-alpha_ltt.h
+?_include_asm-arm26_ltt.h
+?_include_asm-arm_ltt.h
+?_include_asm-cris_ltt.h
+?_include_asm-frv_ltt.h
+?_include_asm-generic_ltt.h
+?_include_asm-h8300_ltt.h
+?_include_asm-i386_ltt.h
+?_include_asm-ia64_ltt.h
+?_include_asm-m32r_ltt.h
+?_include_asm-m68k_ltt.h
+?_include_asm-m68knommu_ltt.h
+?_include_asm-mips_ltt.h
+?_include_asm-mips_mipsregs.h
+?_include_asm-mips_timex.h
+?_arch_mips_kernel_time.c
+?_include_asm-parisc_ltt.h
+?_include_asm-ppc64_ltt.h
+?_include_asm-ppc_ltt.h
+?_include_asm-s390_ltt.h
+?_include_asm-sh64_ltt.h
+?_include_asm-sh_ltt.h
+?_include_asm-sparc64_ltt.h
+?_include_asm-sparc_ltt.h
+?_include_asm-um_ltt.h
+?_include_asm-v850_ltt.h
+?_include_asm-x86_64_ltt.h
+?_include_linux_ltt-core.h
+?_include_linux_netlink.h
+?_include_linux_sched.h
+?_ltt_Kconfig
+?_arch_i386_Kconfig
+?_arch_ppc_Kconfig
+?_arch_arm_Kconfig
+?_arch_mips_Kconfig
+?_init_main.c
+?_kernel_Makefile
+?_kernel_ltt-base.c
+?_kernel_ltt-core.c
+?_kernel_ltt-heartbeat.c
+?_kernel_ltt-syscall.c
+?_kernel_sys_ni.c
+?_kernel_exit.c
+?_kernel_fork.c"
+
+for a in $IN; do wr $a $FILE; done
+
+cd ..
+
+rm $ALL_NAME
+tar cvfj $NAME.tar.bz2 $NAME-*
+
diff --git a/tests/kernel/Makefile b/tests/kernel/Makefile
index a2f40d35..8ee754f9 100644
--- a/tests/kernel/Makefile
+++ b/tests/kernel/Makefile
@@ -5,7 +5,7 @@ ifneq ($(CONFIG_LTT),)
 	obj-m += test-instrument-size-small.o
 	obj-m += test-instrument-size-med.o
 	obj-m += test-instrument-size-big.o
-	#test-l1-hit-probe.o
+	obj-m += test-printk-effect.o
 endif
 
 else
-- 
2.34.1