This is an archive of the discontinued Mercurial Phabricator instance.

Differential D807

chg: show timestamp with debug messages
ClosedPublic

Authored by quark on Sep 23 2017, 6:08 PM.

Details

Reviewers
indygreg
yuja
Group Reviewers
hg-reviewers
Commits
rHGb94db1780365: chg: show timestamp with debug messages
Summary

Like strace -tr, this helps finding performance bottlenecks.

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

quark created this revision.Sep 23 2017, 6:08 PM
indygreg accepted this revision.Sep 24 2017, 10:40 AM
This revision is now accepted and ready to land.Sep 24 2017, 10:40 AM
yuja requested changes to this revision.Sep 25 2017, 10:55 AM
yuja added a subscriber: yuja.

Can you update test-chg.t?

contrib/chg/util.c
67

Nit: s/0/NULL/ is preferred.

This revision now requires changes to proceed.Sep 25 2017, 10:55 AM
quark updated this revision to Diff 2069.Sep 25 2017, 5:22 PM
yuja accepted this revision.Sep 26 2017, 9:11 AM

Queued, thanks.

This revision is now accepted and ready to land.Sep 26 2017, 9:11 AM
Closed by commit rHGb94db1780365: chg: show timestamp with debug messages (authored by quark). · Explain WhySep 26 2017, 9:45 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mcontrib/chg/util.c (11 lines)
Mtests/test-chg.t (12 lines)

Diff 2069

contrib/chg/util.c

/* /*
* Utility functions * Utility functions
* *
* Copyright (c) 2011 Yuya Nishihara <yuya@tcha.org> * Copyright (c) 2011 Yuya Nishihara <yuya@tcha.org>
* *
* This software may be used and distributed according to the terms of the * This software may be used and distributed according to the terms of the
* GNU General Public License version 2 or any later version. * GNU General Public License version 2 or any later version.
*/ */
#include <errno.h> #include <errno.h>
#include <fcntl.h> #include <fcntl.h>
#include <signal.h> #include <signal.h>
#include <stdarg.h> #include <stdarg.h>
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include <sys/time.h>
#include <sys/types.h> #include <sys/types.h>
#include <sys/wait.h> #include <sys/wait.h>
#include <unistd.h> #include <unistd.h>
#include "util.h" #include "util.h"
static int colorenabled = 0; static int colorenabled = 0;
int no = errno; int no = errno;
va_list args; va_list args;
va_start(args, fmt); va_start(args, fmt);
vabortmsgerrno(no, fmt, args); vabortmsgerrno(no, fmt, args);
va_end(args); va_end(args);
} }
static int debugmsgenabled = 0; static int debugmsgenabled = 0;
static double debugstart = 0;
static double now() {
struct timeval t;
gettimeofday(&t, NULL);
yujaUnsubmitted
Not Done

Nit: s/0/NULL/ is preferred.

yuja: Nit: s/0/NULL/ is preferred.
return t.tv_usec / 1e6 + t.tv_sec;
}
void enablecolor(void) void enablecolor(void)
{ {
colorenabled = 1; colorenabled = 1;
} }
void enabledebugmsg(void) void enabledebugmsg(void)
{ {
debugmsgenabled = 1; debugmsgenabled = 1;
debugstart = now();
} }
void debugmsg(const char *fmt, ...) void debugmsg(const char *fmt, ...)
{ {
if (!debugmsgenabled) if (!debugmsgenabled)
return; return;
va_list args; va_list args;
va_start(args, fmt); va_start(args, fmt);
fsetcolor(stderr, "1;30"); fsetcolor(stderr, "1;30");
fputs("chg: debug: ", stderr); fprintf(stderr, "chg: debug: %4.6f ", now() - debugstart);
vfprintf(stderr, fmt, args); vfprintf(stderr, fmt, args);
fsetcolor(stderr, ""); fsetcolor(stderr, "");
fputc('\n', stderr); fputc('\n', stderr);
va_end(args); va_end(args);
} }
void fchdirx(int dirfd) void fchdirx(int dirfd)
{ {

tests/test-chg.t

$ chg init editor $ chg init editor
$ cd editor $ cd editor
by default, system() should be redirected to the client: by default, system() should be redirected to the client:
$ touch foo $ touch foo
$ CHGDEBUG= HGEDITOR=cat chg ci -Am channeled --edit 2>&1 \ $ CHGDEBUG= HGEDITOR=cat chg ci -Am channeled --edit 2>&1 \
> | egrep "HG:|run 'cat" > | egrep "HG:|run 'cat"
chg: debug: run 'cat "*"' at '$TESTTMP/editor' (glob) chg: debug: * run 'cat "*"' at '$TESTTMP/editor' (glob)
HG: Enter commit message. Lines beginning with 'HG:' are removed. HG: Enter commit message. Lines beginning with 'HG:' are removed.
HG: Leave message empty to abort commit. HG: Leave message empty to abort commit.
HG: -- HG: --
HG: user: test HG: user: test
HG: branch 'default' HG: branch 'default'
HG: added foo HG: added foo
but no redirection should be made if output is captured: but no redirection should be made if output is captured:
$ OLDCHGSOCKNAME=$CHGSOCKNAME $ OLDCHGSOCKNAME=$CHGSOCKNAME
$ mkdir chgsock $ mkdir chgsock
$ CHGSOCKNAME=`pwd`/chgsock/server $ CHGSOCKNAME=`pwd`/chgsock/server
warm up server: warm up server:
$ CHGDEBUG= chg log 2>&1 | egrep 'instruction|start' $ CHGDEBUG= chg log 2>&1 | egrep 'instruction|start'
chg: debug: start cmdserver at $TESTTMP/extreload/chgsock/server.* (glob) chg: debug: * start cmdserver at $TESTTMP/extreload/chgsock/server.* (glob)
new server should be started if extension modified: new server should be started if extension modified:
$ sleep 1 $ sleep 1
$ touch dummyext.py $ touch dummyext.py
$ CHGDEBUG= chg log 2>&1 | egrep 'instruction|start' $ CHGDEBUG= chg log 2>&1 | egrep 'instruction|start'
chg: debug: instruction: unlink $TESTTMP/extreload/chgsock/server-* (glob) chg: debug: * instruction: unlink $TESTTMP/extreload/chgsock/server-* (glob)
chg: debug: instruction: reconnect chg: debug: * instruction: reconnect (glob)
chg: debug: start cmdserver at $TESTTMP/extreload/chgsock/server.* (glob) chg: debug: * start cmdserver at $TESTTMP/extreload/chgsock/server.* (glob)
old server will shut down, while new server should still be reachable: old server will shut down, while new server should still be reachable:
$ sleep 2 $ sleep 2
$ CHGDEBUG= chg log 2>&1 | (egrep 'instruction|start' || true) $ CHGDEBUG= chg log 2>&1 | (egrep 'instruction|start' || true)
socket file should never be unlinked by old server: socket file should never be unlinked by old server:
(simulates unowned socket by updating mtime, which makes sure server exits (simulates unowned socket by updating mtime, which makes sure server exits
at polling cycle) at polling cycle)
$ ls chgsock/server-* $ ls chgsock/server-*
chgsock/server-* (glob) chgsock/server-* (glob)
$ touch chgsock/server-* $ touch chgsock/server-*
$ sleep 2 $ sleep 2
$ ls chgsock/server-* $ ls chgsock/server-*
chgsock/server-* (glob) chgsock/server-* (glob)
since no server is reachable from socket file, new server should be started: since no server is reachable from socket file, new server should be started:
(this test makes sure that old server shut down automatically) (this test makes sure that old server shut down automatically)
$ CHGDEBUG= chg log 2>&1 | egrep 'instruction|start' $ CHGDEBUG= chg log 2>&1 | egrep 'instruction|start'
chg: debug: start cmdserver at $TESTTMP/extreload/chgsock/server.* (glob) chg: debug: * start cmdserver at $TESTTMP/extreload/chgsock/server.* (glob)
shut down servers and restore environment: shut down servers and restore environment:
$ rm -R chgsock $ rm -R chgsock
$ CHGSOCKNAME=$OLDCHGSOCKNAME $ CHGSOCKNAME=$OLDCHGSOCKNAME
$ cd .. $ cd ..