X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=instrumentation%2Fsyscalls%2Flttng-syscalls-generate-headers.sh;h=c6636e7688da16f562d0b32ffe067bc757c9d2c2;hb=67308615eff7463f7962ef38304d36af9dda5f2a;hp=b98a5e1031a31b6aa6b188df6b30b834ed2e1d16;hpb=cac8f1aa8774b81f6fe72f670a9413d9287db263;p=lttng-modules.git

diff --git a/instrumentation/syscalls/lttng-syscalls-generate-headers.sh b/instrumentation/syscalls/lttng-syscalls-generate-headers.sh
index b98a5e10..c6636e76 100644
--- a/instrumentation/syscalls/lttng-syscalls-generate-headers.sh
+++ b/instrumentation/syscalls/lttng-syscalls-generate-headers.sh
@@ -45,9 +45,6 @@ echo "/* THIS FILE IS AUTO-GENERATED. DO NOT EDIT */" > ${HEADER}
 echo \
 "#ifndef CREATE_SYSCALL_TABLE
 
-#undef TRACE_SYSTEM
-#define TRACE_SYSTEM syscalls_${CLASS}
-
 #if !defined(_TRACE_SYSCALLS_${CLASSCAP}_H) || defined(TRACE_HEADER_MULTI_READ)
 #define _TRACE_SYSCALLS_${CLASSCAP}_H
 
@@ -61,7 +58,7 @@ if [ "$CLASS" = integers ]; then
 NRARGS=0
 
 echo \
-'DECLARE_EVENT_CLASS_NOARGS(syscalls_noargs,\n'\
+'SC_DECLARE_EVENT_CLASS_NOARGS(syscalls_noargs,\n'\
 '	TP_STRUCT__entry(),\n'\
 '	TP_fast_assign(),\n'\
 '	TP_printk()\n'\
@@ -73,7 +70,7 @@ perl -p -e 's/^syscall ([^ ]*) nr ([^ ]*) nbargs ([^ ]*) '\
 'types: \(([^)]*)\) '\
 'args: \(([^)]*)\)/'\
 '#ifndef OVERRIDE_sys_$1\n'\
-'DEFINE_EVENT_NOARGS(syscalls_noargs, sys_$1)\n'\
+'SC_DEFINE_EVENT_NOARGS(syscalls_noargs, sys_$1)\n'\
 '#endif/g'\
 	${TMPFILE} >> ${HEADER}
 
@@ -89,11 +86,11 @@ perl -p -e 's/^syscall ([^ ]*) nr ([^ ]*) nbargs ([^ ]*) '\
 'types: \(([^)]*)\) '\
 'args: \(([^)]*)\)/'\
 '#ifndef OVERRIDE_sys_$1\n'\
-'TRACE_EVENT(sys_$1,\n'\
+'SC_TRACE_EVENT(sys_$1,\n'\
 '	TP_PROTO($4 $5),\n'\
 '	TP_ARGS($5),\n'\
 '	TP_STRUCT__entry(__field($4, $5)),\n'\
-'	TP_fast_assign(tp_assign($5, $5)),\n'\
+'	TP_fast_assign(tp_assign($4, $5, $5)),\n'\
 '	TP_printk()\n'\
 ')\n'\
 '#endif/g'\
@@ -108,11 +105,11 @@ perl -p -e 's/^syscall ([^ ]*) nr ([^ ]*) nbargs ([^ ]*) '\
 'types: \(([^,]*), ([^)]*)\) '\
 'args: \(([^,]*), ([^)]*)\)/'\
 '#ifndef OVERRIDE_sys_$1\n'\
-'TRACE_EVENT(sys_$1,\n'\
+'SC_TRACE_EVENT(sys_$1,\n'\
 '	TP_PROTO($4 $6, $5 $7),\n'\
 '	TP_ARGS($6, $7),\n'\
 '	TP_STRUCT__entry(__field($4, $6) __field($5, $7)),\n'\
-'	TP_fast_assign(tp_assign($6, $6) tp_assign($7, $7)),\n'\
+'	TP_fast_assign(tp_assign($4, $6, $6) tp_assign($5, $7, $7)),\n'\
 '	TP_printk()\n'\
 ')\n'\
 '#endif/g'\
@@ -127,11 +124,11 @@ perl -p -e 's/^syscall ([^ ]*) nr ([^ ]*) nbargs ([^ ]*) '\
 'types: \(([^,]*), ([^,]*), ([^)]*)\) '\
 'args: \(([^,]*), ([^,]*), ([^)]*)\)/'\
 '#ifndef OVERRIDE_sys_$1\n'\
-'TRACE_EVENT(sys_$1,\n'\
+'SC_TRACE_EVENT(sys_$1,\n'\
 '	TP_PROTO($4 $7, $5 $8, $6 $9),\n'\
 '	TP_ARGS($7, $8, $9),\n'\
 '	TP_STRUCT__entry(__field($4, $7) __field($5, $8) __field($6, $9)),\n'\
-'	TP_fast_assign(tp_assign($7, $7) tp_assign($8, $8) tp_assign($9, $9)),\n'\
+'	TP_fast_assign(tp_assign($4, $7, $7) tp_assign($5, $8, $8) tp_assign($6, $9, $9)),\n'\
 '	TP_printk()\n'\
 ')\n'\
 '#endif/g'\
@@ -147,11 +144,11 @@ perl -p -e 's/^syscall ([^ ]*) nr ([^ ]*) nbargs ([^ ]*) '\
 'types: \(([^,]*), ([^,]*), ([^,]*), ([^)]*)\) '\
 'args: \(([^,]*), ([^,]*), ([^,]*), ([^)]*)\)/'\
 '#ifndef OVERRIDE_sys_$1\n'\
-'TRACE_EVENT(sys_$1,\n'\
+'SC_TRACE_EVENT(sys_$1,\n'\
 '	TP_PROTO($4 $8, $5 $9, $6 $10, $7 $11),\n'\
 '	TP_ARGS($8, $9, $10, $11),\n'\
 '	TP_STRUCT__entry(__field($4, $8) __field($5, $9) __field($6, $10) __field($7, $11)),\n'\
-'	TP_fast_assign(tp_assign($8, $8) tp_assign($9, $9) tp_assign($10, $10) tp_assign($11, $11)),\n'\
+'	TP_fast_assign(tp_assign($4, $8, $8) tp_assign($5, $9, $9) tp_assign($6, $10, $10) tp_assign($7, $11, $11)),\n'\
 '	TP_printk()\n'\
 ')\n'\
 '#endif/g'\
@@ -166,11 +163,11 @@ perl -p -e 's/^syscall ([^ ]*) nr ([^ ]*) nbargs ([^ ]*) '\
 'types: \(([^,]*), ([^,]*), ([^,]*), ([^,]*), ([^)]*)\) '\
 'args: \(([^,]*), ([^,]*), ([^,]*), ([^,]*), ([^)]*)\)/'\
 '#ifndef OVERRIDE_sys_$1\n'\
-'TRACE_EVENT(sys_$1,\n'\
+'SC_TRACE_EVENT(sys_$1,\n'\
 '	TP_PROTO($4 $9, $5 $10, $6 $11, $7 $12, $8 $13),\n'\
 '	TP_ARGS($9, $10, $11, $12, $13),\n'\
 '	TP_STRUCT__entry(__field($4, $9) __field($5, $10) __field($6, $11) __field($7, $12) __field($8, $13)),\n'\
-'	TP_fast_assign(tp_assign($9, $9) tp_assign($10, $10) tp_assign($11, $11) tp_assign($12, $12) tp_assign($13, $13)),\n'\
+'	TP_fast_assign(tp_assign($4, $9, $9) tp_assign($5, $10, $10) tp_assign($6, $11, $11) tp_assign($7, $12, $12) tp_assign($8, $13, $13)),\n'\
 '	TP_printk()\n'\
 ')\n'\
 '#endif/g'\
@@ -186,11 +183,11 @@ perl -p -e 's/^syscall ([^ ]*) nr ([^ ]*) nbargs ([^ ]*) '\
 'types: \(([^,]*), ([^,]*), ([^,]*), ([^,]*), ([^,]*), ([^\)]*)\) '\
 'args: \(([^,]*), ([^,]*), ([^,]*), ([^,]*), ([^,]*), ([^\)]*)\)/'\
 '#ifndef OVERRIDE_sys_$1\n'\
-'TRACE_EVENT(sys_$1,\n'\
+'SC_TRACE_EVENT(sys_$1,\n'\
 '	TP_PROTO($4 $10, $5 $11, $6 $12, $7 $13, $8 $14, $9 $15),\n'\
 '	TP_ARGS($10, $11, $12, $13, $14, $15),\n'\
 '	TP_STRUCT__entry(__field($4, $10) __field($5, $11) __field($6, $12) __field($7, $13) __field($8, $14) __field($9, $15)),\n'\
-'	TP_fast_assign(tp_assign($10, $10) tp_assign($11, $11) tp_assign($12, $12) tp_assign($13, $13) tp_assign($14, $14) tp_assign($15, $15)),\n'\
+'	TP_fast_assign(tp_assign($4, $10, $10) tp_assign($5, $11, $11) tp_assign($6, $12, $12) tp_assign($7, $13, $13) tp_assign($8, $14, $14) tp_assign($9, $15, $15)),\n'\
 '	TP_printk()\n'\
 ')\n'\
 '#endif/g'\
@@ -221,7 +218,7 @@ if [ "$CLASS" = integers ]; then
 #noargs
 grep "^syscall [^ ]* nr [^ ]* nbargs ${NRARGS} " ${SRCFILE} > ${TMPFILE}
 perl -p -e 's/^syscall ([^ ]*) nr ([^ ]*) nbargs ([^ ]*) .*$/'\
-'#ifndef OVERRIDE_sys_$1\n'\
+'#ifndef OVERRIDE_TABLE_sys_$1\n'\
 'TRACE_SYSCALL_TABLE\(syscalls_noargs, sys_$1, $2, $3\)\n'\
 '#endif/g'\
 	${TMPFILE} >> ${HEADER}
@@ -230,7 +227,7 @@ fi
 #others.
 grep -v "^syscall [^ ]* nr [^ ]* nbargs ${NRARGS} " ${SRCFILE} > ${TMPFILE}
 perl -p -e 's/^syscall ([^ ]*) nr ([^ ]*) nbargs ([^ ]*) .*$/'\
-'#ifndef OVERRIDE_sys_$1\n'\
+'#ifndef OVERRIDE_TABLE_sys_$1\n'\
 'TRACE_SYSCALL_TABLE(sys_$1, sys_$1, $2, $3)\n'\
 '#endif/g'\
 	${TMPFILE} >> ${HEADER}
@@ -240,21 +237,36 @@ echo -n \
 #endif /* CREATE_SYSCALL_TABLE */
 " >> ${HEADER}
 
-#prettify addresses heuristics.
+#fields names: ...char * type with *name* or *file* or *path* or *root*
+# or *put_old* or *type*
 cp -f ${HEADER} ${TMPFILE}
 rm -f ${HEADER}
-
-#field names with addr or ptr
-perl -p -e 's/__field\(([^,)]*), ([^a,)]*addr|[^p,)]*ptr)([^),]*)\)/__field_hex($1, $2$3)/g'\
+perl -p -e 's/__field\(([^,)]*char \*), ([^\)]*)(name|file|path|root|put_old|type)([^\)]*)\)/__string_from_user($2$3$4, $2$3$4)/g'\
+	${TMPFILE} >> ${HEADER}
+cp -f ${HEADER} ${TMPFILE}
+rm -f ${HEADER}
+perl -p -e 's/tp_assign\(([^,)]*char \*), ([^,]*)(name|file|path|root|put_old|type)([^,]*), ([^\)]*)\)/tp_copy_string_from_user($2$3$4, $5)/g'\
 	${TMPFILE} >> ${HEADER}
 
+#prettify addresses heuristics.
+#field names with addr or ptr
 cp -f ${HEADER} ${TMPFILE}
 rm -f ${HEADER}
+perl -p -e 's/__field\(([^,)]*), ([^,)]*addr|[^,)]*ptr)([^),]*)\)/__field_hex($1, $2$3)/g'\
+	${TMPFILE} >> ${HEADER}
 
 #field types ending with '*'
+cp -f ${HEADER} ${TMPFILE}
+rm -f ${HEADER}
 perl -p -e 's/__field\(([^,)]*\*), ([^),]*)\)/__field_hex($1, $2)/g'\
 	${TMPFILE} >> ${HEADER}
 
+#strip the extra type information from tp_assign.
+cp -f ${HEADER} ${TMPFILE}
+rm -f ${HEADER}
+perl -p -e 's/tp_assign\(([^,)]*), ([^,]*), ([^\)]*)\)/tp_assign($2, $3)/g'\
+	${TMPFILE} >> ${HEADER}
+
 rm -f ${INPUTFILE}.tmp
 rm -f ${TMPFILE}
 rm -f ${SRCFILE}