This is an archive of the discontinued Mercurial Phabricator instance.

Differential D6865

osutil: allow disabling setprocname via a define passed to the compiler
ClosedPublic

Authored by spectral on Sep 17 2019, 6:58 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG460f8bf58020: osutil: allow disabling setprocname via a define passed to the compiler
Summary

In some situations, we run a custom python launcher that appears to not set up
Py_GetArgcArgv correctly. We then proceed to promptly crash when we attempt to
dereference NULL. Being able to completely disable setprocname is beneficial in
these situations, since we won't even attempt to use it, even if the case that
causes the crash is fixed.

Right now, if I compile osutil.so with -DSETPROCNAME_USE_NONE, the compilation
fails on python3 due to SETPROCNAME_USE_NONE redefinition. I could possibly
work around that, but it's likely helpful to have a way of disabling this
completely without it being brittle (i.e. if python3 ever gains the ability to
perform this operation).

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

spectral created this revision.Sep 17 2019, 6:58 PM
spectral added a commit: rHG460f8bf58020: osutil: allow disabling setprocname via a define passed to the compiler.Sep 23 2019, 1:15 PM
This revision was not accepted when it landed; it landed in state Needs Review.
Closed by commit rHG460f8bf58020: osutil: allow disabling setprocname via a define passed to the compiler (authored by spectral). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/cext/osutil.c (3 lines)

Diff 16590

mercurial/cext/osutil.c

bail: bail:
Py_XDECREF(rfdslist); Py_XDECREF(rfdslist);
return NULL; return NULL;
} }
#endif /* CMSG_LEN */ #endif /* CMSG_LEN */
/* allow disabling setprocname via compiler flags */
#ifndef SETPROCNAME_USE_NONE
#if defined(HAVE_SETPROCTITLE) #if defined(HAVE_SETPROCTITLE)
/* setproctitle is the first choice - available in FreeBSD */ /* setproctitle is the first choice - available in FreeBSD */
#define SETPROCNAME_USE_SETPROCTITLE #define SETPROCNAME_USE_SETPROCTITLE
#elif (defined(__linux__) || defined(__APPLE__)) && PY_MAJOR_VERSION == 2 #elif (defined(__linux__) || defined(__APPLE__)) && PY_MAJOR_VERSION == 2
/* rewrite the argv buffer in place - works in Linux and OS X. Py_GetArgcArgv /* rewrite the argv buffer in place - works in Linux and OS X. Py_GetArgcArgv
* in Python 3 returns the copied wchar_t **argv, thus unsupported. */ * in Python 3 returns the copied wchar_t **argv, thus unsupported. */
#define SETPROCNAME_USE_ARGVREWRITE #define SETPROCNAME_USE_ARGVREWRITE
#else #else
#define SETPROCNAME_USE_NONE #define SETPROCNAME_USE_NONE
#endif #endif
#endif /* ndef SETPROCNAME_USE_NONE */
#ifndef SETPROCNAME_USE_NONE #ifndef SETPROCNAME_USE_NONE
static PyObject *setprocname(PyObject *self, PyObject *args) static PyObject *setprocname(PyObject *self, PyObject *args)
{ {
const char *name = NULL; const char *name = NULL;
if (!PyArg_ParseTuple(args, PY23("s", "y"), &name)) if (!PyArg_ParseTuple(args, PY23("s", "y"), &name))
return NULL; return NULL;