Do not increment trace_count when event_handler skipped the frame

In effect, this causes `--limit` to work in conjunction with
`--filter` as one would expect.

Author: adsr

event_fout.c

@@ -119,8 +119,8 @@ int event_handler_fout(struct trace_context_s *context, int event_type) {
             }
             if (opt_filter_re) {
                 rv = regexec(opt_filter_re, udata->buf, 0, NULL, 0);
-                if (opt_filter_negate == 0 && rv != 0) break;
-                if (opt_filter_negate != 0 && rv == 0) break;
+                if (opt_filter_negate == 0 && rv != 0) return PHPSPY_ERR_SKIPPED;
+                if (opt_filter_negate != 0 && rv == 0) return PHPSPY_ERR_SKIPPED;
             }
             do {
                 if (opt_verbose_fields_ts) {

phpspy.h

@@ -74,6 +74,7 @@
 #define PHPSPY_ERR          1
 #define PHPSPY_ERR_PID_DEAD 2
 #define PHPSPY_ERR_BUF_FULL 4
+#define PHPSPY_ERR_SKIPPED  8
 
 #define PHPSPY_TRACE_EVENT_INIT        0
 #define PHPSPY_TRACE_EVENT_STACK_BEGIN 1

tests/test_filter.sh

@@ -13,3 +13,10 @@ declare -A not_expected
 expected[negate_include_nanosleep]='nanosleep'
 not_expected[negate_exclude_usleep]='usleep'
 source $TEST_SH
+
+phpspy_opts=(--limit=1 --filter 'usleep' -- $PHP -r 'time_nanosleep(1, 0); usleep(1000000);')
+declare -A expected
+declare -A not_expected
+expected[limit_include_usleep]='usleep'
+not_expected[limit_exclude_nanosleep]='time_nanosleep'
+source $TEST_SH