X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=instrumentation%2Fsyscalls%2Flttng-syscalls-generate-headers.sh;h=4b601b492bb344594933615e65099a04c8c04acd;hb=42a03cb282877dbefbf7da733d71131fa0f83ae0;hp=45d2de5a9614ec42c5bfb1497776b901f5616b52;hpb=b75d00c45a91af319370f3d494cd953b578ea228;p=lttng-modules.git diff --git a/instrumentation/syscalls/lttng-syscalls-generate-headers.sh b/instrumentation/syscalls/lttng-syscalls-generate-headers.sh index 45d2de5a..4b601b49 100755 --- a/instrumentation/syscalls/lttng-syscalls-generate-headers.sh +++ b/instrumentation/syscalls/lttng-syscalls-generate-headers.sh @@ -76,7 +76,7 @@ echo \ #if !defined(_TRACE_SYSCALLS_${CLASSCAP}_H) || defined(TRACE_HEADER_MULTI_READ) #define _TRACE_SYSCALLS_${CLASSCAP}_H -#include +#include #include #include \"${INPUTFILE}_${CLASS}_override.h\" #include \"syscalls_${CLASS}_override.h\" @@ -91,10 +91,8 @@ printf \ >> ${HEADER} printf \ -'SC_DECLARE_EVENT_CLASS_NOARGS(syscalls_noargs,\n'\ -' TP_STRUCT__entry(),\n'\ -' TP_fast_assign(),\n'\ -' TP_printk()\n'\ +'SC_LTTNG_TRACEPOINT_EVENT_CLASS_NOARGS(syscalls_noargs,\n'\ +' TP_FIELDS()\n'\ ')\n'\ >> ${HEADER} @@ -102,8 +100,8 @@ grep "^syscall [^ ]* nr [^ ]* nbargs ${NRARGS} " ${SRCFILE} > ${TMPFILE} perl -p -e 's/^syscall ([^ ]*) nr ([^ ]*) nbargs ([^ ]*) '\ 'types: \(([^)]*)\) '\ 'args: \(([^)]*)\)/'\ -'#ifndef OVERRIDE_'"${BITNESS}"'_sys_$1\n'\ -'SC_DEFINE_EVENT_NOARGS(syscalls_noargs, sys_$1)\n'\ +'#ifndef OVERRIDE_'"${BITNESS}"'_$1\n'\ +'SC_LTTNG_TRACEPOINT_EVENT_INSTANCE_NOARGS(syscalls_noargs, $1)\n'\ '#endif/g'\ ${TMPFILE} >> ${HEADER} @@ -115,13 +113,11 @@ grep "^syscall [^ ]* nr [^ ]* nbargs ${NRARGS} " ${SRCFILE} > ${TMPFILE} perl -p -e 's/^syscall ([^ ]*) nr ([^ ]*) nbargs ([^ ]*) '\ 'types: \(([^)]*)\) '\ 'args: \(([^)]*)\)/'\ -'#ifndef OVERRIDE_'"${BITNESS}"'_sys_$1\n'\ -'SC_TRACE_EVENT(sys_$1,\n'\ +'#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'\ +' TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)))\n'\ ')\n'\ '#endif/g'\ ${TMPFILE} >> ${HEADER} @@ -143,18 +139,16 @@ 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 sys_${SC_NAME} 1) + 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: \(([^)]*)\)/'\ -'#ifndef OVERRIDE_'"${BITNESS}"'_sys_$1\n'\ -'SC_TRACE_EVENT(sys_$1,\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'\ +' TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) '"${ARG1}"'(ctf_integer($4, $5, $5)))\n'\ ')\n'\ '#endif/g'\ ${TMPFILE2} >> ${HEADER} @@ -170,19 +164,17 @@ 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 sys_${SC_NAME} 1) - ARG2=$(./lttng-get-syscall-inout.sh table-syscall-inout.txt sys_${SC_NAME} 2) + 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: \(([^,]*), ([^)]*)\)/'\ -'#ifndef OVERRIDE_'"${BITNESS}"'_sys_$1\n'\ -'SC_TRACE_EVENT(sys_$1,\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'\ +' TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) '"${ARG1}"'(ctf_integer($4, $6, $6)) '"${ARG2}"'(ctf_integer($5, $7, $7)))\n'\ ')\n'\ '#endif/g'\ ${TMPFILE2} >> ${HEADER} @@ -198,20 +190,18 @@ 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 sys_${SC_NAME} 1) - ARG2=$(./lttng-get-syscall-inout.sh table-syscall-inout.txt sys_${SC_NAME} 2) - ARG3=$(./lttng-get-syscall-inout.sh table-syscall-inout.txt sys_${SC_NAME} 3) + 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: \(([^,]*), ([^,]*), ([^)]*)\)/'\ -'#ifndef OVERRIDE_'"${BITNESS}"'_sys_$1\n'\ -'SC_TRACE_EVENT(sys_$1,\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'\ +' TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) '"${ARG1}"'(ctf_integer($4, $7, $7)) '"${ARG2}"'(ctf_integer($5, $8, $8)) '"${ARG3}"'(ctf_integer($6, $9, $9)))\n'\ ')\n'\ '#endif/g'\ ${TMPFILE2} >> ${HEADER} @@ -228,21 +218,19 @@ 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 sys_${SC_NAME} 1) - ARG2=$(./lttng-get-syscall-inout.sh table-syscall-inout.txt sys_${SC_NAME} 2) - ARG3=$(./lttng-get-syscall-inout.sh table-syscall-inout.txt sys_${SC_NAME} 3) - ARG4=$(./lttng-get-syscall-inout.sh table-syscall-inout.txt sys_${SC_NAME} 4) + 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: \(([^,]*), ([^,]*), ([^,]*), ([^)]*)\)/'\ -'#ifndef OVERRIDE_'"${BITNESS}"'_sys_$1\n'\ -'SC_TRACE_EVENT(sys_$1,\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'\ +' TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) '"${ARG1}"'(ctf_integer($4, $8, $8)) '"${ARG2}"'(ctf_integer($5, $9, $9)) '"${ARG3}"'(ctf_integer($6, $10, $10)) '"${ARG4}"'(ctf_integer($7, $11, $11)))\n'\ ')\n'\ '#endif/g'\ ${TMPFILE2} >> ${HEADER} @@ -258,22 +246,20 @@ 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 sys_${SC_NAME} 1) - ARG2=$(./lttng-get-syscall-inout.sh table-syscall-inout.txt sys_${SC_NAME} 2) - ARG3=$(./lttng-get-syscall-inout.sh table-syscall-inout.txt sys_${SC_NAME} 3) - ARG4=$(./lttng-get-syscall-inout.sh table-syscall-inout.txt sys_${SC_NAME} 4) - ARG5=$(./lttng-get-syscall-inout.sh table-syscall-inout.txt sys_${SC_NAME} 5) + 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: \(([^,]*), ([^,]*), ([^,]*), ([^,]*), ([^)]*)\)/'\ -'#ifndef OVERRIDE_'"${BITNESS}"'_sys_$1\n'\ -'SC_TRACE_EVENT(sys_$1,\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'\ +' TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) '"${ARG1}"'(ctf_integer($4, $9, $9)) '"${ARG2}"'(ctf_integer($5, $10, $10)) '"${ARG3}"'(ctf_integer($6, $11, $11)) '"${ARG4}"'(ctf_integer($7, $12, $12)) '"${ARG5}"'(ctf_integer($8, $13, $13)))\n'\ ')\n'\ '#endif/g'\ ${TMPFILE2} >> ${HEADER} @@ -290,23 +276,21 @@ 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 sys_${SC_NAME} 1) - ARG2=$(./lttng-get-syscall-inout.sh table-syscall-inout.txt sys_${SC_NAME} 2) - ARG3=$(./lttng-get-syscall-inout.sh table-syscall-inout.txt sys_${SC_NAME} 3) - ARG4=$(./lttng-get-syscall-inout.sh table-syscall-inout.txt sys_${SC_NAME} 4) - ARG5=$(./lttng-get-syscall-inout.sh table-syscall-inout.txt sys_${SC_NAME} 5) - ARG6=$(./lttng-get-syscall-inout.sh table-syscall-inout.txt sys_${SC_NAME} 6) + 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: \(([^,]*), ([^,]*), ([^,]*), ([^,]*), ([^,]*), ([^\)]*)\)/'\ -'#ifndef OVERRIDE_'"${BITNESS}"'_sys_$1\n'\ -'SC_TRACE_EVENT(sys_$1,\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'\ +' TP_FIELDS(sc_exit(ctf_integer(long, ret, ret)) '"${ARG1}"'(ctf_integer($4, $10, $10)) '"${ARG2}"'(ctf_integer($5, $11, $11)) '"${ARG3}"'(ctf_integer($6, $12, $12)) '"${ARG4}"'(ctf_integer($7, $13, $13)) '"${ARG5}"'(ctf_integer($8, $14, $14)) '"${ARG6}"'(ctf_integer($9, $15, $15)))\n'\ ')\n'\ '#endif/g'\ ${TMPFILE2} >> ${HEADER} @@ -319,7 +303,7 @@ echo \ #endif /* _TRACE_SYSCALLS_${CLASSCAP}_H */ /* This part must be outside protection */ -#include \"../../../probes/define_trace.h\" +#include #else /* CREATE_SYSCALL_TABLE */ @@ -338,8 +322,8 @@ printf \ grep "^syscall [^ ]* nr [^ ]* nbargs ${NRARGS} " ${SRCFILE} > ${TMPFILE} perl -p -e 's/^syscall ([^ ]*) nr ([^ ]*) nbargs ([^ ]*) .*$/'\ -'#ifndef OVERRIDE_TABLE_'"${BITNESS}"'_sys_$1\n'\ -'TRACE_SYSCALL_TABLE\(syscalls_noargs, sys_$1, $2, $3\)\n'\ +'#ifndef OVERRIDE_TABLE_'"${BITNESS}"'_$1\n'\ +'TRACE_SYSCALL_TABLE\(syscalls_noargs, $1, $2, $3\)\n'\ '#endif/g'\ ${TMPFILE} >> ${HEADER} @@ -349,8 +333,8 @@ printf \ grep "^syscall [^ ]* nr [^ ]* nbargs ${NRARGS} " ${SRCFILE} > ${TMPFILE} perl -p -e 's/^syscall ([^ ]*) nr ([^ ]*) nbargs ([^ ]*) .*$/'\ -'#ifndef OVERRIDE_TABLE_'"${BITNESS}"'_sys_$1\n'\ -'TRACE_SYSCALL_TABLE(sys_$1, sys_$1, $2, $3)\n'\ +'#ifndef OVERRIDE_TABLE_'"${BITNESS}"'_$1\n'\ +'TRACE_SYSCALL_TABLE($1, $1, $2, $3)\n'\ '#endif/g'\ ${TMPFILE} >> ${HEADER} @@ -363,8 +347,8 @@ fi #others. grep -v "^syscall [^ ]* nr [^ ]* nbargs ${NRARGS} " ${SRCFILE} > ${TMPFILE} perl -p -e 's/^syscall ([^ ]*) nr ([^ ]*) nbargs ([^ ]*) .*$/'\ -'#ifndef OVERRIDE_TABLE_'"${BITNESS}"'_sys_$1\n'\ -'TRACE_SYSCALL_TABLE(sys_$1, sys_$1, $2, $3)\n'\ +'#ifndef OVERRIDE_TABLE_'"${BITNESS}"'_$1\n'\ +'TRACE_SYSCALL_TABLE($1, $1, $2, $3)\n'\ '#endif/g'\ ${TMPFILE} >> ${HEADER} @@ -377,30 +361,20 @@ echo -n \ # or *put_old* or *type* cp -f ${HEADER} ${TMPFILE} rm -f ${HEADER} -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'\ +perl -p -e 's/ctf_integer\(([^,)]*char \*), ([^\)]*)(name|file|path|root|put_old|type)([^\)]*)\)/ctf_user_string($2$3$4)/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'\ +perl -p -e 's/ctf_integer\(([^,)]*), ([^,)]*addr|[^,)]*ptr)([^),]*)\)/ctf_integer_hex($1, $2$3, $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'\ +perl -p -e 's/ctf_integer\(([^,)]*\*), ([^),]*)\)/ctf_integer_hex($1, $2, $2)/g'\ ${TMPFILE} >> ${HEADER} rm -f ${INPUTFILE}.tmp