ability to view function execution time (for debug)

olevole · olevole · commit 6fa33c70c53d · 2025-07-26T12:37:14.000+03:00
diff --git a/bin/cbsdsh/eval.c b/bin/cbsdsh/eval.c
@@ -72,6 +72,11 @@ __FBSDID("$FreeBSD: head/bin/sh/eval.c 340284 2018-11-09 14:58:24Z jilles $");
 #include "myhistedit.h"
 #endif
 
+// CBSD
+#include <sys/time.h>
+extern int cbsd_function_time;
+int cbsd_function_time = 0;
+
 int evalskip;		  /* set if we are skipping commands */
 int skipcount;		  /* number of levels to skip */
 static int loopnest;	  /* current loop nesting level */
@@ -821,6 +826,9 @@ evalcommand(union node *cmd, int flags, struct backcmd *backcmd)
 	const char *path = pathval();
 	int i;
 
+	//CBSD
+	struct timeval start, end;
+
 	/* First expand the arguments. */
 	TRACE(("evalcommand(%p, %d) called\n", (void *)cmd, flags));
 	emptyarglist(&arglist);
@@ -1004,6 +1012,9 @@ evalcommand(union node *cmd, int flags, struct backcmd *backcmd)
 		trputs("Shell function:  ");
 		trargs(argv);
 #endif
+		if (cbsd_function_time == 1) {
+			gettimeofday(&start, NULL);
+		}
 		saveparam = shellparam;
 		shellparam.malloc = 0;
 		shellparam.reset = 1;
@@ -1052,6 +1063,14 @@ evalcommand(union node *cmd, int flags, struct backcmd *backcmd)
 		}
 		if (jp)
 			exitshell(exitstatus);
+
+		if (cbsd_function_time==1) {
+			gettimeofday(&end, NULL);
+			long seconds = end.tv_sec - start.tv_sec;
+			long useconds = end.tv_usec - start.tv_usec;
+			double elapsed = seconds + useconds / 1e6;
+			out2fmt_flush("cbsd_function_time{function=\"%s\"} %.6f\n", argv[0],elapsed);
+		}
 	} else if (cmdentry.cmdtype == CMDBUILTIN) {
 #ifdef DEBUG
 		trputs("builtin command:  ");
diff --git a/bin/cbsdsh/main.c b/bin/cbsdsh/main.c
@@ -94,6 +94,7 @@ int localeisutf8, initial_localeisutf8;
 char *cbsd_history_file = NULL;
 int cbsd_enable_history = 0;
 const char cbsd_distdir[] = "/usr/local/cbsd";
+//int cbsd_function_time = 0;
 _REDIS(cbsdredis_t *redis;)
 _INFLUX(cbsdinflux_t *influx;)
 _DBI(cbsddbi_t *databases;)
@@ -134,6 +135,7 @@ main(int argc, char *argv[])
 	load_config();
 #endif
 
+	char *cbsd_function_time_env = NULL;
 	char *cbsdpath = NULL;
 	char *workdir = NULL;
 	char *cbsd_disable_history = NULL; // getenv
@@ -222,6 +224,12 @@ main(int argc, char *argv[])
 		putenv("inter=0");
 	}
 
+	cbsd_function_time_env=lookupvar("CBSD_FUNCTION_TIME");
+	if (cbsd_function_time_env != NULL)
+		cbsd_function_time=atoi(cbsd_function_time_env);
+	else
+		cbsd_function_time=0;
+
 	if (cbsd_enable_history == 1) {
 		cbsd_history_file = calloc(MAXPATHLEN, sizeof(char *));
 		sprintf(cbsd_history_file, "%s/%s", workdir, CBSD_HISTORYFILE);
diff --git a/bin/cbsdsh/main.h b/bin/cbsdsh/main.h
@@ -47,4 +47,5 @@ extern char
     *cbsd_history_file; /* full path to history for "cbsd history" command */
 extern int cbsd_enable_history; /* true if we must register command in history
 				   journal */
+extern int cbsd_function_time;
 #endif
diff --git a/etc/defaults/global.conf b/etc/defaults/global.conf
@@ -41,3 +41,8 @@ configure_default_cbsd_vs_cidr4="auto"
 # What IPv6 address should be used for default network switch (CIDR subnet notation, “auto” or “none”)
 # can be: 'none', 'auto' or 'xxxx/yy'
 configure_default_cbsd_vs_cidr6="auto"
+
+# function TRACE/TIME stats
+# e.g.:
+# env CBSD_FUNCTION_TIME=1 cbsd jls 2>&1 | grep ^cbsd_function | sort -u -k 2
+#CBSD_FUNCTION_TIME=0
