##// END OF EJS Templates
copies: iterate over children directly (instead of parents)...
copies: iterate over children directly (instead of parents) Before this change we would gather all parent → child edges and iterate on all parent, gathering copy information for children and aggregating them from there. They are not strict requirement for edges to be processed in that specific order. We could also simply iterate over all "children" revision and aggregate data from both parents at the same time. This patch does that. It make various things simpler: * since both parents are processed at the same time, we no longer need to cache data for merge (see next changeset for details), * we no longer need nested loop to process data, * we no longer need to store partial merge data for a rev from distinct loop interaction to another when processing merges, * we no longer need to build a full parent -> children mapping (we only rely on a simpler "parent -> number of children" map (for memory efficiency), * the data access pattern is now simpler (from lower revisions to higher revisions) and entirely predicable. That predictability open the way to prefetching and parallel processing. So that new iterations order requires simpler code and open the way to interesting optimisation. The effect on performance is quite good. In the worse case, we don't see any significant negative impact. And in the best case, the reduction of roundtrip to Python provide us with a significant speed. Some example below: Repo Case Source-Rev Dest-Rev # of revisions old time new time Difference Factor time per rev --------------------------------------------------------------------------------------------------------------------------------------------------------------- mozilla-try x00000_revs_x00000_added_0_copies dc8a3ca7010e d16fde900c9c : 34414 revs, 0.962867 s, 0.502584 s, -0.460283 s, × 0.5220, 14 µs/rev mozilla-try x0000_revs_xx000_added_x_copies 156f6e2674f2 4d0f2c178e66 : 8598 revs, 0.110717 s, 0.076323 s, -0.034394 s, × 0.6894, 8 µs/rev # full comparison between the previous changeset and this one Repo Case Source-Rev Dest-Rev # of revisions old time new time Difference Factor time per rev --------------------------------------------------------------------------------------------------------------------------------------------------------------- mercurial x_revs_x_added_0_copies ad6b123de1c7 39cfcef4f463 : 1 revs, 0.000048 s, 0.000041 s, -0.000007 s, × 0.8542, 41 µs/rev mercurial x_revs_x_added_x_copies 2b1c78674230 0c1d10351869 : 6 revs, 0.000153 s, 0.000102 s, -0.000051 s, × 0.6667, 17 µs/rev mercurial x000_revs_x000_added_x_copies 81f8ff2a9bf2 dd3267698d84 : 1032 revs, 0.004209 s, 0.004254 s, +0.000045 s, × 1.0107, 4 µs/rev pypy x_revs_x_added_0_copies aed021ee8ae8 099ed31b181b : 9 revs, 0.000203 s, 0.000282 s, +0.000079 s, × 1.3892, 31 µs/rev pypy x_revs_x000_added_0_copies 4aa4e1f8e19a 359343b9ac0e : 1 revs, 0.000059 s, 0.000048 s, -0.000011 s, × 0.8136, 48 µs/rev pypy x_revs_x_added_x_copies ac52eb7bbbb0 72e022663155 : 7 revs, 0.000194 s, 0.000211 s, +0.000017 s, × 1.0876, 30 µs/rev pypy x_revs_x00_added_x_copies c3b14617fbd7 ace7255d9a26 : 1 revs, 0.000380 s, 0.000375 s, -0.000005 s, × 0.9868, 375 µs/rev pypy x_revs_x000_added_x000_copies df6f7a526b60 a83dc6a2d56f : 6 revs, 0.010588 s, 0.010574 s, -0.000014 s, × 0.9987, 1762 µs/rev pypy x000_revs_xx00_added_0_copies 89a76aede314 2f22446ff07e : 4785 revs, 0.048961 s, 0.049974 s, +0.001013 s, × 1.0207, 10 µs/rev pypy x000_revs_x000_added_x_copies 8a3b5bfd266e 2c68e87c3efe : 6780 revs, 0.083612 s, 0.084300 s, +0.000688 s, × 1.0082, 12 µs/rev pypy x000_revs_x000_added_x000_copies 89a76aede314 7b3dda341c84 : 5441 revs, 0.058579 s, 0.060128 s, +0.001549 s, × 1.0264, 11 µs/rev pypy x0000_revs_x_added_0_copies d1defd0dc478 c9cb1334cc78 : 43645 revs, 0.736783 s, 0.686542 s, -0.050241 s, × 0.9318, 15 µs/rev pypy x0000_revs_xx000_added_0_copies bf2c629d0071 4ffed77c095c : 2 revs, 0.022050 s, 0.009277 s, -0.012773 s, × 0.4207, 4638 µs/rev pypy x0000_revs_xx000_added_x000_copies 08ea3258278e d9fa043f30c0 : 11316 revs, 0.120800 s, 0.114733 s, -0.006067 s, × 0.9498, 10 µs/rev netbeans x_revs_x_added_0_copies fb0955ffcbcd a01e9239f9e7 : 2 revs, 0.000140 s, 0.000081 s, -0.000059 s, × 0.5786, 40 µs/rev netbeans x_revs_x000_added_0_copies 6f360122949f 20eb231cc7d0 : 2 revs, 0.000114 s, 0.000107 s, -0.000007 s, × 0.9386, 53 µs/rev netbeans x_revs_x_added_x_copies 1ada3faf6fb6 5a39d12eecf4 : 3 revs, 0.000224 s, 0.000173 s, -0.000051 s, × 0.7723, 57 µs/rev netbeans x_revs_x00_added_x_copies 35be93ba1e2c 9eec5e90c05f : 9 revs, 0.000723 s, 0.000698 s, -0.000025 s, × 0.9654, 77 µs/rev netbeans x000_revs_xx00_added_0_copies eac3045b4fdd 51d4ae7f1290 : 1421 revs, 0.009665 s, 0.009248 s, -0.000417 s, × 0.9569, 6 µs/rev netbeans x000_revs_x000_added_x_copies e2063d266acd 6081d72689dc : 1533 revs, 0.014820 s, 0.015446 s, +0.000626 s, × 1.0422, 10 µs/rev netbeans x000_revs_x000_added_x000_copies ff453e9fee32 411350406ec2 : 5750 revs, 0.076049 s, 0.074373 s, -0.001676 s, × 0.9780, 12 µs/rev netbeans x0000_revs_xx000_added_x000_copies 588c2d1ced70 1aad62e59ddd : 66949 revs, 0.683603 s, 0.639870 s, -0.043733 s, × 0.9360, 9 µs/rev mozilla-central x_revs_x_added_0_copies 3697f962bb7b 7015fcdd43a2 : 2 revs, 0.000161 s, 0.000088 s, -0.000073 s, × 0.5466, 44 µs/rev mozilla-central x_revs_x000_added_0_copies dd390860c6c9 40d0c5bed75d : 8 revs, 0.000234 s, 0.000199 s, -0.000035 s, × 0.8504, 24 µs/rev mozilla-central x_revs_x_added_x_copies 8d198483ae3b 14207ffc2b2f : 9 revs, 0.000247 s, 0.000171 s, -0.000076 s, × 0.6923, 19 µs/rev mozilla-central x_revs_x00_added_x_copies 98cbc58cc6bc 446a150332c3 : 7 revs, 0.000630 s, 0.000592 s, -0.000038 s, × 0.9397, 84 µs/rev mozilla-central x_revs_x000_added_x000_copies 3c684b4b8f68 0a5e72d1b479 : 3 revs, 0.003286 s, 0.003151 s, -0.000135 s, × 0.9589, 1050 µs/rev mozilla-central x_revs_x0000_added_x0000_copies effb563bb7e5 c07a39dc4e80 : 6 revs, 0.062441 s, 0.061612 s, -0.000829 s, × 0.9867, 10268 µs/rev mozilla-central x000_revs_xx00_added_0_copies 6100d773079a 04a55431795e : 1593 revs, 0.005423 s, 0.005381 s, -0.000042 s, × 0.9923, 3 µs/rev mozilla-central x000_revs_x000_added_x_copies 9f17a6fc04f9 2d37b966abed : 41 revs, 0.005919 s, 0.003742 s, -0.002177 s, × 0.6322, 91 µs/rev mozilla-central x000_revs_x000_added_x000_copies 7c97034feb78 4407bd0c6330 : 7839 revs, 0.062597 s, 0.061983 s, -0.000614 s, × 0.9902, 7 µs/rev mozilla-central x0000_revs_xx000_added_0_copies 9eec5917337d 67118cc6dcad : 615 revs, 0.043551 s, 0.019861 s, -0.023690 s, × 0.4560, 32 µs/rev mozilla-central x0000_revs_xx000_added_x000_copies f78c615a656c 96a38b690156 : 30263 revs, 0.192475 s, 0.188101 s, -0.004374 s, × 0.9773, 6 µs/rev mozilla-central x00000_revs_x0000_added_x0000_copies 6832ae71433c 4c222a1d9a00 : 153721 revs, 1.955575 s, 1.806696 s, -0.148879 s, × 0.9239, 11 µs/rev mozilla-central x00000_revs_x00000_added_x000_copies 76caed42cf7c 1daa622bbe42 : 204976 revs, 2.886501 s, 2.682987 s, -0.203514 s, × 0.9295, 13 µs/rev mozilla-try x_revs_x_added_0_copies aaf6dde0deb8 9790f499805a : 2 revs, 0.001181 s, 0.000852 s, -0.000329 s, × 0.7214, 426 µs/rev mozilla-try x_revs_x000_added_0_copies d8d0222927b4 5bb8ce8c7450 : 2 revs, 0.001189 s, 0.000859 s, -0.000330 s, × 0.7225, 429 µs/rev mozilla-try x_revs_x_added_x_copies 092fcca11bdb 936255a0384a : 4 revs, 0.000563 s, 0.000150 s, -0.000413 s, × 0.2664, 37 µs/rev mozilla-try x_revs_x00_added_x_copies b53d2fadbdb5 017afae788ec : 2 revs, 0.001548 s, 0.001158 s, -0.000390 s, × 0.7481, 579 µs/rev mozilla-try x_revs_x000_added_x000_copies 20408ad61ce5 6f0ee96e21ad : 1 revs, 0.027782 s, 0.027240 s, -0.000542 s, × 0.9805, 27240 µs/rev mozilla-try x_revs_x0000_added_x0000_copies effb563bb7e5 c07a39dc4e80 : 6 revs, 0.062781 s, 0.062824 s, +0.000043 s, × 1.0007, 10470 µs/rev mozilla-try x000_revs_xx00_added_0_copies 6100d773079a 04a55431795e : 1593 revs, 0.005778 s, 0.005463 s, -0.000315 s, × 0.9455, 3 µs/rev mozilla-try x000_revs_x000_added_x_copies 9f17a6fc04f9 2d37b966abed : 41 revs, 0.006192 s, 0.004238 s, -0.001954 s, × 0.6844, 103 µs/rev mozilla-try x000_revs_x000_added_x000_copies 1346fd0130e4 4c65cbdabc1f : 6657 revs, 0.065391 s, 0.064113 s, -0.001278 s, × 0.9805, 9 µs/rev mozilla-try x0000_revs_x_added_0_copies 63519bfd42ee a36a2a865d92 : 40314 revs, 0.317216 s, 0.294063 s, -0.023153 s, × 0.9270, 7 µs/rev mozilla-try x0000_revs_x_added_x_copies 9fe69ff0762d bcabf2a78927 : 38690 revs, 0.303119 s, 0.281493 s, -0.021626 s, × 0.9287, 7 µs/rev mozilla-try x0000_revs_xx000_added_x_copies 156f6e2674f2 4d0f2c178e66 : 8598 revs, 0.110717 s, 0.076323 s, -0.034394 s, × 0.6894, 8 µs/rev mozilla-try x0000_revs_xx000_added_0_copies 9eec5917337d 67118cc6dcad : 615 revs, 0.045739 s, 0.020390 s, -0.025349 s, × 0.4458, 33 µs/rev mozilla-try x0000_revs_xx000_added_x000_copies 89294cd501d9 7ccb2fc7ccb5 : 97052 revs, 3.098021 s, 3.023879 s, -0.074142 s, × 0.9761, 31 µs/rev mozilla-try x0000_revs_x0000_added_x0000_copies e928c65095ed e951f4ad123a : 52031 revs, 0.771480 s, 0.735549 s, -0.035931 s, × 0.9534, 14 µs/rev mozilla-try x00000_revs_x_added_0_copies 6a320851d377 1ebb79acd503 : 363753 revs, 18.813422 s, 18.568900 s, -0.244522 s, × 0.9870, 51 µs/rev mozilla-try x00000_revs_x00000_added_0_copies dc8a3ca7010e d16fde900c9c : 34414 revs, 0.962867 s, 0.502584 s, -0.460283 s, × 0.5220, 14 µs/rev mozilla-try x00000_revs_x_added_x_copies 5173c4b6f97c 95d83ee7242d : 362229 revs, 18.684923 s, 18.356645 s, -0.328278 s, × 0.9824, 50 µs/rev mozilla-try x00000_revs_x000_added_x_copies 9126823d0e9c ca82787bb23c : 359344 revs, 18.296305 s, 18.250393 s, -0.045912 s, × 0.9975, 50 µs/rev mozilla-try x00000_revs_x0000_added_x0000_copies 8d3fafa80d4b eb884023b810 : 192665 revs, 3.061887 s, 2.792459 s, -0.269428 s, × 0.9120, 14 µs/rev mozilla-try x00000_revs_x00000_added_x0000_copies 1b661134e2ca 1ae03d022d6d : 228985 revs, 103.869641 s, 107.697264 s, +3.827623 s, × 1.0369, 470 µs/rev mozilla-try x00000_revs_x00000_added_x000_copies 9b2a99adc05e 8e29777b48e6 : 382065 revs, 64.262957 s, 63.961040 s, -0.301917 s, × 0.9953, 167 µs/rev Differential Revision: https://phab.mercurial-scm.org/D9422

File last commit:

r41367:763b45bc default
r46764:294d5aca default
Show More
hgclient.c
655 lines | 15.7 KiB | text/x-c | CLexer
Yuya Nishihara
chg: import frontend sources...
r28060 /*
* A command server client that uses Unix domain socket
*
* Copyright (c) 2011 Yuya Nishihara <yuya@tcha.org>
*
* This software may be used and distributed according to the terms of the
* GNU General Public License version 2 or any later version.
*/
Augie Fackler
chg: enable clang-format on all .c and .h files...
r35977 #include <arpa/inet.h> /* for ntohl(), htonl() */
Yuya Nishihara
chg: import frontend sources...
r28060 #include <assert.h>
#include <ctype.h>
#include <errno.h>
#include <fcntl.h>
#include <signal.h>
#include <stdint.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <sys/socket.h>
#include <sys/stat.h>
#include <sys/un.h>
#include <unistd.h>
#include "hgclient.h"
Jun Wu
chg: handle pager request client-side...
r30738 #include "procutil.h"
Yuya Nishihara
chg: import frontend sources...
r28060 #include "util.h"
Augie Fackler
chg: enable clang-format on all .c and .h files...
r35977 enum { CAP_GETENCODING = 0x0001,
CAP_RUNCOMMAND = 0x0002,
/* cHg extension: */
CAP_ATTACHIO = 0x0100,
CAP_CHDIR = 0x0200,
CAP_SETENV = 0x0800,
Yuya Nishihara
chg: upgrade client to use "setumask2" command...
r40145 CAP_SETUMASK2 = 0x1000,
Augie Fackler
chg: enable clang-format on all .c and .h files...
r35977 CAP_VALIDATE = 0x2000,
CAP_SETPROCNAME = 0x4000,
Yuya Nishihara
chg: import frontend sources...
r28060 };
typedef struct {
const char *name;
unsigned int flag;
} cappair_t;
static const cappair_t captable[] = {
Augie Fackler
chg: enable clang-format on all .c and .h files...
r35977 {"getencoding", CAP_GETENCODING},
{"runcommand", CAP_RUNCOMMAND},
{"attachio", CAP_ATTACHIO},
{"chdir", CAP_CHDIR},
{"setenv", CAP_SETENV},
Yuya Nishihara
chg: upgrade client to use "setumask2" command...
r40145 {"setumask2", CAP_SETUMASK2},
Augie Fackler
chg: enable clang-format on all .c and .h files...
r35977 {"validate", CAP_VALIDATE},
{"setprocname", CAP_SETPROCNAME},
{NULL, 0}, /* terminator */
Yuya Nishihara
chg: import frontend sources...
r28060 };
typedef struct {
char ch;
char *data;
size_t maxdatasize;
size_t datasize;
} context_t;
struct hgclient_tag_ {
int sockfd;
Jun Wu
chg: add pgid to hgclient struct...
r29581 pid_t pgid;
Yuya Nishihara
chg: import frontend sources...
r28060 pid_t pid;
context_t ctx;
unsigned int capflags;
};
static const size_t defaultdatasize = 4096;
Jun Wu
chg: handle pager request client-side...
r30738 static void attachio(hgclient_t *hgc);
Yuya Nishihara
chg: import frontend sources...
r28060 static void initcontext(context_t *ctx)
{
ctx->ch = '\0';
ctx->data = malloc(defaultdatasize);
ctx->maxdatasize = (ctx->data) ? defaultdatasize : 0;
ctx->datasize = 0;
debugmsg("initialize context buffer with size %zu", ctx->maxdatasize);
}
static void enlargecontext(context_t *ctx, size_t newsize)
{
Augie Fackler
cleanup: use clang-tidy to add missing {} around one-line statements...
r41367 if (newsize <= ctx->maxdatasize) {
Yuya Nishihara
chg: import frontend sources...
r28060 return;
Augie Fackler
cleanup: use clang-tidy to add missing {} around one-line statements...
r41367 }
Yuya Nishihara
chg: import frontend sources...
r28060
Augie Fackler
chg: enable clang-format on all .c and .h files...
r35977 newsize = defaultdatasize *
((newsize + defaultdatasize - 1) / defaultdatasize);
Jun Wu
chg: use mallocx and reallocx in hgclient...
r28166 ctx->data = reallocx(ctx->data, newsize);
Yuya Nishihara
chg: import frontend sources...
r28060 ctx->maxdatasize = newsize;
debugmsg("enlarge context buffer to %zu", ctx->maxdatasize);
}
static void freecontext(context_t *ctx)
{
debugmsg("free context buffer");
free(ctx->data);
ctx->data = NULL;
ctx->maxdatasize = 0;
ctx->datasize = 0;
}
/* Read channeled response from cmdserver */
static void readchannel(hgclient_t *hgc)
{
assert(hgc);
ssize_t rsize = recv(hgc->sockfd, &hgc->ctx.ch, sizeof(hgc->ctx.ch), 0);
Jun Wu
chg: downgrade "failed to read channel" from abortmsg to debugmsg...
r28551 if (rsize != sizeof(hgc->ctx.ch)) {
/* server would have exception and traceback would be printed */
debugmsg("failed to read channel");
exit(255);
}
Yuya Nishihara
chg: import frontend sources...
r28060
uint32_t datasize_n;
rsize = recv(hgc->sockfd, &datasize_n, sizeof(datasize_n), 0);
Augie Fackler
cleanup: use clang-tidy to add missing {} around one-line statements...
r41367 if (rsize != sizeof(datasize_n)) {
Yuya Nishihara
chg: import frontend sources...
r28060 abortmsg("failed to read data size");
Augie Fackler
cleanup: use clang-tidy to add missing {} around one-line statements...
r41367 }
Yuya Nishihara
chg: import frontend sources...
r28060
/* datasize denotes the maximum size to write if input request */
hgc->ctx.datasize = ntohl(datasize_n);
enlargecontext(&hgc->ctx, hgc->ctx.datasize);
Augie Fackler
cleanup: use clang-tidy to add missing {} around one-line statements...
r41367 if (isupper(hgc->ctx.ch) && hgc->ctx.ch != 'S') {
Augie Fackler
chg: enable clang-format on all .c and .h files...
r35977 return; /* assumes input request */
Augie Fackler
cleanup: use clang-tidy to add missing {} around one-line statements...
r41367 }
Yuya Nishihara
chg: import frontend sources...
r28060
size_t cursize = 0;
while (cursize < hgc->ctx.datasize) {
rsize = recv(hgc->sockfd, hgc->ctx.data + cursize,
Augie Fackler
chg: enable clang-format on all .c and .h files...
r35977 hgc->ctx.datasize - cursize, 0);
Augie Fackler
cleanup: use clang-tidy to add missing {} around one-line statements...
r41367 if (rsize < 1) {
Yuya Nishihara
chg: import frontend sources...
r28060 abortmsg("failed to read data block");
Augie Fackler
cleanup: use clang-tidy to add missing {} around one-line statements...
r41367 }
Yuya Nishihara
chg: import frontend sources...
r28060 cursize += rsize;
}
}
static void sendall(int sockfd, const void *data, size_t datasize)
{
const char *p = data;
const char *const endp = p + datasize;
while (p < endp) {
ssize_t r = send(sockfd, p, endp - p, 0);
Augie Fackler
cleanup: use clang-tidy to add missing {} around one-line statements...
r41367 if (r < 0) {
Jun Wu
chg: replace abortmsg showing errno with abortmsgerrno...
r28789 abortmsgerrno("cannot communicate");
Augie Fackler
cleanup: use clang-tidy to add missing {} around one-line statements...
r41367 }
Yuya Nishihara
chg: import frontend sources...
r28060 p += r;
}
}
/* Write lengh-data block to cmdserver */
static void writeblock(const hgclient_t *hgc)
{
assert(hgc);
const uint32_t datasize_n = htonl(hgc->ctx.datasize);
sendall(hgc->sockfd, &datasize_n, sizeof(datasize_n));
sendall(hgc->sockfd, hgc->ctx.data, hgc->ctx.datasize);
}
static void writeblockrequest(const hgclient_t *hgc, const char *chcmd)
{
debugmsg("request %s, block size %zu", chcmd, hgc->ctx.datasize);
char buf[strlen(chcmd) + 1];
memcpy(buf, chcmd, sizeof(buf) - 1);
buf[sizeof(buf) - 1] = '\n';
sendall(hgc->sockfd, buf, sizeof(buf));
writeblock(hgc);
}
/* Build '\0'-separated list of args. argsize < 0 denotes that args are
* terminated by NULL. */
static void packcmdargs(context_t *ctx, const char *const args[],
Augie Fackler
chg: enable clang-format on all .c and .h files...
r35977 ssize_t argsize)
Yuya Nishihara
chg: import frontend sources...
r28060 {
ctx->datasize = 0;
const char *const *const end = (argsize >= 0) ? args + argsize : NULL;
for (const char *const *it = args; it != end && *it; ++it) {
Augie Fackler
chg: enable clang-format on all .c and .h files...
r35977 const size_t n = strlen(*it) + 1; /* include '\0' */
Yuya Nishihara
chg: import frontend sources...
r28060 enlargecontext(ctx, ctx->datasize + n);
memcpy(ctx->data + ctx->datasize, *it, n);
ctx->datasize += n;
}
Augie Fackler
cleanup: use clang-tidy to add missing {} around one-line statements...
r41367 if (ctx->datasize > 0) {
Augie Fackler
chg: enable clang-format on all .c and .h files...
r35977 --ctx->datasize; /* strip last '\0' */
Augie Fackler
cleanup: use clang-tidy to add missing {} around one-line statements...
r41367 }
Yuya Nishihara
chg: import frontend sources...
r28060 }
/* Extract '\0'-separated list of args to new buffer, terminated by NULL */
static const char **unpackcmdargsnul(const context_t *ctx)
{
const char **args = NULL;
size_t nargs = 0, maxnargs = 0;
const char *s = ctx->data;
const char *e = ctx->data + ctx->datasize;
for (;;) {
Augie Fackler
chg: enable clang-format on all .c and .h files...
r35977 if (nargs + 1 >= maxnargs) { /* including last NULL */
Yuya Nishihara
chg: import frontend sources...
r28060 maxnargs += 256;
Jun Wu
chg: use mallocx and reallocx in hgclient...
r28166 args = reallocx(args, maxnargs * sizeof(args[0]));
Yuya Nishihara
chg: import frontend sources...
r28060 }
args[nargs] = s;
nargs++;
s = memchr(s, '\0', e - s);
Augie Fackler
cleanup: use clang-tidy to add missing {} around one-line statements...
r41367 if (!s) {
Yuya Nishihara
chg: import frontend sources...
r28060 break;
Augie Fackler
cleanup: use clang-tidy to add missing {} around one-line statements...
r41367 }
Yuya Nishihara
chg: import frontend sources...
r28060 s++;
}
args[nargs] = NULL;
return args;
}
static void handlereadrequest(hgclient_t *hgc)
{
context_t *ctx = &hgc->ctx;
size_t r = fread(ctx->data, sizeof(ctx->data[0]), ctx->datasize, stdin);
ctx->datasize = r;
writeblock(hgc);
}
/* Read single-line */
static void handlereadlinerequest(hgclient_t *hgc)
{
context_t *ctx = &hgc->ctx;
Augie Fackler
cleanup: use clang-tidy to add missing {} around one-line statements...
r41367 if (!fgets(ctx->data, ctx->datasize, stdin)) {
Yuya Nishihara
chg: import frontend sources...
r28060 ctx->data[0] = '\0';
Augie Fackler
cleanup: use clang-tidy to add missing {} around one-line statements...
r41367 }
Yuya Nishihara
chg: import frontend sources...
r28060 ctx->datasize = strlen(ctx->data);
writeblock(hgc);
}
/* Execute the requested command and write exit code */
static void handlesystemrequest(hgclient_t *hgc)
{
context_t *ctx = &hgc->ctx;
enlargecontext(ctx, ctx->datasize + 1);
Augie Fackler
chg: enable clang-format on all .c and .h files...
r35977 ctx->data[ctx->datasize] = '\0'; /* terminate last string */
Yuya Nishihara
chg: import frontend sources...
r28060
const char **args = unpackcmdargsnul(ctx);
Augie Fackler
cleanup: use clang-tidy to add missing {} around one-line statements...
r41367 if (!args[0] || !args[1] || !args[2]) {
Jun Wu
chg: send type information via S channel (BC)...
r30726 abortmsg("missing type or command or cwd in system request");
Augie Fackler
cleanup: use clang-tidy to add missing {} around one-line statements...
r41367 }
Jun Wu
chg: check type read from S channel...
r30728 if (strcmp(args[0], "system") == 0) {
debugmsg("run '%s' at '%s'", args[1], args[2]);
int32_t r = runshellcmd(args[1], args + 3, args[2]);
free(args);
Yuya Nishihara
chg: import frontend sources...
r28060
Jun Wu
chg: check type read from S channel...
r30728 uint32_t r_n = htonl(r);
memcpy(ctx->data, &r_n, sizeof(r_n));
ctx->datasize = sizeof(r_n);
writeblock(hgc);
Jun Wu
chg: handle pager request client-side...
r30738 } else if (strcmp(args[0], "pager") == 0) {
Jun Wu
chg: respect environment variables for pager...
r31941 setuppager(args[1], args + 3);
Augie Fackler
cleanup: use clang-tidy to add missing {} around one-line statements...
r41367 if (hgc->capflags & CAP_ATTACHIO) {
Jun Wu
chg: handle pager request client-side...
r30738 attachio(hgc);
Augie Fackler
cleanup: use clang-tidy to add missing {} around one-line statements...
r41367 }
Jun Wu
chg: handle pager request client-side...
r30738 /* unblock the server */
static const char emptycmd[] = "\n";
sendall(hgc->sockfd, emptycmd, sizeof(emptycmd) - 1);
Jun Wu
chg: check type read from S channel...
r30728 } else {
abortmsg("unknown type in system request: %s", args[0]);
}
Yuya Nishihara
chg: import frontend sources...
r28060 }
/* Read response of command execution until receiving 'r'-esult */
static void handleresponse(hgclient_t *hgc)
{
for (;;) {
readchannel(hgc);
context_t *ctx = &hgc->ctx;
Augie Fackler
chg: enable clang-format on all .c and .h files...
r35977 debugmsg("response read from channel %c, size %zu", ctx->ch,
ctx->datasize);
Yuya Nishihara
chg: import frontend sources...
r28060 switch (ctx->ch) {
case 'o':
fwrite(ctx->data, sizeof(ctx->data[0]), ctx->datasize,
stdout);
break;
case 'e':
fwrite(ctx->data, sizeof(ctx->data[0]), ctx->datasize,
stderr);
break;
case 'd':
/* assumes last char is '\n' */
ctx->data[ctx->datasize - 1] = '\0';
debugmsg("server: %s", ctx->data);
break;
case 'r':
return;
case 'I':
handlereadrequest(hgc);
break;
case 'L':
handlereadlinerequest(hgc);
break;
case 'S':
handlesystemrequest(hgc);
break;
default:
Augie Fackler
cleanup: use clang-tidy to add missing {} around one-line statements...
r41367 if (isupper(ctx->ch)) {
Yuya Nishihara
chg: import frontend sources...
r28060 abortmsg("cannot handle response (ch = %c)",
Augie Fackler
chg: enable clang-format on all .c and .h files...
r35977 ctx->ch);
Augie Fackler
cleanup: use clang-tidy to add missing {} around one-line statements...
r41367 }
Yuya Nishihara
chg: import frontend sources...
r28060 }
}
}
static unsigned int parsecapabilities(const char *s, const char *e)
{
unsigned int flags = 0;
while (s < e) {
const char *t = strchr(s, ' ');
Augie Fackler
cleanup: use clang-tidy to add missing {} around one-line statements...
r41367 if (!t || t > e) {
Yuya Nishihara
chg: import frontend sources...
r28060 t = e;
Augie Fackler
cleanup: use clang-tidy to add missing {} around one-line statements...
r41367 }
Yuya Nishihara
chg: import frontend sources...
r28060 const cappair_t *cap;
for (cap = captable; cap->flag; ++cap) {
size_t n = t - s;
if (strncmp(s, cap->name, n) == 0 &&
strlen(cap->name) == n) {
flags |= cap->flag;
break;
}
}
s = t + 1;
}
return flags;
}
static void readhello(hgclient_t *hgc)
{
readchannel(hgc);
context_t *ctx = &hgc->ctx;
Yuya Nishihara
chg: provide early exception to user...
r28512 if (ctx->ch != 'o') {
char ch = ctx->ch;
if (ch == 'e') {
/* write early error and will exit */
fwrite(ctx->data, sizeof(ctx->data[0]), ctx->datasize,
stderr);
handleresponse(hgc);
}
abortmsg("unexpected channel of hello message (ch = %c)", ch);
}
Yuya Nishihara
chg: import frontend sources...
r28060 enlargecontext(ctx, ctx->datasize + 1);
ctx->data[ctx->datasize] = '\0';
debugmsg("hello received: %s (size = %zu)", ctx->data, ctx->datasize);
const char *s = ctx->data;
const char *const dataend = ctx->data + ctx->datasize;
while (s < dataend) {
const char *t = strchr(s, ':');
Augie Fackler
cleanup: use clang-tidy to add missing {} around one-line statements...
r41367 if (!t || t[1] != ' ') {
Yuya Nishihara
chg: import frontend sources...
r28060 break;
Augie Fackler
cleanup: use clang-tidy to add missing {} around one-line statements...
r41367 }
Yuya Nishihara
chg: import frontend sources...
r28060 const char *u = strchr(t + 2, '\n');
Augie Fackler
cleanup: use clang-tidy to add missing {} around one-line statements...
r41367 if (!u) {
Yuya Nishihara
chg: import frontend sources...
r28060 u = dataend;
Augie Fackler
cleanup: use clang-tidy to add missing {} around one-line statements...
r41367 }
Yuya Nishihara
chg: import frontend sources...
r28060 if (strncmp(s, "capabilities:", t - s + 1) == 0) {
hgc->capflags = parsecapabilities(t + 2, u);
Jun Wu
chg: add pgid to hgclient struct...
r29581 } else if (strncmp(s, "pgid:", t - s + 1) == 0) {
hgc->pgid = strtol(t + 2, NULL, 10);
Yuya Nishihara
chg: import frontend sources...
r28060 } else if (strncmp(s, "pid:", t - s + 1) == 0) {
hgc->pid = strtol(t + 2, NULL, 10);
}
s = u + 1;
}
debugmsg("capflags=0x%04x, pid=%d", hgc->capflags, hgc->pid);
}
Jun Wu
chg: change server's process title...
r30751 static void updateprocname(hgclient_t *hgc)
{
Augie Fackler
chg: enable clang-format on all .c and .h files...
r35977 int r = snprintf(hgc->ctx.data, hgc->ctx.maxdatasize, "chg[worker/%d]",
(int)getpid());
Augie Fackler
cleanup: use clang-tidy to add missing {} around one-line statements...
r41367 if (r < 0 || (size_t)r >= hgc->ctx.maxdatasize) {
Jun Wu
chg: check snprintf result strictly...
r30756 abortmsg("insufficient buffer to write procname (r = %d)", r);
Augie Fackler
cleanup: use clang-tidy to add missing {} around one-line statements...
r41367 }
Jun Wu
chg: check snprintf result strictly...
r30756 hgc->ctx.datasize = (size_t)r;
Jun Wu
chg: change server's process title...
r30751 writeblockrequest(hgc, "setprocname");
}
Yuya Nishihara
chg: import frontend sources...
r28060 static void attachio(hgclient_t *hgc)
{
debugmsg("request attachio");
static const char chcmd[] = "attachio\n";
sendall(hgc->sockfd, chcmd, sizeof(chcmd) - 1);
readchannel(hgc);
context_t *ctx = &hgc->ctx;
Augie Fackler
cleanup: use clang-tidy to add missing {} around one-line statements...
r41367 if (ctx->ch != 'I') {
Yuya Nishihara
chg: import frontend sources...
r28060 abortmsg("unexpected response for attachio (ch = %c)", ctx->ch);
Augie Fackler
cleanup: use clang-tidy to add missing {} around one-line statements...
r41367 }
Yuya Nishihara
chg: import frontend sources...
r28060
static const int fds[3] = {STDIN_FILENO, STDOUT_FILENO, STDERR_FILENO};
struct msghdr msgh;
memset(&msgh, 0, sizeof(msgh));
Augie Fackler
chg: enable clang-format on all .c and .h files...
r35977 struct iovec iov = {ctx->data, ctx->datasize}; /* dummy payload */
Yuya Nishihara
chg: import frontend sources...
r28060 msgh.msg_iov = &iov;
msgh.msg_iovlen = 1;
char fdbuf[CMSG_SPACE(sizeof(fds))];
msgh.msg_control = fdbuf;
msgh.msg_controllen = sizeof(fdbuf);
struct cmsghdr *cmsg = CMSG_FIRSTHDR(&msgh);
cmsg->cmsg_level = SOL_SOCKET;
cmsg->cmsg_type = SCM_RIGHTS;
cmsg->cmsg_len = CMSG_LEN(sizeof(fds));
memcpy(CMSG_DATA(cmsg), fds, sizeof(fds));
msgh.msg_controllen = cmsg->cmsg_len;
ssize_t r = sendmsg(hgc->sockfd, &msgh, 0);
Augie Fackler
cleanup: use clang-tidy to add missing {} around one-line statements...
r41367 if (r < 0) {
Jun Wu
chg: replace abortmsg showing errno with abortmsgerrno...
r28789 abortmsgerrno("sendmsg failed");
Augie Fackler
cleanup: use clang-tidy to add missing {} around one-line statements...
r41367 }
Yuya Nishihara
chg: import frontend sources...
r28060
handleresponse(hgc);
int32_t n;
Augie Fackler
cleanup: use clang-tidy to add missing {} around one-line statements...
r41367 if (ctx->datasize != sizeof(n)) {
Yuya Nishihara
chg: import frontend sources...
r28060 abortmsg("unexpected size of attachio result");
Augie Fackler
cleanup: use clang-tidy to add missing {} around one-line statements...
r41367 }
Yuya Nishihara
chg: import frontend sources...
r28060 memcpy(&n, ctx->data, sizeof(n));
n = ntohl(n);
Augie Fackler
cleanup: use clang-tidy to add missing {} around one-line statements...
r41367 if (n != sizeof(fds) / sizeof(fds[0])) {
Yuya Nishihara
chg: import frontend sources...
r28060 abortmsg("failed to send fds (n = %d)", n);
Augie Fackler
cleanup: use clang-tidy to add missing {} around one-line statements...
r41367 }
Yuya Nishihara
chg: import frontend sources...
r28060 }
static void chdirtocwd(hgclient_t *hgc)
{
Augie Fackler
cleanup: use clang-tidy to add missing {} around one-line statements...
r41367 if (!getcwd(hgc->ctx.data, hgc->ctx.maxdatasize)) {
Jun Wu
chg: replace abortmsg showing errno with abortmsgerrno...
r28789 abortmsgerrno("failed to getcwd");
Augie Fackler
cleanup: use clang-tidy to add missing {} around one-line statements...
r41367 }
Yuya Nishihara
chg: import frontend sources...
r28060 hgc->ctx.datasize = strlen(hgc->ctx.data);
writeblockrequest(hgc, "chdir");
}
Jun Wu
chg: forward umask from client to server...
r28160 static void forwardumask(hgclient_t *hgc)
{
mode_t mask = umask(0);
umask(mask);
uint32_t data = htonl(mask);
Yuya Nishihara
chg: upgrade client to use "setumask2" command...
r40145 enlargecontext(&hgc->ctx, sizeof(data));
memcpy(hgc->ctx.data, &data, sizeof(data));
hgc->ctx.datasize = sizeof(data);
writeblockrequest(hgc, "setumask2");
Jun Wu
chg: forward umask from client to server...
r28160 }
Yuya Nishihara
chg: import frontend sources...
r28060 /*!
* Open connection to per-user cmdserver
*
* If no background server running, returns NULL.
*/
hgclient_t *hgc_open(const char *sockname)
{
int fd = socket(AF_UNIX, SOCK_STREAM, 0);
Augie Fackler
cleanup: use clang-tidy to add missing {} around one-line statements...
r41367 if (fd < 0) {
Jun Wu
chg: replace abortmsg showing errno with abortmsgerrno...
r28789 abortmsgerrno("cannot create socket");
Augie Fackler
cleanup: use clang-tidy to add missing {} around one-line statements...
r41367 }
Yuya Nishihara
chg: import frontend sources...
r28060
/* don't keep fd on fork(), so that it can be closed when the parent
* process get terminated. */
Jun Wu
chg: extract the logic of setting FD_CLOEXEC to a utility function...
r28855 fsetcloexec(fd);
Yuya Nishihara
chg: import frontend sources...
r28060
struct sockaddr_un addr;
addr.sun_family = AF_UNIX;
Jun Wu
chg: let hgc_open support long path...
r30675
/* use chdir to workaround small sizeof(sun_path) */
int bakfd = -1;
const char *basename = sockname;
{
const char *split = strrchr(sockname, '/');
if (split && split != sockname) {
Augie Fackler
cleanup: use clang-tidy to add missing {} around one-line statements...
r41367 if (split[1] == '\0') {
Jun Wu
chg: let hgc_open support long path...
r30675 abortmsg("sockname cannot end with a slash");
Augie Fackler
cleanup: use clang-tidy to add missing {} around one-line statements...
r41367 }
Jun Wu
chg: let hgc_open support long path...
r30675 size_t len = split - sockname;
char sockdir[len + 1];
memcpy(sockdir, sockname, len);
sockdir[len] = '\0';
bakfd = open(".", O_DIRECTORY);
Augie Fackler
cleanup: use clang-tidy to add missing {} around one-line statements...
r41367 if (bakfd == -1) {
Jun Wu
chg: let hgc_open support long path...
r30675 abortmsgerrno("cannot open cwd");
Augie Fackler
cleanup: use clang-tidy to add missing {} around one-line statements...
r41367 }
Jun Wu
chg: let hgc_open support long path...
r30675
int r = chdir(sockdir);
Augie Fackler
cleanup: use clang-tidy to add missing {} around one-line statements...
r41367 if (r != 0) {
Jun Wu
chg: let hgc_open support long path...
r30675 abortmsgerrno("cannot chdir %s", sockdir);
Augie Fackler
cleanup: use clang-tidy to add missing {} around one-line statements...
r41367 }
Jun Wu
chg: let hgc_open support long path...
r30675
basename = split + 1;
}
}
Augie Fackler
cleanup: use clang-tidy to add missing {} around one-line statements...
r41367 if (strlen(basename) >= sizeof(addr.sun_path)) {
Jun Wu
chg: let hgc_open support long path...
r30675 abortmsg("sockname is too long: %s", basename);
Augie Fackler
cleanup: use clang-tidy to add missing {} around one-line statements...
r41367 }
Jun Wu
chg: let hgc_open support long path...
r30675 strncpy(addr.sun_path, basename, sizeof(addr.sun_path));
Yuya Nishihara
chg: import frontend sources...
r28060 addr.sun_path[sizeof(addr.sun_path) - 1] = '\0';
Jun Wu
chg: let hgc_open support long path...
r30675 /* real connect */
Yuya Nishihara
chg: import frontend sources...
r28060 int r = connect(fd, (struct sockaddr *)&addr, sizeof(addr));
Jun Wu
chg: handle connect failure before errno gets overridden...
r30679 if (r < 0) {
Augie Fackler
cleanup: use clang-tidy to add missing {} around one-line statements...
r41367 if (errno != ENOENT && errno != ECONNREFUSED) {
Jun Wu
chg: handle connect failure before errno gets overridden...
r30679 abortmsgerrno("cannot connect to %s", sockname);
Augie Fackler
cleanup: use clang-tidy to add missing {} around one-line statements...
r41367 }
Jun Wu
chg: handle connect failure before errno gets overridden...
r30679 }
Jun Wu
chg: let hgc_open support long path...
r30675 if (bakfd != -1) {
fchdirx(bakfd);
close(bakfd);
}
Yuya Nishihara
chg: import frontend sources...
r28060 if (r < 0) {
close(fd);
Jun Wu
chg: handle connect failure before errno gets overridden...
r30679 return NULL;
Yuya Nishihara
chg: import frontend sources...
r28060 }
Jun Wu
chg: make connect debug message less repetitive...
r28769 debugmsg("connected to %s", addr.sun_path);
Yuya Nishihara
chg: import frontend sources...
r28060
Jun Wu
chg: use mallocx and reallocx in hgclient...
r28166 hgclient_t *hgc = mallocx(sizeof(hgclient_t));
Yuya Nishihara
chg: import frontend sources...
r28060 memset(hgc, 0, sizeof(*hgc));
hgc->sockfd = fd;
initcontext(&hgc->ctx);
readhello(hgc);
Augie Fackler
cleanup: use clang-tidy to add missing {} around one-line statements...
r41367 if (!(hgc->capflags & CAP_RUNCOMMAND)) {
Yuya Nishihara
chg: import frontend sources...
r28060 abortmsg("insufficient capability: runcommand");
Augie Fackler
cleanup: use clang-tidy to add missing {} around one-line statements...
r41367 }
if (hgc->capflags & CAP_SETPROCNAME) {
Jun Wu
chg: change server's process title...
r30751 updateprocname(hgc);
Augie Fackler
cleanup: use clang-tidy to add missing {} around one-line statements...
r41367 }
if (hgc->capflags & CAP_ATTACHIO) {
Yuya Nishihara
chg: import frontend sources...
r28060 attachio(hgc);
Augie Fackler
cleanup: use clang-tidy to add missing {} around one-line statements...
r41367 }
if (hgc->capflags & CAP_CHDIR) {
Yuya Nishihara
chg: import frontend sources...
r28060 chdirtocwd(hgc);
Augie Fackler
cleanup: use clang-tidy to add missing {} around one-line statements...
r41367 }
if (hgc->capflags & CAP_SETUMASK2) {
Jun Wu
chg: forward umask from client to server...
r28160 forwardumask(hgc);
Augie Fackler
cleanup: use clang-tidy to add missing {} around one-line statements...
r41367 }
Yuya Nishihara
chg: import frontend sources...
r28060
return hgc;
}
/*!
* Close connection and free allocated memory
*/
void hgc_close(hgclient_t *hgc)
{
assert(hgc);
freecontext(&hgc->ctx);
close(hgc->sockfd);
free(hgc);
}
Jun Wu
chg: add pgid to hgclient struct...
r29581 pid_t hgc_peerpgid(const hgclient_t *hgc)
{
assert(hgc);
return hgc->pgid;
}
Yuya Nishihara
chg: import frontend sources...
r28060 pid_t hgc_peerpid(const hgclient_t *hgc)
{
assert(hgc);
return hgc->pid;
}
/*!
Jun Wu
chg: implement validate in hgclient...
r28356 * Send command line arguments to let the server load the repo config and check
* whether it can process our request directly or not.
* Make sure hgc_setenv is called before calling this.
*
* @return - NULL, the server believes it can handle our request, or does not
* support "validate" command.
Jun Wu
chgserver: add an explicit "reconnect" instruction to validate...
r28535 * - a list of strings, the server probably cannot handle our request
* and it sent instructions telling us what to do next. See
Jun Wu
chg: implement validate in hgclient...
r28356 * chgserver.py for possible instruction formats.
* the list should be freed by the caller.
* the last string is guaranteed to be NULL.
*/
const char **hgc_validate(hgclient_t *hgc, const char *const args[],
Augie Fackler
chg: enable clang-format on all .c and .h files...
r35977 size_t argsize)
Jun Wu
chg: implement validate in hgclient...
r28356 {
assert(hgc);
Augie Fackler
cleanup: use clang-tidy to add missing {} around one-line statements...
r41367 if (!(hgc->capflags & CAP_VALIDATE)) {
Jun Wu
chg: implement validate in hgclient...
r28356 return NULL;
Augie Fackler
cleanup: use clang-tidy to add missing {} around one-line statements...
r41367 }
Jun Wu
chg: implement validate in hgclient...
r28356
packcmdargs(&hgc->ctx, args, argsize);
writeblockrequest(hgc, "validate");
handleresponse(hgc);
/* the server returns '\0' if it can handle our request */
Augie Fackler
cleanup: use clang-tidy to add missing {} around one-line statements...
r41367 if (hgc->ctx.datasize <= 1) {
Jun Wu
chg: implement validate in hgclient...
r28356 return NULL;
Augie Fackler
cleanup: use clang-tidy to add missing {} around one-line statements...
r41367 }
Jun Wu
chg: implement validate in hgclient...
r28356
/* make sure the buffer is '\0' terminated */
enlargecontext(&hgc->ctx, hgc->ctx.datasize + 1);
hgc->ctx.data[hgc->ctx.datasize] = '\0';
return unpackcmdargsnul(&hgc->ctx);
}
/*!
Yuya Nishihara
chg: import frontend sources...
r28060 * Execute the specified Mercurial command
*
* @return result code
*/
int hgc_runcommand(hgclient_t *hgc, const char *const args[], size_t argsize)
{
assert(hgc);
packcmdargs(&hgc->ctx, args, argsize);
writeblockrequest(hgc, "runcommand");
handleresponse(hgc);
int32_t exitcode_n;
if (hgc->ctx.datasize != sizeof(exitcode_n)) {
abortmsg("unexpected size of exitcode");
}
memcpy(&exitcode_n, hgc->ctx.data, sizeof(exitcode_n));
return ntohl(exitcode_n);
}
/*!
* (Re-)send client's stdio channels so that the server can access to tty
*/
void hgc_attachio(hgclient_t *hgc)
{
assert(hgc);
Augie Fackler
cleanup: use clang-tidy to add missing {} around one-line statements...
r41367 if (!(hgc->capflags & CAP_ATTACHIO)) {
Yuya Nishihara
chg: import frontend sources...
r28060 return;
Augie Fackler
cleanup: use clang-tidy to add missing {} around one-line statements...
r41367 }
Yuya Nishihara
chg: import frontend sources...
r28060 attachio(hgc);
}
/*!
* Update server's environment variables
*
* @param envp list of environment variables in "NAME=VALUE" format,
* terminated by NULL.
*/
void hgc_setenv(hgclient_t *hgc, const char *const envp[])
{
assert(hgc && envp);
Augie Fackler
cleanup: use clang-tidy to add missing {} around one-line statements...
r41367 if (!(hgc->capflags & CAP_SETENV)) {
Yuya Nishihara
chg: import frontend sources...
r28060 return;
Augie Fackler
cleanup: use clang-tidy to add missing {} around one-line statements...
r41367 }
Yuya Nishihara
chg: import frontend sources...
r28060 packcmdargs(&hgc->ctx, envp, /*argsize*/ -1);
writeblockrequest(hgc, "setenv");
}