upstream/mercurial-mirror Files · contrib/fuzz/pyutil.cc

streamclone: disable the volatile file open handle optimization on Windows...

streamclone: disable the volatile file open handle optimization on Windows Leaving files open caused new failures like this, since a47f09da8bd1: diff --git a/tests/test-persistent-nodemap-stream-clone.t b/tests/test-persistent-nodemap-stream-clone.t --- a/tests/test-persistent-nodemap-stream-clone.t +++ b/tests/test-persistent-nodemap-stream-clone.t @@ -115,7 +115,12 @@ Do a mix of clone and commit at the same $ (hg clone -U --stream ssh://user@dummy/test-repo stream-clone-race-1 --debug 2>> clone-output | grep -E '00(changelog|manifest)' >> clone-output; touch $HG_TEST_STREAM_WALKED_FILE_3) & $ $RUNTESTDIR/testlib/wait-on-file 10 $HG_TEST_STREAM_WALKED_FILE_1 $ hg -R test-repo/ commit -m foo - created new head + transaction abort! + failed to recover 00changelog.n ([WinError 32] The process cannot access the file because it is being used by another process: b'$STR_REPR_TESTTMP\\test-repo/.hg/store/00changelog.n' -> b'$STR_REPR_TESTTMP\\test-repo/.hg/store/00changelog.n-f418dcd6') + rollback failed - please run hg recover + (failure reason: [WinError 32] The process cannot access the file because it is being used by another process: b'$STR_REPR_TESTTMP\\test-repo/.hg/store/00changelog.n' -> b'$STR_REPR_TESTTMP\\test-repo/.hg/store/00changelog.n-f418dcd6') + abort: The process cannot access the file because it is being used by another process: '$TESTTMP\test-repo\.hg\store\00changelog.n' + [255] $ touch $HG_TEST_STREAM_WALKED_FILE_2 $ $RUNTESTDIR/testlib/wait-on-file 10 $HG_TEST_STREAM_WALKED_FILE_3 $ cat clone-output Since the `VolatileManager` falls back to the old copy method when the open file threshold is exceeded, this just drops the threshold so that only 1 file is open. The actual value used (2) is unexpected, and explained inline. I'd like to have a config option for this so that we can test both ways (in theory, it could resort to copies on non-Windows systems too), but I don't see a `uimod.ui` handy. Alternately, I tried replacing the 3 `open()` calls in the `VolatileManager` with `util.posixfile()`, but that simply hung the test on Windows for some reason, I think on the same line that's indicated as failing above. (There was a `grep` command hanging around, as well as `hg -R test-repo serve --stdio`.)

Augie Fackler - - Load All Authors

File last commit:

r45488:ee5f27d7 default


                r53081:e4b242f9

stable

Download file

             pyutil.cc
        
                    76 lines
            
             | 1.7 KiB
            
                | text/x-c
            
             |
                CppLexer
            
             / contrib / fuzz / pyutil.cc
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      #include "pyutil.h"

      #include <iostream>

      #include <string>

      namespace contrib

      {

      #if PY_MAJOR_VERSION >= 3

      #define HG_FUZZER_PY3 1

      PyMODINIT_FUNC PyInit_parsers(void);

      #else

      PyMODINIT_FUNC initparsers(void);

      #endif

      static char cpypath[8192] = "\0";

      static PyObject *mainmod;

      static PyObject *globals;

      void initpy(const char *cselfpath)

      {

      #ifdef HG_FUZZER_PY3

      	const std::string subdir = "/sanpy/lib/python3.8";

      #else

      	const std::string subdir = "/sanpy/lib/python2.7";

      #endif

      	/* HACK ALERT: we need a full Python installation built without

      	   pymalloc and with ASAN, so we dump one in

      	   $OUT/sanpy/lib/python2.7. This helps us wire that up. */

      	std::string selfpath(cselfpath);

      	std::string pypath;

      	auto pos = selfpath.rfind("/");

      	if (pos == std::string::npos) {

      		char wd[8192];

      		if (!getcwd(wd, 8192)) {

      			std::cerr << "Failed to call getcwd: errno " << errno

      			          << std::endl;

      			exit(1);

      		}

      		pypath = std::string(wd) + subdir;

      	} else {

      		pypath = selfpath.substr(0, pos) + subdir;

      	}

      	strncpy(cpypath, pypath.c_str(), pypath.size());

      	setenv("PYTHONPATH", cpypath, 1);

      	setenv("PYTHONNOUSERSITE", "1", 1);

      	/* prevent Python from looking up users in the fuzz environment */

      	setenv("PYTHONUSERBASE", cpypath, 1);

      #ifdef HG_FUZZER_PY3

      	std::wstring wcpypath(pypath.begin(), pypath.end());

      	Py_SetPythonHome(wcpypath.c_str());

      #else

      	Py_SetPythonHome(cpypath);

      #endif

      	Py_InitializeEx(0);

      	mainmod = PyImport_AddModule("__main__");

      	globals = PyModule_GetDict(mainmod);

      #ifdef HG_FUZZER_PY3

      	PyObject *mod = PyInit_parsers();

      #else

      	initparsers();

      	PyObject *mod = PyImport_ImportModule("parsers");

      #endif

      	PyDict_SetItemString(globals, "parsers", mod);

      }

      PyObject *pyglobals()

      {

      	return globals;

      }

      } // namespace contrib

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages

				#include "pyutil.h"

				#include <iostream>
				#include <string>

				namespace contrib
				{

				#if PY_MAJOR_VERSION >= 3
				#define HG_FUZZER_PY3 1
				PyMODINIT_FUNC PyInit_parsers(void);
				#else
				PyMODINIT_FUNC initparsers(void);
				#endif

				static char cpypath[8192] = "\0";

				static PyObject *mainmod;
				static PyObject *globals;

				void initpy(const char *cselfpath)
				{
				#ifdef HG_FUZZER_PY3
				const std::string subdir = "/sanpy/lib/python3.8";
				#else
				const std::string subdir = "/sanpy/lib/python2.7";
				#endif

				/* HACK ALERT: we need a full Python installation built without
				pymalloc and with ASAN, so we dump one in
				$OUT/sanpy/lib/python2.7. This helps us wire that up. */
				std::string selfpath(cselfpath);
				std::string pypath;
				auto pos = selfpath.rfind("/");
				if (pos == std::string::npos) {
				char wd[8192];
				if (!getcwd(wd, 8192)) {
				std::cerr << "Failed to call getcwd: errno " << errno
				<< std::endl;
				exit(1);
				}
				pypath = std::string(wd) + subdir;
				} else {
				pypath = selfpath.substr(0, pos) + subdir;
				}
				strncpy(cpypath, pypath.c_str(), pypath.size());
				setenv("PYTHONPATH", cpypath, 1);
				setenv("PYTHONNOUSERSITE", "1", 1);
				/* prevent Python from looking up users in the fuzz environment */
				setenv("PYTHONUSERBASE", cpypath, 1);
				#ifdef HG_FUZZER_PY3
				std::wstring wcpypath(pypath.begin(), pypath.end());
				Py_SetPythonHome(wcpypath.c_str());
				#else
				Py_SetPythonHome(cpypath);
				#endif
				Py_InitializeEx(0);
				mainmod = PyImport_AddModule("__main__");
				globals = PyModule_GetDict(mainmod);

				#ifdef HG_FUZZER_PY3
				PyObject *mod = PyInit_parsers();
				#else
				initparsers();
				PyObject *mod = PyImport_ImportModule("parsers");
				#endif

				PyDict_SetItemString(globals, "parsers", mod);
				}

				PyObject *pyglobals()
				{
				return globals;
				}

				} // namespace contrib