1 diff -up dhcp-4.2.4b1/configure.ac.systemtap dhcp-4.2.4b1/configure.ac
2 --- dhcp-4.2.4b1/configure.ac.systemtap 2012-04-16 17:46:10.913227143 +0200
3 +++ dhcp-4.2.4b1/configure.ac 2012-04-16 17:46:10.947226667 +0200
4 @@ -504,6 +504,35 @@ else
8 +AC_MSG_CHECKING([whether to include systemtap tracing support])
9 +AC_ARG_ENABLE([systemtap],
10 + [AS_HELP_STRING([--enable-systemtap],
11 + [Enable inclusion of systemtap trace support])],
12 + [ENABLE_SYSTEMTAP="${enableval}"], [ENABLE_SYSTEMTAP='no'])
13 +AM_CONDITIONAL([ENABLE_SYSTEMTAP], [test x$ENABLE_SYSTEMTAP = xyes])
14 +AC_MSG_RESULT(${ENABLE_SYSTEMTAP})
16 +if test "x${ENABLE_SYSTEMTAP}" = xyes; then
17 + # Additional configuration for --enable-systemtap is HERE
18 + AC_CHECK_PROGS(DTRACE, dtrace)
19 + if test -z "$DTRACE"; then
20 + AC_MSG_ERROR([dtrace not found])
22 + AC_CHECK_HEADER([sys/sdt.h], [SDT_H_FOUND='yes'],
24 + AC_MSG_ERROR([systemtap support needs sys/sdt.h header])])
25 + AC_DEFINE([HAVE_SYSTEMTAP], [1], [Define to 1 if using SystemTap probes.])
26 + AC_ARG_WITH([tapset-install-dir],
27 + [AS_HELP_STRING([--with-tapset-install-dir],
28 + [The absolute path where the tapset dir will be installed])],
29 + [if test "x${withval}" = x; then
30 + ABS_TAPSET_DIR="\$(datadir)/systemtap/tapset"
32 + ABS_TAPSET_DIR="${withval}"
33 + fi], [ABS_TAPSET_DIR="\$(datadir)/systemtap/tapset"])
34 + AC_SUBST(ABS_TAPSET_DIR)
37 # Solaris needs some libraries for functions
38 AC_SEARCH_LIBS(socket, [socket])
39 AC_SEARCH_LIBS(inet_ntoa, [nsl])
40 @@ -650,6 +679,7 @@ AC_OUTPUT([
48 diff -up dhcp-4.2.4b1/Makefile.am.systemtap dhcp-4.2.4b1/Makefile.am
49 --- dhcp-4.2.4b1/Makefile.am.systemtap 2012-04-16 17:46:10.791228851 +0200
50 +++ dhcp-4.2.4b1/Makefile.am 2012-04-16 17:46:10.947226667 +0200
51 @@ -29,5 +29,8 @@ endif
53 SUBDIRS += includes tests common omapip client dhcpctl relay server
56 +#DIST_SUBDIRS = $(SUBDIRS)
58 nobase_include_HEADERS = dhcpctl/dhcpctl.h
60 diff -up dhcp-4.2.4b1/server/dhcp.c.systemtap dhcp-4.2.4b1/server/dhcp.c
61 --- dhcp-4.2.4b1/server/dhcp.c.systemtap 2012-04-16 17:46:10.816228501 +0200
62 +++ dhcp-4.2.4b1/server/dhcp.c 2012-04-16 17:48:11.528537555 +0200
69 static void commit_leases_ackout(void *foo);
70 static void maybe_return_agent_options(struct packet *packet,
71 struct option_state *options);
72 @@ -275,6 +275,8 @@ void dhcpdiscover (packet, ms_nulltp)
73 dhcp_failover_state_t *peer;
76 + TRACE(DHCPD_DISCOVER_START());
78 find_lease (&lease, packet, packet -> shared_network,
79 0, &peer_has_leases, (struct lease *)0, MDL);
81 @@ -399,6 +401,8 @@ void dhcpdiscover (packet, ms_nulltp)
84 lease_dereference (&lease, MDL);
86 + TRACE(DHCPD_DISCOVER_DONE());
89 void dhcprequest (packet, ms_nulltp, ip_lease)
90 @@ -421,6 +425,8 @@ void dhcprequest (packet, ms_nulltp, ip_
92 int have_requested_addr = 0;
94 + TRACE(DHCPD_REQUEST_START());
96 oc = lookup_option (&dhcp_universe, packet -> options,
97 DHO_DHCP_REQUESTED_ADDRESS);
98 memset (&data, 0, sizeof data);
99 @@ -677,6 +683,9 @@ void dhcprequest (packet, ms_nulltp, ip_
100 log_info ("%s: unknown lease %s.", msgbuf, piaddr (cip));
104 + TRACE(DHCPD_REQUEST_DONE());
107 subnet_dereference (&subnet, MDL);
109 @@ -695,6 +704,7 @@ void dhcprelease (packet, ms_nulltp)
111 char msgbuf [1024], cstr[16]; /* XXX */
113 + TRACE(DHCPD_RELEASE_START());
115 /* DHCPRELEASE must not specify address in requested-address
116 option, but old protocol specs weren't explicit about this,
117 @@ -819,6 +829,8 @@ void dhcprelease (packet, ms_nulltp)
120 lease_dereference (&lease, MDL);
122 + TRACE(DHCPD_RELEASE_DONE());
125 void dhcpdecline (packet, ms_nulltp)
126 @@ -836,6 +848,8 @@ void dhcpdecline (packet, ms_nulltp)
127 struct option_cache *oc;
128 struct data_string data;
130 + TRACE(DHCPD_DECLINE_START());
132 /* DHCPDECLINE must specify address. */
133 if (!(oc = lookup_option (&dhcp_universe, packet -> options,
134 DHO_DHCP_REQUESTED_ADDRESS)))
135 @@ -947,6 +961,8 @@ void dhcpdecline (packet, ms_nulltp)
136 option_state_dereference (&options, MDL);
138 lease_dereference (&lease, MDL);
140 + TRACE(DHCPD_DECLINE_DONE());
143 void dhcpinform (packet, ms_nulltp)
144 @@ -970,6 +986,8 @@ void dhcpinform (packet, ms_nulltp)
145 struct interface_info *interface;
148 + TRACE(DHCPD_INFORM_START());
150 /* The client should set ciaddr to its IP address, but apparently
151 it's common for clients not to do this, so we'll use their IP
152 source address if they didn't set ciaddr. */
153 @@ -1327,6 +1345,8 @@ void dhcpinform (packet, ms_nulltp)
156 subnet_dereference (&subnet, MDL);
158 + TRACE(DHCPD_INFORM_DONE());
161 void nak_lease (packet, cip)
162 @@ -1343,6 +1363,8 @@ void nak_lease (packet, cip)
163 struct option_state *options = (struct option_state *)0;
164 struct option_cache *oc = (struct option_cache *)0;
166 + TRACE(DHCPD_NAK_LEASE_START());
168 option_state_allocate (&options, MDL);
169 memset (&outgoing, 0, sizeof outgoing);
170 memset (&raw, 0, sizeof raw);
171 @@ -1494,6 +1516,7 @@ void nak_lease (packet, cip)
172 packet->interface->name);
175 + TRACE(DHCPD_NAK_LEASE_DONE());
178 void ack_lease (packet, lease, offer, when, msg, ms_nulltp, hp)
179 @@ -1535,6 +1558,8 @@ void ack_lease (packet, lease, offer, wh
183 + TRACE(DHCPD_ACK_LEASE_START());
185 /* Save original cltt for comparison later. */
186 lease_cltt = lease->cltt;
188 @@ -2897,6 +2922,8 @@ void ack_lease (packet, lease, offer, wh
193 + TRACE(DHCPD_ACK_LEASE_DONE());
197 @@ -3049,6 +3076,8 @@ void dhcp_reply (lease)
199 log_fatal ("dhcp_reply was supplied lease with no state!");
201 + TRACE(DHCPD_REPLY_START());
203 /* Compose a response for the client... */
204 memset (&raw, 0, sizeof raw);
205 memset (&d1, 0, sizeof d1);
206 @@ -3270,6 +3299,8 @@ void dhcp_reply (lease)
208 free_lease_state (state, MDL);
209 lease -> state = (struct lease_state *)0;
211 + TRACE(DHCPD_REPLY_DONE());
214 int find_lease (struct lease **lp,
215 @@ -3292,6 +3323,8 @@ int find_lease (struct lease **lp,
216 struct data_string client_identifier;
219 + TRACE(DHCPD_FIND_LEASE_START());
221 #if defined(FAILOVER_PROTOCOL)
222 /* Quick check to see if the peer has leases. */
223 if (peer_has_leases) {
224 @@ -4019,6 +4052,9 @@ int find_lease (struct lease **lp,
225 #if defined (DEBUG_FIND_LEASE)
226 log_info ("Not returning a lease.");
229 + TRACE(DHCPD_FIND_LEASE_DONE());
234 diff -up dhcp-4.2.4b1/server/dhcpd.c.systemtap dhcp-4.2.4b1/server/dhcpd.c
235 --- dhcp-4.2.4b1/server/dhcpd.c.systemtap 2012-04-16 17:46:10.928226933 +0200
236 +++ dhcp-4.2.4b1/server/dhcpd.c 2012-04-16 17:46:10.951226611 +0200
237 @@ -58,6 +58,8 @@ static const char url [] =
239 #endif /* PARANOIA */
243 static void usage(void);
245 struct iaddr server_identifier;
246 @@ -859,6 +861,7 @@ main(int argc, char **argv) {
247 omapi_set_int_value ((omapi_object_t *)dhcp_control_object,
248 (omapi_object_t *)0, "state", server_running);
250 + TRACE(DHCPD_MAIN());
251 /* Receive packets and dispatch them... */
254 diff -up dhcp-4.2.4b1/server/dhcpv6.c.systemtap dhcp-4.2.4b1/server/dhcpv6.c
255 --- dhcp-4.2.4b1/server/dhcpv6.c.systemtap 2012-04-16 17:46:10.925226975 +0200
256 +++ dhcp-4.2.4b1/server/dhcpv6.c 2012-04-16 17:46:10.953226583 +0200
265 @@ -4198,6 +4199,8 @@ static void
266 dhcpv6_solicit(struct data_string *reply_ret, struct packet *packet) {
267 struct data_string client_id;
269 + TRACE(DHCPD_6_SOLICIT_START());
272 * Validate our input.
274 @@ -4211,6 +4214,8 @@ dhcpv6_solicit(struct data_string *reply
277 data_string_forget(&client_id, MDL);
279 + TRACE(DHCPD_6_SOLICIT_DONE());
283 @@ -4224,6 +4229,8 @@ dhcpv6_request(struct data_string *reply
284 struct data_string client_id;
285 struct data_string server_id;
287 + TRACE(DHCPD_6_REQUEST_START());
290 * Validate our input.
292 @@ -4241,6 +4248,8 @@ dhcpv6_request(struct data_string *reply
294 data_string_forget(&client_id, MDL);
295 data_string_forget(&server_id, MDL);
297 + TRACE(DHCPD_6_REQUEST_DONE());
300 /* Find a DHCPv6 packet's shared network from hints in the packet.
301 @@ -4353,6 +4362,8 @@ dhcpv6_confirm(struct data_string *reply
302 struct dhcpv6_packet *reply = (struct dhcpv6_packet *)reply_data;
303 int reply_ofs = (int)(offsetof(struct dhcpv6_packet, options));
305 + TRACE(DHCPD_6_CONFIRM_START());
308 * Basic client message validation.
310 @@ -4539,6 +4550,8 @@ exit:
311 option_state_dereference(&cli_enc_opt_state, MDL);
312 if (opt_state != NULL)
313 option_state_dereference(&opt_state, MDL);
315 + TRACE(DHCPD_6_CONFIRM_DONE());
319 @@ -4553,6 +4566,8 @@ dhcpv6_renew(struct data_string *reply,
320 struct data_string client_id;
321 struct data_string server_id;
323 + TRACE(DHCPD_6_RENEW_START());
326 * Validate the request.
328 @@ -4570,6 +4585,8 @@ dhcpv6_renew(struct data_string *reply,
330 data_string_forget(&server_id, MDL);
331 data_string_forget(&client_id, MDL);
333 + TRACE(DHCPD_6_RENEW_DONE());
337 @@ -4583,6 +4600,8 @@ static void
338 dhcpv6_rebind(struct data_string *reply, struct packet *packet) {
339 struct data_string client_id;
341 + TRACE(DHCPD_6_REBIND_START());
343 if (!valid_client_msg(packet, &client_id)) {
346 @@ -4590,6 +4609,8 @@ dhcpv6_rebind(struct data_string *reply,
347 lease_to_client(reply, packet, &client_id, NULL);
349 data_string_forget(&client_id, MDL);
351 + TRACE(DHCPD_6_REBIND_DONE());
355 @@ -5034,6 +5055,8 @@ dhcpv6_decline(struct data_string *reply
356 struct data_string client_id;
357 struct data_string server_id;
359 + TRACE(DHCPD_6_DECLINE_START());
362 * Validate our input.
364 @@ -5054,6 +5077,8 @@ dhcpv6_decline(struct data_string *reply
366 data_string_forget(&server_id, MDL);
367 data_string_forget(&client_id, MDL);
369 + TRACE(DHCPD_6_DECLINE_DONE());
373 @@ -5502,6 +5527,8 @@ dhcpv6_release(struct data_string *reply
374 struct data_string client_id;
375 struct data_string server_id;
377 + TRACE(DHCPD_6_RELEASE_START());
380 * Validate our input.
382 @@ -5523,6 +5550,8 @@ dhcpv6_release(struct data_string *reply
384 data_string_forget(&server_id, MDL);
385 data_string_forget(&client_id, MDL);
387 + TRACE(DHCPD_6_RELEASE_DONE());
391 @@ -5535,6 +5564,8 @@ dhcpv6_information_request(struct data_s
392 struct data_string client_id;
393 struct data_string server_id;
395 + TRACE(DHCPD_6_INFORMATION_REQUEST_START());
398 * Validate our input.
400 @@ -5566,6 +5597,8 @@ dhcpv6_information_request(struct data_s
401 data_string_forget(&client_id, MDL);
403 data_string_forget(&server_id, MDL);
405 + TRACE(DHCPD_6_INFORMATION_REQUEST_DONE());
409 @@ -5594,6 +5627,8 @@ dhcpv6_relay_forw(struct data_string *re
410 struct dhcpv6_relay_packet *reply;
413 + TRACE(DHCPD_6_RELAY_FORW_START());
416 * Initialize variables for early exit.
418 @@ -5853,6 +5888,8 @@ exit:
419 if (enc_packet != NULL) {
420 packet_dereference(&enc_packet, MDL);
423 + TRACE(DHCPD_6_RELAY_FORW_DONE());
427 diff -up dhcp-4.2.4b1/server/failover.c.systemtap dhcp-4.2.4b1/server/failover.c
428 --- dhcp-4.2.4b1/server/failover.c.systemtap 2012-03-19 23:29:49.000000000 +0100
429 +++ dhcp-4.2.4b1/server/failover.c 2012-04-16 17:46:10.955226555 +0200
432 #include <omapip/omapip_p.h>
436 #if defined (FAILOVER_PROTOCOL)
437 dhcp_failover_state_t *failover_states;
438 static isc_result_t do_a_failover_option (omapi_object_t *,
439 @@ -1712,6 +1714,8 @@ isc_result_t dhcp_failover_set_state (dh
443 + TRACE(DHCPD_FAILOVER_SET_STATE_START(state->me.state, new_state));
445 /* If we're in certain states where we're sending updates, and the peer
446 * state changes, we need to re-schedule any pending updates just to
447 * be on the safe side. This results in retransmission.
448 @@ -1939,6 +1943,8 @@ isc_result_t dhcp_failover_set_state (dh
452 + TRACE(DHCPD_FAILOVER_SET_STATE_DONE());
454 return ISC_R_SUCCESS;
457 @@ -2422,6 +2428,8 @@ dhcp_failover_pool_dobalance(dhcp_failov
458 if (state -> me.state != normal)
461 + TRACE(DHCPD_FAILOVER_POOL_DOBALANCE_START());
463 state->last_balance = cur_time;
465 for (s = shared_networks ; s ; s = s->next) {
466 @@ -2582,6 +2590,8 @@ dhcp_failover_pool_dobalance(dhcp_failov
470 + TRACE(DHCPD_FAILOVER_POOL_DOBALANCE_DONE());
472 return leases_queued;
475 diff -up dhcp-4.2.4b1/server/Makefile.am.systemtap dhcp-4.2.4b1/server/Makefile.am
476 --- dhcp-4.2.4b1/server/Makefile.am.systemtap 2012-04-16 17:46:10.914227129 +0200
477 +++ dhcp-4.2.4b1/server/Makefile.am 2012-04-16 17:46:10.956226541 +0200
478 @@ -4,7 +4,7 @@ dist_sysconf_DATA = dhcpd.conf
479 sbin_PROGRAMS = dhcpd
480 dhcpd_SOURCES = dhcpd.c dhcp.c bootp.c confpars.c db.c class.c failover.c \
481 omapi.c mdb.c stables.c salloc.c ddns.c dhcpleasequery.c \
482 - dhcpv6.c mdb6.c ldap.c ldap_casa.c
483 + dhcpv6.c mdb6.c ldap.c ldap_casa.c probes.d trace.h
485 dhcpd_CFLAGS = $(LDAP_CFLAGS)
486 dhcpd_LDADD = ../common/libdhcp.a ../omapip/libomapi.la \
487 @@ -13,3 +13,13 @@ dhcpd_LDADD = ../common/libdhcp.a ../oma
488 man_MANS = dhcpd.8 dhcpd.conf.5 dhcpd.leases.5
489 EXTRA_DIST = $(man_MANS)
492 +BUILT_SOURCES = probes.h
494 + $(DTRACE) -C -h -s $< -o $@
497 + $(DTRACE) -C -G -s $< -o $@
499 +dhcpd_LDADD += probes.o
501 diff -up dhcp-4.2.4b1/server/probes.d.systemtap dhcp-4.2.4b1/server/probes.d
502 --- dhcp-4.2.4b1/server/probes.d.systemtap 2012-04-16 17:46:10.956226541 +0200
503 +++ dhcp-4.2.4b1/server/probes.d 2012-04-16 17:46:10.956226541 +0200
507 + probe discover_start()
508 + probe discover_done()
509 + probe request_start()
510 + probe request_done()
511 + probe release_start()
512 + probe release_done()
513 + probe decline_start()
514 + probe decline_done()
515 + probe inform_start()
516 + probe inform_done()
517 + probe nak_lease_start()
518 + probe nak_lease_done()
519 + probe ack_lease_start()
520 + probe ack_lease_done()
521 + probe reply_start()
523 + probe find_lease_start()
524 + probe find_lease_done()
525 + probe 6_solicit_start()
526 + probe 6_solicit_done()
527 + probe 6_request_start()
528 + probe 6_request_done()
529 + probe 6_confirm_start()
530 + probe 6_confirm_done()
531 + probe 6_renew_start()
532 + probe 6_renew_done()
533 + probe 6_rebind_start()
534 + probe 6_rebind_done()
535 + probe 6_decline_start()
536 + probe 6_decline_done()
537 + probe 6_release_start()
538 + probe 6_release_done()
539 + probe 6_information_request_start()
540 + probe 6_information_request_done()
541 + probe 6_relay_forw_start()
542 + probe 6_relay_forw_done()
543 + probe failover_pool_dobalance_start()
544 + probe failover_pool_dobalance_done()
545 + probe failover_set_state_start(int, int) /* state, new_state */
546 + probe failover_set_state_done()
548 diff -up dhcp-4.2.4b1/server/trace.h.systemtap dhcp-4.2.4b1/server/trace.h
549 --- dhcp-4.2.4b1/server/trace.h.systemtap 2012-04-16 17:46:10.956226541 +0200
550 +++ dhcp-4.2.4b1/server/trace.h 2012-04-16 17:46:10.956226541 +0200
555 +#ifdef HAVE_SYSTEMTAP
556 +// include the generated probes header and put markers in code
558 +#define TRACE(probe) probe
560 +// Wrap the probe to allow it to be removed when no systemtap available
561 +#define TRACE(probe)
563 diff -up dhcp-4.2.4b1/tapset/dhcpd.stp.systemtap dhcp-4.2.4b1/tapset/dhcpd.stp
564 --- dhcp-4.2.4b1/tapset/dhcpd.stp.systemtap 2012-04-16 17:46:10.957226527 +0200
565 +++ dhcp-4.2.4b1/tapset/dhcpd.stp 2012-04-16 17:46:10.957226527 +0200
568 + Copyright (C) 2011, Red Hat Inc.
571 +probe dhcpd_main = process("dhcpd").mark("main")
573 + probestr = sprintf("%s(locals: %s)", $$name, $$locals);
577 +probe dhcpd_discover_start = process("dhcpd").mark("discover_start")
579 + probestr = sprintf("%s", $$name);
582 +probe dhcpd_discover_done = process("dhcpd").mark("discover_done")
584 + probestr = sprintf("%s", $$name);
587 +probe dhcpd_request_start = process("dhcpd").mark("request_start")
589 + probestr = sprintf("%s", $$name);
592 +probe dhcpd_request_done = process("dhcpd").mark("request_done")
594 + probestr = sprintf("%s", $$name);
597 +probe dhcpd_release_start = process("dhcpd").mark("release_start")
599 + probestr = sprintf("%s", $$name);
602 +probe dhcpd_release_done = process("dhcpd").mark("release_done")
604 + probestr = sprintf("%s", $$name);
607 +probe dhcpd_decline_start = process("dhcpd").mark("decline_start")
609 + probestr = sprintf("%s", $$name);
612 +probe dhcpd_decline_done = process("dhcpd").mark("decline_done")
614 + probestr = sprintf("%s", $$name);
617 +probe dhcpd_inform_start = process("dhcpd").mark("inform_start")
619 + probestr = sprintf("%s", $$name);
622 +probe dhcpd_inform_done = process("dhcpd").mark("inform_done")
624 + probestr = sprintf("%s", $$name);
627 +probe dhcpd_nak_lease_start = process("dhcpd").mark("nak_lease_start")
629 + probestr = sprintf("%s", $$name);
632 +probe dhcpd_nak_lease_done = process("dhcpd").mark("nak_lease_done")
634 + probestr = sprintf("%s", $$name);
637 +probe dhcpd_ack_lease_start = process("dhcpd").mark("ack_lease_start")
639 + probestr = sprintf("%s", $$name);
642 +probe dhcpd_ack_lease_done = process("dhcpd").mark("ack_lease_done")
644 + probestr = sprintf("%s", $$name);
647 +probe dhcpd_reply_start = process("dhcpd").mark("reply_start")
649 + probestr = sprintf("%s", $$name);
652 +probe dhcpd_reply_done = process("dhcpd").mark("reply_done")
654 + probestr = sprintf("%s", $$name);
657 +probe dhcpd_find_lease_start = process("dhcpd").mark("find_lease_start")
659 + probestr = sprintf("%s", $$name);
662 +probe dhcpd_find_lease_done = process("dhcpd").mark("find_lease_done")
664 + probestr = sprintf("%s", $$name);
667 +probe dhcpd_6_solicit_start = process("dhcpd").mark("6_solicit_start")
669 + probestr = sprintf("%s", $$name);
672 +probe dhcpd_6_solicit_done = process("dhcpd").mark("6_solicit_done")
674 + probestr = sprintf("%s", $$name);
677 +probe dhcpd_6_request_start = process("dhcpd").mark("6_request_start")
679 + probestr = sprintf("%s", $$name);
682 +probe dhcpd_6_request_done = process("dhcpd").mark("6_request_done")
684 + probestr = sprintf("%s", $$name);
687 +probe dhcpd_6_confirm_start = process("dhcpd").mark("6_confirm_start")
689 + probestr = sprintf("%s", $$name);
692 +probe dhcpd_6_confirm_done = process("dhcpd").mark("6_confirm_done")
694 + probestr = sprintf("%s", $$name);
697 +probe dhcpd_6_renew_start = process("dhcpd").mark("6_renew_start")
699 + probestr = sprintf("%s", $$name);
702 +probe dhcpd_6_renew_done = process("dhcpd").mark("6_renew_done")
704 + probestr = sprintf("%s", $$name);
707 +probe dhcpd_6_rebind_start = process("dhcpd").mark("6_rebind_start")
709 + probestr = sprintf("%s", $$name);
712 +probe dhcpd_6_rebind_done = process("dhcpd").mark("6_rebind_done")
714 + probestr = sprintf("%s", $$name);
717 +probe dhcpd_6_decline_start = process("dhcpd").mark("6_decline_start")
719 + probestr = sprintf("%s", $$name);
722 +probe dhcpd_6_decline_done = process("dhcpd").mark("6_decline_done")
724 + probestr = sprintf("%s", $$name);
727 +probe dhcpd_6_release_start = process("dhcpd").mark("6_release_start")
729 + probestr = sprintf("%s", $$name);
732 +probe dhcpd_6_release_done = process("dhcpd").mark("6_release_done")
734 + probestr = sprintf("%s", $$name);
737 +probe dhcpd_6_information_request_start = process("dhcpd").mark("6_information_request_start")
739 + probestr = sprintf("%s", $$name);
742 +probe dhcpd_6_information_request_done = process("dhcpd").mark("6_information_request_done")
744 + probestr = sprintf("%s", $$name);
747 +probe dhcpd_6_relay_forw_start = process("dhcpd").mark("6_relay_forw_start")
749 + probestr = sprintf("%s", $$name);
752 +probe dhcpd_6_relay_forw_done = process("dhcpd").mark("6_relay_forw_done")
754 + probestr = sprintf("%s", $$name);
757 +probe dhcpd_failover_pool_dobalance_start = process("dhcpd").mark("failover_pool_dobalance_start")
759 + probestr = sprintf("%s", $$name);
762 +probe dhcpd_failover_pool_dobalance_done = process("dhcpd").mark("failover_pool_dobalance_done")
764 + probestr = sprintf("%s", $$name);
768 +probe dhcpd_failover_set_state_start = process("dhcpd").mark("failover_set_state_start")
772 + probestr = sprintf("%s(state=%d, new_state=%d)", $$name, state, new_state);
775 +probe dhcpd_failover_set_state_done = process("dhcpd").mark("failover_set_state_done")
777 + probestr = sprintf("%s", $$name);
779 diff -up dhcp-4.2.4b1/tapset/Makefile.am.systemtap dhcp-4.2.4b1/tapset/Makefile.am
780 --- dhcp-4.2.4b1/tapset/Makefile.am.systemtap 2012-04-16 17:46:10.957226527 +0200
781 +++ dhcp-4.2.4b1/tapset/Makefile.am 2012-04-16 17:46:10.957226527 +0200
783 +# Makefile.am for dhcp/tapset
786 +.PHONY: clean-local install-data-hook uninstall-local
789 +EXTRA_DIST = dhcpd.stp
790 +TAPSET_FILES = $(EXTRA_DIST)
791 +TAPSET_INSTALL_DIR = $(DESTDIR)@ABS_TAPSET_DIR@
794 +all-local: $(TAPSET_FILES)
799 + $(MKDIR_P) $(TAPSET_INSTALL_DIR)
800 + $(INSTALL_DATA) $(TAPSET_FILES) $(TAPSET_INSTALL_DIR)
803 + @list='$(TAPSET_FILES)'; for p in $$list; do \
804 + echo " rm -f '$(TAPSET_INSTALL_DIR)/$$p'"; \
805 + rm -f "$(TAPSET_INSTALL_DIR)/$$p"; \