d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

dwatch(1): Refactor sendrecv profile

Browse Source 
The profile for send(2)/recv(2) observation has been refactored to
eliminate alloca() in favor of translations available in HEAD.

Sponsored by:	Smule, Inc.
This commit is contained in:
Devin Teske 2018-05-12 06:23:30 +00:00
parent f134539c02
commit 1764b74809
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=333519
1 changed files with 29 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
cddl/usr.sbin/dwatch/libexec/sendrecv
View File

@ -27,8 +27,10 @@ recv)
: ${PROBE:=$( echo \ : ${PROBE:=$( echo \
syscall::recvfrom:return, \ syscall::recvfrom:return, \
syscall::recvmsg:return )} ;; syscall::recvmsg:return )} ;;
recv*)
: ${PROBE:=syscall::$PROFILE:return} ;;
*) *)
: ${PROBE:=syscall::$PROFILE} : ${PROBE:=syscall::$PROFILE:entry}
esac esac
############################################################ EVENT ACTION ############################################################ EVENT ACTION
@ -98,6 +100,8 @@ inline string address_family_string[sa_family_t af] =
#pragma D binding "1.13" sa_data_size #pragma D binding "1.13" sa_data_size
inline int sa_data_size = 14; inline int sa_data_size = 14;
#pragma D binding "1.13" sa_dummy_data
inline char *sa_dummy_data = "\0\0\0\0\0\0\0\0\0\0\0\0\0\0";
#pragma D binding "1.13" sa_data_addr #pragma D binding "1.13" sa_data_addr
inline string sa_data_addr[sa_family_t af, char data[sa_data_size]] = inline string sa_data_addr[sa_family_t af, char data[sa_data_size]] =
@ -117,10 +121,14 @@ inline uint16_t sa_data_port[sa_family_t af, char data[sa_data_size]] =
#pragma D binding "1.13" translator #pragma D binding "1.13" translator
translator sainfo_t < struct sockaddr *SA > { translator sainfo_t < struct sockaddr *SA > {
sa_family = SA->sa_family; sa_family = SA == NULL ? 0 : SA->sa_family;
family = address_family_string[SA->sa_family]; family = address_family_string[SA == NULL ? 0 : SA->sa_family];
addr = sa_data_addr[SA->sa_family, SA->sa_data]; addr = SA == NULL ?
port = sa_data_port[SA->sa_family, SA->sa_data]; sa_data_addr[0, sa_dummy_data] :
sa_data_addr[SA->sa_family, SA->sa_data];
port = SA == NULL ?
sa_data_port[0, sa_dummy_data] :
sa_data_port[SA->sa_family, SA->sa_data];
}; };
this sainfo_t sainfo; this sainfo_t sainfo;
@ -150,10 +158,8 @@ $PROBE /* probe ID $ID */
syscall::recvfrom:entry /* probe ID $(( $ID + 1 )) */ syscall::recvfrom:entry /* probe ID $(( $ID + 1 )) */
{${TRACE:+ {${TRACE:+
printf("<$(( $ID + 1 ))>");} printf("<$(( $ID + 1 ))>");}
this->sa = args[4] == NULL ? this->sainfo = xlate <sainfo_t> ((struct sockaddr *)(args[4] == NULL ?
(struct sockaddr *)alloca(sizeof(struct sockaddr)) : NULL : copyin(arg4, sizeof(struct sockaddr))));
(struct sockaddr *)copyin(arg4, sizeof(struct sockaddr));
this->sainfo = xlate <sainfo_t> ((struct sockaddr *)this->sa);
} }
syscall::recvfrom:return /* probe ID $(( $ID + 2 )) */ syscall::recvfrom:return /* probe ID $(( $ID + 2 )) */
@ -166,10 +172,18 @@ syscall::recvfrom:return /* probe ID $(( $ID + 2 )) */
this->sainfo.addr, this->sainfo.port])); this->sainfo.addr, this->sainfo.port]));
} }
syscall::recvmsg:return /* probe ID $(( $ID + 3 )) */ syscall::recvmsg:entry /* probe ID $(( $ID + 3 )) */
{${TRACE:+ {${TRACE:+
printf("<$(( $ID + 3 ))>");} printf("<$(( $ID + 3 ))>");}
this->sockaddr = (struct sockaddr *)arg1;
}
syscall::recvmsg:return /this->sockaddr != NULL/ /* probe ID $(( $ID + 4 )) */
{${TRACE:+
printf("<$(( $ID + 4 ))>");}
this->nbytes = arg0; this->nbytes = arg0;
this->sainfo = xlate <sainfo_t> ((struct sockaddr *)this->sockaddr);
this->details = strjoin("sainfo=[", "]");
} }
syscall::sendmsg:entry /* probe ID $(( $ID + 5 )) */ syscall::sendmsg:entry /* probe ID $(( $ID + 5 )) */
@ -178,14 +192,12 @@ syscall::sendmsg:entry /* probe ID $(( $ID + 5 )) */
this->nbytes = arg2; this->nbytes = arg2;
} }
syscall::sendto:entry /* probe ID $(( $ID + 4 )) */ syscall::sendto:entry /* probe ID $(( $ID + 6 )) */
{${TRACE:+ {${TRACE:+
printf("<$(( $ID + 4 ))>");} printf("<$(( $ID + 6 ))>");}
this->nbytes = arg2; this->nbytes = arg2;
this->sa = arg4 == NULL ? this->sainfo = xlate <sainfo_t> ((struct sockaddr *)(arg4 == NULL ?
(struct sockaddr *)alloca(sizeof(struct sockaddr)) : NULL : copyin(arg4, sizeof(struct sockaddr))));
(struct sockaddr *)copyin(arg4, sizeof(struct sockaddr));
this->sainfo = xlate <sainfo_t> ((struct sockaddr *)this->sa);
this->details = strjoin("to ", strjoin( this->details = strjoin("to ", strjoin(
strjoin(this->sainfo.family, " "), strjoin(this->sainfo.family, " "),
af_details[this->sainfo.sa_family, af_details[this->sainfo.sa_family,
@ -193,7 +205,7 @@ syscall::sendto:entry /* probe ID $(( $ID + 4 )) */
} }
EOF EOF
ACTIONS=$( cat <&9 ) ACTIONS=$( cat <&9 )
ID=$(( $ID + 5 )) ID=$(( $ID + 7 ))
############################################################ EVENT DETAILS ############################################################ EVENT DETAILS