X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=instrumentation%2Fsyscalls%2Flttng-syscalls-generate-headers.sh;h=fb506269ef1b9e411609d365e33f83dc353f776c;hb=cb3ef14c052adc12da2b9e26aebf9fc6e7d82fa3;hp=f9746f5ca0b2667316f97d4e7090ff7dd289cc89;hpb=2a153251e0f4b17ed9b459678bff62961b825a70;p=lttng-modules.git diff --git a/instrumentation/syscalls/lttng-syscalls-generate-headers.sh b/instrumentation/syscalls/lttng-syscalls-generate-headers.sh old mode 100644 new mode 100755 index f9746f5c..fb506269 --- a/instrumentation/syscalls/lttng-syscalls-generate-headers.sh +++ b/instrumentation/syscalls/lttng-syscalls-generate-headers.sh @@ -1,19 +1,41 @@ #!/bin/sh # Generate system call probe description macros from syscall metadata dump file. +# The resulting header will be written in the headers subdirectory, in a file name +# based on the name of the input file. +# # example usage: # -# lttng-syscalls-generate-headers.sh integers 3.0.4 x86-64-syscalls-3.0.4 -# lttng-syscalls-generate-headers.sh pointers 3.0.4 x86-64-syscalls-3.0.4 +# lttng-syscalls-generate-headers.sh +# lttng-syscalls-generate-headers.sh integers 3.0.4 x86-64-syscalls-3.0.4 64 +# lttng-syscalls-generate-headers.sh pointers 3.0.4 x86-64-syscalls-3.0.4 64 CLASS=$1 INPUTDIR=$2 INPUTFILE=$3 +BITNESS=$4 INPUT=${INPUTDIR}/${INPUTFILE} SRCFILE=gen.tmp.0 TMPFILE=gen.tmp.1 +TMPFILE2=gen.tmp.2 +TMPFILE3=gen.tmp.3 HEADER=headers/${INPUTFILE}_${CLASS}.h +if [ x"$INPUTDIR" = x"" ]; then + echo "Error: Please specify input directory as second argument" + exit 1 +fi + +if [ x"$INPUTFILE" = x"" ]; then + echo "Error: Please specify input file as third argument" + exit 1 +fi + +if [ x"$BITNESS" != x"32" ] && [ x"$BITNESS" != x"64" ]; then + echo "Error: Please specify bitness as fourth argument (\"32\" or \"64\")" + exit 1 +fi + cp ${INPUT} ${SRCFILE} #Cleanup @@ -40,41 +62,74 @@ if [ "$CLASS" = pointers ]; then mv ${TMPFILE} ${SRCFILE} fi +if [ x"$CLASSCAP" = x"" ]; then + echo "Error: Please specify \"integers\" or \"pointers\" as first argument" + rm -f ${SRCFILE} + exit 1 +fi + 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 -#include +#include "../../../probes/lttng-tracepoint-event.h" #include +#include \"${INPUTFILE}_${CLASS}_override.h\" +#include \"syscalls_${CLASS}_override.h\" " >> ${HEADER} if [ "$CLASS" = integers ]; then NRARGS=0 -echo \ -'DECLARE_EVENT_CLASS_NOARGS(syscalls_noargs,\n'\ +printf \ +'#ifdef SC_ENTER\n'\ + >> ${HEADER} + +printf \ +'SC_LTTNG_TRACEPOINT_EVENT_CLASS_NOARGS(syscalls_noargs,\n'\ ' TP_STRUCT__entry(),\n'\ ' TP_fast_assign(),\n'\ ' TP_printk()\n'\ -')'\ +')\n'\ >> ${HEADER} grep "^syscall [^ ]* nr [^ ]* nbargs ${NRARGS} " ${SRCFILE} > ${TMPFILE} perl -p -e 's/^syscall ([^ ]*) nr ([^ ]*) nbargs ([^ ]*) '\ 'types: \(([^)]*)\) '\ 'args: \(([^)]*)\)/'\ -'DEFINE_EVENT_NOARGS(syscalls_noargs, sys_$1)'\ -'/g'\ +'#ifndef OVERRIDE_'"${BITNESS}"'_$1\n'\ +'SC_LTTNG_TRACEPOINT_EVENT_INSTANCE_NOARGS(syscalls_noargs, $1)\n'\ +'#endif/g'\ ${TMPFILE} >> ${HEADER} +printf \ +'#else /* #ifdef SC_ENTER */\n'\ + >> ${HEADER} + +grep "^syscall [^ ]* nr [^ ]* nbargs ${NRARGS} " ${SRCFILE} > ${TMPFILE} +perl -p -e 's/^syscall ([^ ]*) nr ([^ ]*) nbargs ([^ ]*) '\ +'types: \(([^)]*)\) '\ +'args: \(([^)]*)\)/'\ +'#ifndef OVERRIDE_'"${BITNESS}"'_$1\n'\ +'SC_LTTNG_TRACEPOINT_EVENT($1,\n'\ +' TP_PROTO(sc_exit(long ret)),\n'\ +' TP_ARGS(sc_exit(ret)),\n'\ +' TP_STRUCT__entry(sc_exit(__field(long, ret))),\n'\ +' TP_fast_assign(sc_exit(tp_assign(long, ret, ret))),\n'\ +' TP_printk()\n'\ +')\n'\ +'#endif/g'\ + ${TMPFILE} >> ${HEADER} + +printf \ +'#endif /* else #ifdef SC_ENTER */\n'\ + >> ${HEADER} + fi @@ -83,51 +138,84 @@ fi NRARGS=1 grep "^syscall [^ ]* nr [^ ]* nbargs ${NRARGS} " ${SRCFILE} > ${TMPFILE} -perl -p -e 's/^syscall ([^ ]*) nr ([^ ]*) nbargs ([^ ]*) '\ + +while read LINE; do + echo "${LINE}" > ${TMPFILE2} + perl -p -e 's/^syscall ([^ ]*) .*/$1/g' ${TMPFILE2} > ${TMPFILE3} + SC_NAME=$(cat ${TMPFILE3}) + ARG1=$(./lttng-get-syscall-inout.sh table-syscall-inout.txt ${SC_NAME} 1) + echo Syscall: ${SC_NAME} ${ARG1} + perl -p -e 's/^syscall ([^ ]*) nr ([^ ]*) nbargs ([^ ]*) '\ 'types: \(([^)]*)\) '\ 'args: \(([^)]*)\)/'\ -'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'\ +'#ifndef OVERRIDE_'"${BITNESS}"'_$1\n'\ +'SC_LTTNG_TRACEPOINT_EVENT($1,\n'\ +' TP_PROTO(sc_exit(long ret,) $4 $5),\n'\ +' TP_ARGS(sc_exit(ret,) $5),\n'\ +' TP_STRUCT__entry(sc_exit(__field(long, ret)) '"${ARG1}"'(__field($4, $5))),\n'\ +' TP_fast_assign(sc_exit(tp_assign(long, ret, ret)) '"${ARG1}"'(tp_assign($4, $5, $5))),\n'\ ' TP_printk()\n'\ -')/g'\ - ${TMPFILE} >> ${HEADER} +')\n'\ +'#endif/g'\ + ${TMPFILE2} >> ${HEADER} +done < ${TMPFILE} # types: 4 5 # args 6 7 NRARGS=2 grep "^syscall [^ ]* nr [^ ]* nbargs ${NRARGS} " ${SRCFILE} > ${TMPFILE} -perl -p -e 's/^syscall ([^ ]*) nr ([^ ]*) nbargs ([^ ]*) '\ + +while read LINE; do + echo "${LINE}" > ${TMPFILE2} + perl -p -e 's/^syscall ([^ ]*) .*/$1/g' ${TMPFILE2} > ${TMPFILE3} + SC_NAME=$(cat ${TMPFILE3}) + ARG1=$(./lttng-get-syscall-inout.sh table-syscall-inout.txt ${SC_NAME} 1) + ARG2=$(./lttng-get-syscall-inout.sh table-syscall-inout.txt ${SC_NAME} 2) + echo Syscall: ${SC_NAME} ${ARG1} ${ARG2} + perl -p -e 's/^syscall ([^ ]*) nr ([^ ]*) nbargs ([^ ]*) '\ 'types: \(([^,]*), ([^)]*)\) '\ 'args: \(([^,]*), ([^)]*)\)/'\ -'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'\ +'#ifndef OVERRIDE_'"${BITNESS}"'_$1\n'\ +'SC_LTTNG_TRACEPOINT_EVENT($1,\n'\ +' TP_PROTO(sc_exit(long ret,) $4 $6, $5 $7),\n'\ +' TP_ARGS(sc_exit(ret,) $6, $7),\n'\ +' TP_STRUCT__entry(sc_exit(__field(long, ret)) '"${ARG1}"'(__field($4, $6)) '"${ARG2}"'(__field($5, $7))),\n'\ +' TP_fast_assign(sc_exit(tp_assign(long, ret, ret)) '"${ARG1}"'(tp_assign($4, $6, $6)) '"${ARG2}"'(tp_assign($5, $7, $7))),\n'\ ' TP_printk()\n'\ -')/g'\ - ${TMPFILE} >> ${HEADER} +')\n'\ +'#endif/g'\ + ${TMPFILE2} >> ${HEADER} +done < ${TMPFILE} # types: 4 5 6 # args 7 8 9 NRARGS=3 grep "^syscall [^ ]* nr [^ ]* nbargs ${NRARGS} " ${SRCFILE} > ${TMPFILE} -perl -p -e 's/^syscall ([^ ]*) nr ([^ ]*) nbargs ([^ ]*) '\ + +while read LINE; do + echo "${LINE}" > ${TMPFILE2} + perl -p -e 's/^syscall ([^ ]*) .*/$1/g' ${TMPFILE2} > ${TMPFILE3} + SC_NAME=$(cat ${TMPFILE3}) + ARG1=$(./lttng-get-syscall-inout.sh table-syscall-inout.txt ${SC_NAME} 1) + ARG2=$(./lttng-get-syscall-inout.sh table-syscall-inout.txt ${SC_NAME} 2) + ARG3=$(./lttng-get-syscall-inout.sh table-syscall-inout.txt ${SC_NAME} 3) + echo Syscall: ${SC_NAME} ${ARG1} ${ARG2} ${ARG3} + perl -p -e 's/^syscall ([^ ]*) nr ([^ ]*) nbargs ([^ ]*) '\ 'types: \(([^,]*), ([^,]*), ([^)]*)\) '\ 'args: \(([^,]*), ([^,]*), ([^)]*)\)/'\ -'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'\ +'#ifndef OVERRIDE_'"${BITNESS}"'_$1\n'\ +'SC_LTTNG_TRACEPOINT_EVENT($1,\n'\ +' TP_PROTO(sc_exit(long ret,) $4 $7, $5 $8, $6 $9),\n'\ +' TP_ARGS(sc_exit(ret,) $7, $8, $9),\n'\ +' TP_STRUCT__entry(sc_exit(__field(long, ret)) '"${ARG1}"'(__field($4, $7)) '"${ARG2}"'(__field($5, $8)) '"${ARG3}"'(__field($6, $9))),\n'\ +' TP_fast_assign(sc_exit(tp_assign(long, ret, ret)) '"${ARG1}"'(tp_assign($4, $7, $7)) '"${ARG2}"'(tp_assign($5, $8, $8)) '"${ARG3}"'(tp_assign($6, $9, $9))),\n'\ ' TP_printk()\n'\ -')/g'\ - ${TMPFILE} >> ${HEADER} +')\n'\ +'#endif/g'\ + ${TMPFILE2} >> ${HEADER} +done < ${TMPFILE} # types: 4 5 6 7 @@ -135,34 +223,61 @@ perl -p -e 's/^syscall ([^ ]*) nr ([^ ]*) nbargs ([^ ]*) '\ NRARGS=4 grep "^syscall [^ ]* nr [^ ]* nbargs ${NRARGS} " ${SRCFILE} > ${TMPFILE} -perl -p -e 's/^syscall ([^ ]*) nr ([^ ]*) nbargs ([^ ]*) '\ + +while read LINE; do + echo "${LINE}" > ${TMPFILE2} + perl -p -e 's/^syscall ([^ ]*) .*/$1/g' ${TMPFILE2} > ${TMPFILE3} + SC_NAME=$(cat ${TMPFILE3}) + ARG1=$(./lttng-get-syscall-inout.sh table-syscall-inout.txt ${SC_NAME} 1) + ARG2=$(./lttng-get-syscall-inout.sh table-syscall-inout.txt ${SC_NAME} 2) + ARG3=$(./lttng-get-syscall-inout.sh table-syscall-inout.txt ${SC_NAME} 3) + ARG4=$(./lttng-get-syscall-inout.sh table-syscall-inout.txt ${SC_NAME} 4) + echo Syscall: ${SC_NAME} ${ARG1} ${ARG2} ${ARG3} ${ARG4} + perl -p -e 's/^syscall ([^ ]*) nr ([^ ]*) nbargs ([^ ]*) '\ 'types: \(([^,]*), ([^,]*), ([^,]*), ([^)]*)\) '\ 'args: \(([^,]*), ([^,]*), ([^,]*), ([^)]*)\)/'\ -'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'\ +'#ifndef OVERRIDE_'"${BITNESS}"'_$1\n'\ +'SC_LTTNG_TRACEPOINT_EVENT($1,\n'\ +' TP_PROTO(sc_exit(long ret,) $4 $8, $5 $9, $6 $10, $7 $11),\n'\ +' TP_ARGS(sc_exit(ret,) $8, $9, $10, $11),\n'\ +' TP_STRUCT__entry(sc_exit(__field(long, ret)) '"${ARG1}"'(__field($4, $8)) '"${ARG2}"'(__field($5, $9)) '"${ARG3}"'(__field($6, $10)) '"${ARG4}"'(__field($7, $11))),\n'\ +' TP_fast_assign(sc_exit(tp_assign(long, ret, ret)) '"${ARG1}"'(tp_assign($4, $8, $8)) '"${ARG2}"'(tp_assign($5, $9, $9)) '"${ARG3}"'(tp_assign($6, $10, $10)) '"${ARG4}"'(tp_assign($7, $11, $11))),\n'\ ' TP_printk()\n'\ -')/g'\ - ${TMPFILE} >> ${HEADER} +')\n'\ +'#endif/g'\ + ${TMPFILE2} >> ${HEADER} +done < ${TMPFILE} # types: 4 5 6 7 8 # args 9 10 11 12 13 NRARGS=5 grep "^syscall [^ ]* nr [^ ]* nbargs ${NRARGS} " ${SRCFILE} > ${TMPFILE} -perl -p -e 's/^syscall ([^ ]*) nr ([^ ]*) nbargs ([^ ]*) '\ + +while read LINE; do + echo "${LINE}" > ${TMPFILE2} + perl -p -e 's/^syscall ([^ ]*) .*/$1/g' ${TMPFILE2} > ${TMPFILE3} + SC_NAME=$(cat ${TMPFILE3}) + ARG1=$(./lttng-get-syscall-inout.sh table-syscall-inout.txt ${SC_NAME} 1) + ARG2=$(./lttng-get-syscall-inout.sh table-syscall-inout.txt ${SC_NAME} 2) + ARG3=$(./lttng-get-syscall-inout.sh table-syscall-inout.txt ${SC_NAME} 3) + ARG4=$(./lttng-get-syscall-inout.sh table-syscall-inout.txt ${SC_NAME} 4) + ARG5=$(./lttng-get-syscall-inout.sh table-syscall-inout.txt ${SC_NAME} 5) + echo Syscall: ${SC_NAME} ${ARG1} ${ARG2} ${ARG3} ${ARG4} ${ARG5} + perl -p -e 's/^syscall ([^ ]*) nr ([^ ]*) nbargs ([^ ]*) '\ 'types: \(([^,]*), ([^,]*), ([^,]*), ([^,]*), ([^)]*)\) '\ 'args: \(([^,]*), ([^,]*), ([^,]*), ([^,]*), ([^)]*)\)/'\ -'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'\ +'#ifndef OVERRIDE_'"${BITNESS}"'_$1\n'\ +'SC_LTTNG_TRACEPOINT_EVENT($1,\n'\ +' TP_PROTO(sc_exit(long ret,) $4 $9, $5 $10, $6 $11, $7 $12, $8 $13),\n'\ +' TP_ARGS(sc_exit(ret,) $9, $10, $11, $12, $13),\n'\ +' TP_STRUCT__entry(sc_exit(__field(long, ret)) '"${ARG1}"'(__field($4, $9)) '"${ARG2}"'(__field($5, $10)) '"${ARG3}"'(__field($6, $11)) '"${ARG4}"'(__field($7, $12)) '"${ARG5}"'(__field($8, $13))),\n'\ +' TP_fast_assign(sc_exit(tp_assign(long, ret, ret)) '"${ARG1}"'(tp_assign($4, $9, $9)) '"${ARG2}"'(tp_assign($5, $10, $10)) '"${ARG3}"'(tp_assign($6, $11, $11)) '"${ARG4}"'(tp_assign($7, $12, $12)) '"${ARG5}"'(tp_assign($8, $13, $13))),\n'\ ' TP_printk()\n'\ -')/g'\ - ${TMPFILE} >> ${HEADER} +')\n'\ +'#endif/g'\ + ${TMPFILE2} >> ${HEADER} +done < ${TMPFILE} # types: 4 5 6 7 8 9 @@ -170,25 +285,35 @@ perl -p -e 's/^syscall ([^ ]*) nr ([^ ]*) nbargs ([^ ]*) '\ NRARGS=6 grep "^syscall [^ ]* nr [^ ]* nbargs ${NRARGS} " ${SRCFILE} > ${TMPFILE} -perl -p -e 's/^syscall ([^ ]*) nr ([^ ]*) nbargs ([^ ]*) '\ + +while read LINE; do + echo "${LINE}" > ${TMPFILE2} + perl -p -e 's/^syscall ([^ ]*) .*/$1/g' ${TMPFILE2} > ${TMPFILE3} + SC_NAME=$(cat ${TMPFILE3}) + ARG1=$(./lttng-get-syscall-inout.sh table-syscall-inout.txt ${SC_NAME} 1) + ARG2=$(./lttng-get-syscall-inout.sh table-syscall-inout.txt ${SC_NAME} 2) + ARG3=$(./lttng-get-syscall-inout.sh table-syscall-inout.txt ${SC_NAME} 3) + ARG4=$(./lttng-get-syscall-inout.sh table-syscall-inout.txt ${SC_NAME} 4) + ARG5=$(./lttng-get-syscall-inout.sh table-syscall-inout.txt ${SC_NAME} 5) + ARG6=$(./lttng-get-syscall-inout.sh table-syscall-inout.txt ${SC_NAME} 6) + echo Syscall: ${SC_NAME} ${ARG1} ${ARG2} ${ARG3} ${ARG4} ${ARG5} ${ARG6} + perl -p -e 's/^syscall ([^ ]*) nr ([^ ]*) nbargs ([^ ]*) '\ 'types: \(([^,]*), ([^,]*), ([^,]*), ([^,]*), ([^,]*), ([^\)]*)\) '\ 'args: \(([^,]*), ([^,]*), ([^,]*), ([^,]*), ([^,]*), ([^\)]*)\)/'\ -'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'\ +'#ifndef OVERRIDE_'"${BITNESS}"'_$1\n'\ +'SC_LTTNG_TRACEPOINT_EVENT($1,\n'\ +' TP_PROTO(sc_exit(long ret,) $4 $10, $5 $11, $6 $12, $7 $13, $8 $14, $9 $15),\n'\ +' TP_ARGS(sc_exit(ret,) $10, $11, $12, $13, $14, $15),\n'\ +' TP_STRUCT__entry(sc_exit(__field(long, ret)) '"${ARG1}"'(__field($4, $10)) '"${ARG2}"'(__field($5, $11)) '"${ARG3}"'(__field($6, $12)) '"${ARG4}"'(__field($7, $13)) '"${ARG5}"'(__field($8, $14)) '"${ARG6}"'(__field($9, $15))),\n'\ +' TP_fast_assign(sc_exit(tp_assign(long, ret, ret)) '"${ARG1}"'(tp_assign($4, $10, $10)) '"${ARG2}"'(tp_assign($5, $11, $11)) '"${ARG3}"'(tp_assign($6, $12, $12)) '"${ARG4}"'(tp_assign($7, $13, $13)) '"${ARG5}"'(tp_assign($8, $14, $14)) '"${ARG6}"'(tp_assign($9, $15, $15))),\n'\ ' TP_printk()\n'\ -')/g'\ - ${TMPFILE} >> ${HEADER} +')\n'\ +'#endif/g'\ + ${TMPFILE2} >> ${HEADER} +done < ${TMPFILE} # Macro for tracing syscall table -rm -f ${TMPFILE} -for NRARGS in $(seq 0 6); do - grep "^syscall [^ ]* nr [^ ]* nbargs ${NRARGS} " ${SRCFILE} >> ${TMPFILE} -done - echo \ " #endif /* _TRACE_SYSCALLS_${CLASSCAP}_H */ @@ -197,23 +322,50 @@ echo \ #include \"../../../probes/define_trace.h\" #else /* CREATE_SYSCALL_TABLE */ -" >> ${HEADER} +#include \"${INPUTFILE}_${CLASS}_override.h\" +#include \"syscalls_${CLASS}_override.h\" +" >> ${HEADER} NRARGS=0 if [ "$CLASS" = integers ]; then #noargs + +printf \ +'#ifdef SC_ENTER\n'\ + >> ${HEADER} + +grep "^syscall [^ ]* nr [^ ]* nbargs ${NRARGS} " ${SRCFILE} > ${TMPFILE} +perl -p -e 's/^syscall ([^ ]*) nr ([^ ]*) nbargs ([^ ]*) .*$/'\ +'#ifndef OVERRIDE_TABLE_'"${BITNESS}"'_$1\n'\ +'TRACE_SYSCALL_TABLE\(syscalls_noargs, $1, $2, $3\)\n'\ +'#endif/g'\ + ${TMPFILE} >> ${HEADER} + +printf \ +'#else /* #ifdef SC_ENTER */\n'\ + >> ${HEADER} + grep "^syscall [^ ]* nr [^ ]* nbargs ${NRARGS} " ${SRCFILE} > ${TMPFILE} perl -p -e 's/^syscall ([^ ]*) nr ([^ ]*) nbargs ([^ ]*) .*$/'\ -'TRACE_SYSCALL_TABLE\(syscalls_noargs, sys_$1, $2, $3\)/g'\ +'#ifndef OVERRIDE_TABLE_'"${BITNESS}"'_$1\n'\ +'TRACE_SYSCALL_TABLE($1, $1, $2, $3)\n'\ +'#endif/g'\ ${TMPFILE} >> ${HEADER} + +printf \ +'#endif /* else #ifdef SC_ENTER */\n'\ + >> ${HEADER} + fi #others. grep -v "^syscall [^ ]* nr [^ ]* nbargs ${NRARGS} " ${SRCFILE} > ${TMPFILE} perl -p -e 's/^syscall ([^ ]*) nr ([^ ]*) nbargs ([^ ]*) .*$/'\ -'TRACE_SYSCALL_TABLE(sys_$1, sys_$1, $2, $3)/g'\ +'#ifndef OVERRIDE_TABLE_'"${BITNESS}"'_$1\n'\ +'TRACE_SYSCALL_TABLE($1, $1, $2, $3)\n'\ +'#endif/g'\ ${TMPFILE} >> ${HEADER} echo -n \ @@ -221,21 +373,38 @@ 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 ${TMPFILE3} +rm -f ${TMPFILE2} rm -f ${TMPFILE} rm -f ${SRCFILE}