fix return value stuff

Author: ZNeumann

agent/fw_wordpress.c

@@ -345,7 +345,6 @@ NR_PHP_WRAPPER(nr_wordpress_wrap_hook_core) {
     NR_PHP_WRAPPER_LEAVE;
   }
 
-  NR_PHP_WRAPPER_CALL;
   if (NRPRG(wordpress_core)) {
     nr_wordpress_create_metric(auto_segment, NR_WORDPRESS_HOOK_PREFIX, tag);
   }
@@ -373,7 +372,6 @@ NR_PHP_WRAPPER(nr_wordpress_wrap_hook_plugin) {
   plugin = wraprec->wordpress_plugin_theme;
   //plugin = nr_wordpress_plugin_from_function(execute_data->func);
 
-  NR_PHP_WRAPPER_CALL;
   if (NULL != plugin) {
     nr_wordpress_create_metric(auto_segment, NR_WORDPRESS_HOOK_PREFIX, tag);
     nr_wordpress_create_metric(auto_segment, NR_WORDPRESS_PLUGIN_PREFIX,

agent/php_execute.c

@@ -2126,7 +2126,7 @@ static void nr_php_instrument_func_end(NR_EXECUTE_PROTO, bool create_metric, boo
         "Uncaught exception ", &NRPRG(exception_filters) TSRMLS_CC);
   } else if (NULL == nr_php_get_return_value(NR_EXECUTE_ORIG_ARGS)) {
 #else
-  if (NULL == nr_php_get_return_value(NR_EXECUTE_ORIG_ARGS)) {
+  if (NULL == func_return_value) {
 #endif
     /*
      * Having no return value (and not being an exception handler) indicates
@@ -2138,6 +2138,9 @@ static void nr_php_instrument_func_end(NR_EXECUTE_PROTO, bool create_metric, boo
     nr_status_t status = nr_php_error_record_exception_segment(
       NRPRG(txn), &exception,
       &NRPRG(exception_filters));
+    if (execute_data->func && execute_data->func->common.function_name) {
+      nrl_verbosedebug(NRL_AGENT, "END %s", ZSTR_VAL(execute_data->func->common.function_name));
+    }
 
     if (NR_FAILURE == status) {
       nrl_verbosedebug(NRL_AGENT, "%s: unable to record exception on segment",
@@ -2222,6 +2225,9 @@ void nr_php_observer_fcall_begin(zend_execute_data* execute_data) {
   //if (execute_data->func && execute_data->func->common.function_name) {
   //  printf("BEGIN %s\n", ZSTR_VAL(execute_data->func->common.function_name));
   //}
+  if (execute_data->func && execute_data->func->common.function_name) {
+    nrl_verbosedebug(NRL_AGENT, "BEGIN %s", ZSTR_VAL(execute_data->func->common.function_name));
+  }
   if (nrunlikely(NULL == execute_data)) {
     return;
   }
@@ -2264,7 +2270,7 @@ void nr_php_observer_fcall_begin_instrumented(zend_execute_data* execute_data) {
    */
   zval* func_return_value = NULL;
   //if (execute_data->func && execute_data->func->common.function_name) {
-  //  printf("BEGIN %s\n", ZSTR_VAL(execute_data->func->common.function_name));
+  //  nrl_verbosedebug(NRL_AGENT, "BEGIN %s", ZSTR_VAL(execute_data->func->common.function_name));
   //}
   if (nrunlikely(NULL == execute_data)) {
     return;

agent/php_wrapper.h

@@ -273,7 +273,6 @@ extern zval** nr_php_get_return_value_ptr(TSRMLS_D);
     bool is_begin = false;                                  \
     nruserfn_t* wraprec = NULL;                             \
     zval* func_return_value = NULL;                         \
-    zval** func_return_value_ptr = NULL;                    \
     const nrtxn_t* txn = NRPRG(txn);                        \
     const nrtime_t txn_start_time = nr_txn_start_time(txn); \
     if (NRPRG(in_wrapper)) {      \
@@ -288,10 +287,11 @@ extern zval** nr_php_get_return_value_ptr(TSRMLS_D);
       auto_segment = nr_txn_get_current_segment(NRPRG(txn), NULL); \
       is_begin = true;                                      \
     } else { \
-      func_return_value_ptr = nr_php_get_return_value_ptr(); \
-      func_return_value = func_return_value_ptr ? *func_return_value_ptr : NULL;\
+      va_list ptr; \
+      va_start(ptr, execute_data); \
+      func_return_value = va_arg(ptr, zval*); \
       nr_php_observer_fcall_end_keep_segment(execute_data,        \
-              func_return_value_ptr ? *func_return_value_ptr : NULL); \
+              func_return_value); \
     }
 #endif