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

login
register
mail settings
Submitter phabricator
Date Sept. 17, 2019, 10:58 p.m.
Message ID <differential-rev-PHID-DREV-xxfj7ek7gro77vb76pvi-req@mercurial-scm.org>
Download mbox | patch
Permalink /patch/41705/
State Superseded
Headers show

Comments

phabricator - Sept. 17, 2019, 10:58 p.m.
spectral created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.

REVISION 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).

REPOSITORY
  rHG Mercurial

REVISION DETAIL
  https://phab.mercurial-scm.org/D6865

AFFECTED FILES
  mercurial/cext/osutil.c

CHANGE DETAILS




To: spectral, #hg-reviewers
Cc: mercurial-devel

Patch

diff --git a/mercurial/cext/osutil.c b/mercurial/cext/osutil.c
--- a/mercurial/cext/osutil.c
+++ b/mercurial/cext/osutil.c
@@ -765,6 +765,8 @@ 
 
 #endif /* CMSG_LEN */
 
+/* allow disabling setprocname via compiler flags */
+#ifndef SETPROCNAME_USE_NONE
 #if defined(HAVE_SETPROCTITLE)
 /* setproctitle is the first choice - available in FreeBSD */
 #define SETPROCNAME_USE_SETPROCTITLE
@@ -775,6 +777,7 @@ 
 #else
 #define SETPROCNAME_USE_NONE
 #endif
+#endif /* ndef SETPROCNAME_USE_NONE */
 
 #ifndef SETPROCNAME_USE_NONE
 static PyObject *setprocname(PyObject *self, PyObject *args)