Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add logging of user and sys times for evaluated .tcl #1568

Merged
merged 5 commits into from
May 5, 2024
Merged

Add logging of user and sys times for evaluated .tcl #1568

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
a79ac73
Add logging of user and sys times for evaluated .tcl commands and mak…
Apr 26, 2024
af62b01
Cleanup
Apr 26, 2024
1b788ad
Remove debug flags
May 4, 2024
a7fb84e
Cleanup
May 4, 2024
8c25492
Revert "Cleanup"
May 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
12 changes: 11 additions & 1 deletion src/cmds.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/

#include <sys/resource.h>
#include "main.h"
#include "tandem.h"
#include "modules.h"
Expand Down Expand Up @@ -2834,6 +2835,8 @@ static void cmd_page(struct userrec *u, int idx, char *par)
*/
static void cmd_tcl(struct userrec *u, int idx, char *msg)
{
struct rusage ru1, ru2;
int r = 0;
int code;
char *result;
Tcl_DString dstr;
Expand All @@ -2842,8 +2845,15 @@ static void cmd_tcl(struct userrec *u, int idx, char *msg)
dprintf(idx, "%s", MISC_NOSUCHCMD);
return;
}
debug1("tcl: evaluate (.tcl): %s", msg);
debug1("tcl: evaluating .tcl %s", msg);
r = getrusage(RUSAGE_SELF, &ru1);
code = Tcl_GlobalEval(interp, msg);
if (!r && !getrusage(RUSAGE_SELF, &ru2))
debug3("tcl: evaluated .tcl %s, user %.3fms sys %.3fms", msg,
(double) (ru2.ru_utime.tv_usec - ru1.ru_utime.tv_usec) / 1000 +
(double) (ru2.ru_utime.tv_sec - ru1.ru_utime.tv_sec ) * 1000,
(double) (ru2.ru_stime.tv_usec - ru1.ru_stime.tv_usec) / 1000 +
(double) (ru2.ru_stime.tv_sec - ru1.ru_stime.tv_sec ) * 1000);

/* properly convert string to system encoding. */
Tcl_DStringInit(&dstr);
Expand Down
15 changes: 6 additions & 9 deletions src/tclhash.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -744,15 +744,12 @@ static int trigger_bind(const char *proc, const char *param, char *mask)
r = getrusage(RUSAGE_SELF, &ru1);
}
x = Tcl_VarEval(interp, proc, param, NULL);
if (proc && proc[0] != '*' && !r) {
if (!getrusage(RUSAGE_SELF, &ru2)) {
debug3("triggered bind %s, user %.3fms sys %.3fms", proc,
(double) (ru2.ru_utime.tv_usec - ru1.ru_utime.tv_usec) / 1000 +
(double) (ru2.ru_utime.tv_sec - ru1.ru_utime.tv_sec ) * 1000,
(double) (ru2.ru_stime.tv_usec - ru1.ru_stime.tv_usec) / 1000 +
(double) (ru2.ru_stime.tv_sec - ru1.ru_stime.tv_sec ) * 1000);
}
}
if (proc && proc[0] != '*' && !r && !getrusage(RUSAGE_SELF, &ru2))
debug3("triggered bind %s, user %.3fms sys %.3fms", proc,
(double) (ru2.ru_utime.tv_usec - ru1.ru_utime.tv_usec) / 1000 +
(double) (ru2.ru_utime.tv_sec - ru1.ru_utime.tv_sec ) * 1000,
(double) (ru2.ru_stime.tv_usec - ru1.ru_stime.tv_usec) / 1000 +
(double) (ru2.ru_stime.tv_sec - ru1.ru_stime.tv_sec ) * 1000);

if (x == TCL_ERROR) {
/* FIXME: we really should be able to log longer errors */
Expand Down