repeat dbgapi call to other extension

Author: okbob

src/check_function.c

@@ -309,6 +309,8 @@ plpgsql_check_on_func_beg(PLpgSQL_execstate *estate, PLpgSQL_function *func)
 	int closing;
 	List		*exceptions;
 
+	plpgsql_check_profiler_func_beg(estate, func);
+
 	if (plpgsql_check_tracer)
 		plpgsql_check_tracer_on_func_beg(estate, func);
 

src/plpgsql_check.c

@@ -36,6 +36,7 @@ PG_MODULE_MAGIC;
 #endif
 
 PLpgSQL_plugin **plpgsql_check_plugin_var_ptr;
+PLpgSQL_plugin *prev_plpgsql_plugin;
 
 static PLpgSQL_plugin plugin_funcs = { plpgsql_check_profiler_func_init,
 									   plpgsql_check_on_func_beg,
@@ -167,6 +168,7 @@ _PG_init(void)
 		LOAD_EXTERNAL_FUNCTION("$libdir/plpgsql", "plpgsql_ns_lookup");
 
 	plpgsql_check_plugin_var_ptr = (PLpgSQL_plugin **) find_rendezvous_variable( "PLpgSQL_plugin");
+	prev_plpgsql_plugin = *plpgsql_check_plugin_var_ptr;
 	*plpgsql_check_plugin_var_ptr = &plugin_funcs;
 
 	DefineCustomBoolVariable("plpgsql_check.regress_test_mode",

src/plpgsql_check.h

@@ -330,6 +330,7 @@ extern Size plpgsql_check_shmem_size(void);
 extern void plpgsql_check_profiler_init_hash_tables(void);
 
 extern void plpgsql_check_profiler_func_init(PLpgSQL_execstate *estate, PLpgSQL_function *func);
+extern void plpgsql_check_profiler_func_beg(PLpgSQL_execstate *estate, PLpgSQL_function *func);
 extern void plpgsql_check_profiler_func_end(PLpgSQL_execstate *estate, PLpgSQL_function *func);
 extern void plpgsql_check_profiler_stmt_beg(PLpgSQL_execstate *estate, PLpgSQL_stmt *stmt);
 extern void plpgsql_check_profiler_stmt_end(PLpgSQL_execstate *estate, PLpgSQL_stmt *stmt);
@@ -395,6 +396,7 @@ extern shmem_request_hook_type prev_shmem_request_hook;
 extern shmem_startup_hook_type prev_shmem_startup_hook;
 
 extern PLpgSQL_plugin **plpgsql_check_plugin_var_ptr;
+extern PLpgSQL_plugin *prev_plpgsql_plugin;
 
 #if PG_VERSION_NUM > 110005
 

src/profiler.c

@@ -222,6 +222,8 @@ typedef struct profiler_info
 
 #endif
 
+	void	   *prev_plugin_info;
+
 } profiler_info;
 
 typedef struct profiler_iterator
@@ -2805,6 +2807,34 @@ plpgsql_check_profiler_func_init(PLpgSQL_execstate *estate, PLpgSQL_function *fu
 {
 	profiler_info *pinfo = NULL;
 
+	if (prev_plpgsql_plugin)
+	{
+		prev_plpgsql_plugin->error_callback = (*plpgsql_check_plugin_var_ptr)->error_callback;
+		prev_plpgsql_plugin->assign_expr = (*plpgsql_check_plugin_var_ptr)->assign_expr;
+		prev_plpgsql_plugin->assign_value = (*plpgsql_check_plugin_var_ptr)->assign_value;
+		prev_plpgsql_plugin->eval_datum = (*plpgsql_check_plugin_var_ptr)->eval_datum;
+		prev_plpgsql_plugin->cast_value = (*plpgsql_check_plugin_var_ptr)->cast_value;
+
+		pinfo = init_profiler_info(pinfo, func);
+
+		PG_TRY();
+		{
+			if ((prev_plpgsql_plugin)->func_setup)
+				(prev_plpgsql_plugin->func_setup) (estate, func);
+
+			pinfo->prev_plugin_info = estate->plugin_info;
+			estate->plugin_info = pinfo;
+		}
+		PG_CATCH();
+		{
+			pinfo->prev_plugin_info = estate->plugin_info;
+			estate->plugin_info = pinfo;
+
+			PG_RE_THROW();
+		}
+		PG_END_TRY();
+	}
+
 	if (plpgsql_check_tracer)
 	{
 
@@ -2876,13 +2906,66 @@ plpgsql_check_profiler_func_init(PLpgSQL_execstate *estate, PLpgSQL_function *fu
 	}
 }
 
+void
+plpgsql_check_profiler_func_beg(PLpgSQL_execstate *estate, PLpgSQL_function *func)
+{
+	if (prev_plpgsql_plugin && prev_plpgsql_plugin->func_beg)
+	{
+		profiler_info *pinfo = estate->plugin_info;
+
+		PG_TRY();
+		{
+
+			Assert(pinfo);
+
+			estate->plugin_info = pinfo->prev_plugin_info;
+			(prev_plpgsql_plugin->func_beg) (estate, func);
+
+			pinfo->prev_plugin_info = estate->plugin_info;
+			estate->plugin_info = pinfo;
+		}
+		PG_CATCH();
+		{
+			pinfo->prev_plugin_info = estate->plugin_info;
+			estate->plugin_info = pinfo;
+
+			PG_RE_THROW();
+		}
+		PG_END_TRY();
+	}
+}
+
 void
 plpgsql_check_profiler_func_end(PLpgSQL_execstate *estate, PLpgSQL_function *func)
 {
 	profiler_info *pinfo = NULL;
 
 	if (estate)
+	{
 		pinfo = (profiler_info *) estate->plugin_info;
+
+		if (prev_plpgsql_plugin && prev_plpgsql_plugin->func_end)
+		{
+			PG_TRY();
+			{
+				Assert(pinfo);
+
+				estate->plugin_info = pinfo->prev_plugin_info;
+				(prev_plpgsql_plugin->func_end) (estate, func);
+
+				pinfo->prev_plugin_info = estate->plugin_info;
+				estate->plugin_info = pinfo;
+			}
+			PG_CATCH();
+			{
+				pinfo->prev_plugin_info = estate->plugin_info;
+				estate->plugin_info = pinfo;
+
+				PG_RE_THROW();
+			}
+			PG_END_TRY();
+		}
+	}
 	else if (top_pinfo)
 		pinfo = top_pinfo->pinfo;
 
@@ -2949,6 +3032,28 @@ plpgsql_check_profiler_stmt_beg(PLpgSQL_execstate *estate, PLpgSQL_stmt *stmt)
 {
 	profiler_info *pinfo = (profiler_info *) estate->plugin_info;
 
+	if (prev_plpgsql_plugin && prev_plpgsql_plugin->stmt_beg)
+	{
+		PG_TRY();
+		{
+			Assert(pinfo);
+
+			estate->plugin_info = pinfo->prev_plugin_info;
+			(prev_plpgsql_plugin->stmt_beg) (estate, stmt);
+
+			pinfo->prev_plugin_info = estate->plugin_info;
+			estate->plugin_info = pinfo;
+		}
+		PG_CATCH();
+		{
+			pinfo->prev_plugin_info = estate->plugin_info;
+			estate->plugin_info = pinfo;
+
+			PG_RE_THROW();
+		}
+		PG_END_TRY();
+	}
+
 	if (top_pinfo && top_pinfo->pinfo)
 	{
 		if (estate->eval_econtext != curr_eval_econtext)
@@ -3080,8 +3185,32 @@ plpgsql_check_profiler_stmt_end(PLpgSQL_execstate *estate, PLpgSQL_stmt *stmt)
 		cleaning_mode = true;
 	}
 	else
+	{
 		pinfo = (profiler_info *) estate->plugin_info;
 
+		if (prev_plpgsql_plugin && prev_plpgsql_plugin->stmt_end)
+		{
+			PG_TRY();
+			{
+				Assert(pinfo);
+
+				estate->plugin_info = pinfo->prev_plugin_info;
+				(prev_plpgsql_plugin->stmt_end) (estate, stmt);
+
+				pinfo->prev_plugin_info = estate->plugin_info;
+				estate->plugin_info = pinfo;
+			}
+			PG_CATCH();
+			{
+				pinfo->prev_plugin_info = estate->plugin_info;
+				estate->plugin_info = pinfo;
+
+				PG_RE_THROW();
+			}
+			PG_END_TRY();
+		}
+	}
+
 	if (top_pinfo && top_pinfo->pinfo && !cleaning_mode)
 	{
 		int		i;