treemanifests: remove _loadalllazy when doing copies 'before' here is https://phab.mercurial-scm.org/D4845 (not the committed/rebased version) diff --git: repo | N | T | before (mean +- stdev) | after (mean +- stdev) | % of before ------+---+---+------------------------+-----------------------+------------ m-u | | | 1.329 s +- 0.011 s | 1.320 s +- 0.010 s | 99.3% m-u | | x | 1.316 s +- 0.005 s | 1.334 s +- 0.018 s | 101.4% m-u | x | | 1.330 s +- 0.021 s | 1.322 s +- 0.005 s | 99.4% m-u | x | x | 87.2 ms +- 0.7 ms | 86.9 ms +- 1.5 ms | 99.7% l-d-r | | | 203.3 ms +- 7.8 ms | 199.4 ms +- 1.8 ms | 98.1% l-d-r | | x | 204.6 ms +- 2.8 ms | 201.7 ms +- 2.1 ms | 98.6% l-d-r | x | | 90.5 ms +- 11.0 ms | 86.2 ms +- 1.0 ms | 95.2% l-d-r | x | x | 66.3 ms +- 2.0 ms | 66.4 ms +- 0.9 ms | 100.2% diff -c . --git: repo | N | T | before (mean +- stdev) | after (mean +- stdev) | % of before ------+---+---+------------------------+-----------------------+------------ m-u | | | 239.4 ms +- 2.0 ms | 241.7 ms +- 4.6 ms | 101.0% m-u | | x | 128.9 ms +- 1.9 ms | 130.9 ms +- 7.7 ms | 101.6% m-u | x | | 241.1 ms +- 1.6 ms | 240.1 ms +- 1.4 ms | 99.6% m-u | x | x | 133.4 ms +- 1.5 ms | 133.4 ms +- 1.2 ms | 100.0% l-d-r | | | 84.3 ms +- 1.5 ms | 83.5 ms +- 1.0 ms | 99.1% l-d-r | | x | 200.9 ms +- 6.3 ms | 203.0 ms +- 4.4 ms | 101.0% l-d-r | x | | 108.1 ms +- 1.4 ms | 108.7 ms +- 2.1 ms | 100.6% l-d-r | x | x | 190.2 ms +- 4.8 ms | 191.6 ms +- 2.0 ms | 100.7% rebase -r . --keep -d .^^: repo | N | T | before (mean +- stdev) | after (mean +- stdev) | % of before ------+---+---+------------------------+-----------------------+------------ m-u | | | 5.655 s +- 0.029 s | 5.640 s +- 0.036 s | 99.7% m-u | | x | 5.813 s +- 0.038 s | 5.773 s +- 0.028 s | 99.3% m-u | x | | 5.593 s +- 0.043 s | 5.589 s +- 0.028 s | 99.9% m-u | x | x | 648.2 ms +- 19.2 ms | 637.3 ms +- 27.7 ms | 98.3% l-d-r | | | 673.3 ms +- 8.0 ms | 673.2 ms +- 6.8 ms | 100.0% l-d-r | | x | 6.583 s +- 0.030 s | 5.721 s +- 0.028 s | 86.9% <-- l-d-r | x | | 277.8 ms +- 6.7 ms | 276.0 ms +- 2.7 ms | 99.4% l-d-r | x | x | 1.692 s +- 0.013 s | 720.9 ms +- 13.3 ms | 42.6% <-- status --change . --copies: repo | N | T | before (mean +- stdev) | after (mean +- stdev) | % of before ------+---+---+------------------------+-----------------------+------------ m-u | | | 220.9 ms +- 1.6 ms | 219.9 ms +- 2.2 ms | 99.5% m-u | | x | 109.2 ms +- 1.0 ms | 109.4 ms +- 0.8 ms | 100.2% m-u | x | | 222.6 ms +- 1.7 ms | 221.4 ms +- 2.1 ms | 99.5% m-u | x | x | 113.4 ms +- 0.5 ms | 113.1 ms +- 1.1 ms | 99.7% l-d-r | | | 82.1 ms +- 1.7 ms | 82.1 ms +- 1.2 ms | 100.0% l-d-r | | x | 199.8 ms +- 4.0 ms | 200.7 ms +- 3.6 ms | 100.5% l-d-r | x | | 85.4 ms +- 1.5 ms | 85.2 ms +- 0.3 ms | 99.8% l-d-r | x | x | 202.6 ms +- 4.4 ms | 208.0 ms +- 4.0 ms | 102.7% status --copies: repo | N | T | before (mean +- stdev) | after (mean +- stdev) | % of before ------+---+---+------------------------+-----------------------+------------ m-u | | | 1.941 s +- 0.014 s | 1.930 s +- 0.009 s | 99.4% m-u | | x | 1.924 s +- 0.007 s | 1.950 s +- 0.010 s | 101.4% m-u | x | | 1.959 s +- 0.085 s | 1.926 s +- 0.009 s | 98.3% m-u | x | x | 96.2 ms +- 1.0 ms | 96.4 ms +- 0.7 ms | 100.2% l-d-r | | | 604.4 ms +- 10.6 ms | 602.6 ms +- 7.1 ms | 99.7% l-d-r | | x | 605.7 ms +- 4.1 ms | 607.4 ms +- 6.1 ms | 100.3% l-d-r | x | | 182.4 ms +- 1.2 ms | 183.4 ms +- 1.2 ms | 100.5% l-d-r | x | x | 150.8 ms +- 2.0 ms | 150.6 ms +- 1.0 ms | 99.9% update $rev^; ~/src/hg/hg{hg}/hg update $rev: repo | N | T | before (mean +- stdev) | after (mean +- stdev) | % of before ------+---+---+------------------------+-----------------------+------------ m-u | | | 3.185 s +- 0.027 s | 3.181 s +- 0.017 s | 99.9% m-u | | x | 3.028 s +- 0.021 s | 2.954 s +- 0.010 s | 97.6% m-u | x | | 3.168 s +- 0.010 s | 3.175 s +- 0.023 s | 100.2% m-u | x | x | 317.5 ms +- 3.5 ms | 313.2 ms +- 2.9 ms | 98.6% l-d-r | | | 456.2 ms +- 10.6 ms | 454.4 ms +- 5.8 ms | 99.6% l-d-r | | x | 9.236 s +- 0.063 s | 757.9 ms +- 9.2 ms | 8.2% <-- l-d-r | x | | 257.6 ms +- 2.3 ms | 261.2 ms +- 1.7 ms | 101.4% l-d-r | x | x | 1.614 s +- 0.013 s | 478.0 ms +- 14.3 ms | 29.6% <-- Differential Revision: https://phab.mercurial-scm.org/D4875

     1

/*

     2

 exewrapper.c - wrapper for calling a python script on Windows

     3

     4

 Copyright 2012 Adrian Buehlmann <adrian@cadifra.com> and others

     5

     6

 This software may be used and distributed according to the terms of the

     7

 GNU General Public License version 2 or any later version.

     8

*/

     9

    10

#include <stdio.h>

    11

#include <windows.h>

    12

    13

#include "hgpythonlib.h"

    14

    15

#ifdef __GNUC__

    16

int strcat_s(char *d, size_t n, const char *s)

    17

{

    18

	return !strncat(d, s, n);

    19

}

    20

int strcpy_s(char *d, size_t n, const char *s)

    21

{

    22

	return !strncpy(d, s, n);

    23

}

    24

#endif

    25

    26

static char pyscript[MAX_PATH + 10];

    27

static char pyhome[MAX_PATH + 10];

    28

static char envpyhome[MAX_PATH + 10];

    29

static char pydllfile[MAX_PATH + 10];

    30

    31

int main(int argc, char *argv[])

    32

{

    33

	char *p;

    34

	int ret;

    35

	int i;

    36

	int n;

    37

	char **pyargv;

    38

	WIN32_FIND_DATA fdata;

    39

	HANDLE hfind;

    40

	const char *err;

    41

	HMODULE pydll;

    42

	void(__cdecl * Py_SetPythonHome)(char *home);

    43

	int(__cdecl * Py_Main)(int argc, char *argv[]);

    44

    45

	if (GetModuleFileName(NULL, pyscript, sizeof(pyscript)) == 0) {

    46

		err = "GetModuleFileName failed";

    47

		goto bail;

    48

	}

    49

    50

	p = strrchr(pyscript, '.');

    51

	if (p == NULL) {

    52

		err = "malformed module filename";

    53

		goto bail;

    54

	}

    55

	*p = 0; /* cut trailing ".exe" */

    56

	strcpy_s(pyhome, sizeof(pyhome), pyscript);

    57

    58

	hfind = FindFirstFile(pyscript, &fdata);

    59

	if (hfind != INVALID_HANDLE_VALUE) {

    60

		/* pyscript exists, close handle */

    61

		FindClose(hfind);

    62

	} else {

    63

		/* file pyscript isn't there, take <pyscript>exe.py */

    64

		strcat_s(pyscript, sizeof(pyscript), "exe.py");

    65

	}

    66

    67

	pydll = NULL;

    68

    69

	p = strrchr(pyhome, '\\');

    70

	if (p == NULL) {

    71

		err = "can't find backslash in module filename";

    72

		goto bail;

    73

	}

    74

	*p = 0; /* cut at directory */

    75

    76

	/* check for private Python of HackableMercurial */

    77

	strcat_s(pyhome, sizeof(pyhome), "\\hg-python");

    78

    79

	hfind = FindFirstFile(pyhome, &fdata);

    80

	if (hfind != INVALID_HANDLE_VALUE) {

    81

		/* Path .\hg-python exists. We are probably in HackableMercurial

    82

		scenario, so let's load python dll from this dir. */

    83

		FindClose(hfind);

    84

		strcpy_s(pydllfile, sizeof(pydllfile), pyhome);

    85

		strcat_s(pydllfile, sizeof(pydllfile), "\\" HGPYTHONLIB ".dll");

    86

		pydll = LoadLibrary(pydllfile);

    87

		if (pydll == NULL) {

    88

			err = "failed to load private Python DLL " HGPYTHONLIB

    89

			      ".dll";

    90

			goto bail;

    91

		}

    92

		Py_SetPythonHome =

    93

		    (void *)GetProcAddress(pydll, "Py_SetPythonHome");

    94

		if (Py_SetPythonHome == NULL) {

    95

			err = "failed to get Py_SetPythonHome";

    96

			goto bail;

    97

		}

    98

		Py_SetPythonHome(pyhome);

    99

	}

   100

   101

	if (pydll == NULL) {

   102

		pydll = LoadLibrary(HGPYTHONLIB ".dll");

   103

		if (pydll == NULL) {

   104

			err = "failed to load Python DLL " HGPYTHONLIB ".dll";

   105

			goto bail;

   106

		}

   107

	}

   108

   109

	Py_Main = (void *)GetProcAddress(pydll, "Py_Main");

   110

	if (Py_Main == NULL) {

   111

		err = "failed to get Py_Main";

   112

		goto bail;

   113

	}

   114

   115

	/*

   116

	Only add the pyscript to the args, if it's not already there. It may

   117

	already be there, if the script spawned a child process of itself, in

   118

	the same way as it got called, that is, with the pyscript already in

   119

	place. So we optionally accept the pyscript as the first argument

   120

	(argv[1]), letting our exe taking the role of the python interpreter.

   121

	*/

   122

	if (argc >= 2 && strcmp(argv[1], pyscript) == 0) {

   123

		/*

   124

		pyscript is already in the args, so there is no need to copy

   125

		the args and we can directly call the python interpreter with

   126

		the original args.

   127

		*/

   128

		return Py_Main(argc, argv);

   129

	}

   130

   131

	/*

   132

	Start assembling the args for the Python interpreter call. We put the

   133

	name of our exe (argv[0]) in the position where the python.exe

   134

	canonically is, and insert the pyscript next.

   135

	*/

   136

	pyargv = malloc((argc + 5) * sizeof(char *));

   137

	if (pyargv == NULL) {

   138

		err = "not enough memory";

   139

		goto bail;

   140

	}

   141

	n = 0;

   142

	pyargv[n++] = argv[0];

   143

	pyargv[n++] = pyscript;

   144

   145

	/* copy remaining args from the command line */

   146

	for (i = 1; i < argc; i++)

   147

		pyargv[n++] = argv[i];

   148

	/* argv[argc] is guaranteed to be NULL, so we forward that guarantee */

   149

	pyargv[n] = NULL;

   150

   151

	ret = Py_Main(n, pyargv); /* The Python interpreter call */

   152

   153

	free(pyargv);

   154

	return ret;

   155

   156

bail:

   157

	fprintf(stderr, "abort: %s\n", err);

   158

	return 255;

   159

}