bpo-31904 : Add support for VxWorks RTOS#4184

nascheme · 2019-01-10T19:13:51Z

This is not good. First, 'try' is bare 'except' is bad news, hides bugs. Second, you are doing the 'vxworks' test on every function call, for every platform. Instead you could have something like:
def spawnv_passfds(...): ... if 'vxworks' in sys.platform: # a comment explaining why this is needed def spawnv_passfds(...): # implementation of vxworks special version

nascheme · 2019-01-10T19:15:17Z

Looks suspicious. Does os.popen() now return different exceptions? I suspect you should fix os.popen() to trap ValueError and return OSError instead. Otherwise everyone who uses os.popen() has to deal with the new exception case.

nascheme · 2019-01-10T19:16:38Z

Again, you are doing the _vxworks test on every function call for every platform. Not a huge deal but isabs() might be called a lot. Instead, define a new isabs() on vxworks.

nascheme · 2019-01-10T19:17:42Z

Again, runtime testing of _vxworks. Better to define a special _joinrealpath() function at module import time.

-Original file line number
+Diff line change
@@ Expand Up / @@ -11,7 +11,7 @@ @@
  var all_versions ={
  '3.8': 'dev (3.8)',
-'3.7': 'pre (3.7)',
+'3.7': 'pre (3.7)',
  '3.6': '3.6',
  '3.5': '3.5',
  '2.7': '2.7',
@@ Expand Down @@

-Original file line number
+Diff line change
@@ Expand Up / @@ -14,6 +14,10 @@ extern "C"{ @@
 #define DELIM L''
 #endif
+#ifdef __VXWORKS__
+#define DELIM L''
+#endif
 /* Filename separator */
 #ifndef SEP
 #define SEP L'/'
@@ Expand Down @@

-Original file line number
+Diff line change
@@ Expand Up / @@ -102,6 +102,10 @@ PyAPI_FUNC(void) PySymtable_Free(struct symtable *); @@
 #define SCOPE_OFFSET 11
 #define SCOPE_MASK (DEF_GLOBAL | DEF_LOCAL | DEF_PARAM | DEF_NONLOCAL)
+#ifdef __VXWORKS__
+ #undef LOCAL
+#endif
 #define LOCAL 1
 #define GLOBAL_EXPLICIT 2
 #define GLOBAL_IMPLICIT 3
@@ Expand Down @@

-Original file line number
+Diff line change
@@ Expand Up / @@ -410,6 +410,13 @@ def _flush_std_streams(): @@
 #
 def spawnv_passfds(path, args, passfds):
+ if 'vxworks' in sys.platform:
+ import subprocess
+ try:
+ return subprocess.Popen(args).pid
+ except:
+ pass
+ return
  import _posixsubprocess
  passfds = tuple(sorted(map(int, passfds)))
  errpipe_read, errpipe_write = os.pipe()
@@ Expand Down @@

-Original file line number
+Diff line change
@@ Expand Up / @@ -753,7 +753,7 @@ def _syscmd_uname(option, default=''): @@
  return default
  try:
  f = os.popen('uname %s 2> %s' % (option, DEV_NULL))
- except (AttributeError, OSError):
+ except (AttributeError, OSError, ValueError):
  return default
  output = f.read().strip()
  rc = f.close()
@@ Expand All / @@ -771,7 +771,7 @@ def _syscmd_file(target, default=''): @@
  default in case the command should fail.
  """
- if sys.platform in ('dos', 'win32', 'win16'):
+ if sys.platform in ('dos', 'win32', 'win16', 'vxworks'):
  # XXX Others too ?
  return default
  target = _follow_symlinks(target)
@@ Expand Down @@

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

bpo-31904 : Add support for VxWorks RTOS#4184

Uh oh!

Diff view

Diff view

There are no files selected for viewing

naschemeJan 10, 2019

Uh oh!

naschemeJan 10, 2019

Uh oh!

naschemeJan 10, 2019

Uh oh!

naschemeJan 10, 2019

Uh oh!

Uh oh!

-Original file line number
+Diff line change
@@ Expand Up / @@ -28,6 +28,10 @@ @@
 import genericpath
 from genericpath import *
+_vxworks = 'vxworks' in sys.platform
+if _vxworks:
+ import _vxwapi
 __all__ = ["normcase","isabs","join","splitdrive","split","splitext",
  "basename","dirname","commonprefix","getsize","getmtime",
  "getatime","getctime","islink","exists","lexists","isdir","isfile",
@@ Expand DownExpand Up / @@ -65,13 +69,17 @@ def isabs(s): @@
  """Test whether a path is absolute"""
  s = os.fspath(s)
  sep = _get_sep(s)
+ if _vxworks: #VxWorks paths dont always start with / and there is no good
+ # way to find if a path is absolute. V7COR-3074, F7233
+ if not isinstance(s, str):
+ s = s.decode(sys.getdefaultencoding())
+ return bool(_vxwapi.isAbs(s))
  return s.startswith(sep)
 # Join pathnames.
 # Ignore the previous parts if a part is absolute.
 # Insert a '/' unless the first part is empty or already ends in '/'.
 def join(a, *p):
  """Join two or more pathname components, inserting '/' as needed.
  If any component is an absolute path, all previous path components
@@ Expand DownExpand Up / @@ -401,8 +409,18 @@ def _joinrealpath(path, rest, seen): @@
  pardir = '..'
  if isabs(rest):
- rest = rest[1:]
- path = sep
+ if not _vxworks:
+ rest = rest[1:]
+ path = sep
+ else:
+ if rest.startswith(sep):
+ rest = rest[1:]
+ path = sep
+ else:
+ ind = rest.find(':')
+ ind = 0 if ind < 0 else ind
+ path = rest[:ind]
+ rest = rest[ind:]
  while rest:
  name, _, rest = rest.partition(sep)
@@ Expand Down @@

-Original file line number
+Diff line change
@@ Expand Up / @@ -43,6 +43,7 @@ @@
 import sys
 _mswindows = (sys.platform == "win32")
+_vxworks = (sys.platform == "vxworks")
 import io
 import os
@@ Expand DownExpand Up @@
  self.wShowWindow = wShowWindow
  self.lpAttributeList = lpAttributeList or{"handle_list": []}
 else:
- import _posixsubprocess
+ if(_vxworks):
+ import _vxwapi
+ else:
+ import _posixsubprocess
  import select
  import selectors
  import threading
@@ Expand DownExpand Up / @@ -605,9 +609,11 @@ class Popen(object): @@
  preexec_fn: (POSIX only) An object to be called in the child process
  just before the child is executed.
- close_fds: Controls closing or inheriting of file descriptors.
+ close_fds: Controls closing or inheriting of file descriptors.
+ (not supported on VxWorks)
  shell: If true, the command will be executed through the shell.
+ (not supported on VxWorks)
  cwd: Sets the current directory before the child is executed.
@@ Expand DownExpand Up / @@ -636,7 +642,7 @@ class Popen(object): @@
  def __init__(self, args, bufsize=-1, executable=None,
  stdin=None, stdout=None, stderr=None,
- preexec_fn=None, close_fds=True,
+ preexec_fn=None, close_fds=False,
  shell=False, cwd=None, env=None, universal_newlines=None,
  startupinfo=None, creationflags=0,
  restore_signals=True, start_new_session=False,
@@ Expand All / @@ -661,7 +667,23 @@ def __init__(self, args, bufsize=-1, executable=None, @@
  if preexec_fn is not None:
  raise ValueError("preexec_fn is not supported on Windows "
  "platforms")
  else:
+ # VxWorks
+ if _vxworks:
+ if shell:
+ raise ValueError("shell is not supported on VxWorks")
+ if preexec_fn is not None:
+ raise ValueError("Preexecution function is not supported on"
+ "VxWorks");
+ if close_fds:
+ raise ValueError("close_fds is not supported on VxWorks")
+ if start_new_session:
+ raise ValueError("VxWorks does not support sessions");
  # POSIX
  if pass_fds and not close_fds:
  warnings.warn("pass_fds overriding close_fds.", RuntimeWarning)
@@ Expand DownExpand Up / @@ -891,6 +913,9 @@ def communicate(self, input=None, timeout=None): @@
  universal_newlines.
  """
+ if _vxworks:
+ timeout=30
  if self._communication_started and input:
  raise ValueError("Cannot send input after starting communication")
@@ Expand DownExpand Up @@
  restore_signals, start_new_session):
  """Execute program (POSIX version)"""
  if isinstance(args, (str, bytes)):
  args = [args]
  else:
@@ Expand DownExpand Up @@
  for dir in os.get_exec_path(env))
  fds_to_keep = set(pass_fds)
  fds_to_keep.add(errpipe_write)
- self.pid = _posixsubprocess.fork_exec(
+ if(_vxworks):
+ #Hack method to have child spawn with correct FD's
+ #copy parent std fds
+ #set parent stdfd's as desired child fds
+ #spawn child
+ #resture parent stdfds to std values
+ #
+ #!!!Massive caveat in that the child inherits all pipes
+ tmp_stdin = None;
+ tmp_stdout = None;
+ tmp_stderr = None;
+ #save old stdio fds
+ #replace stdiofds with desired child fds
+ if c2pwrite >= 0:
+ tmp_stdout = os.dup(1);
+ os.dup2(c2pwrite, 1);
+ if p2cread >= 0:
+ tmp_stdin = os.dup(0);
+ os.dup2(p2cread, 0);
+ if errwrite >= 0:
+ tmp_stderr = os.dup(2);
+ os.dup2(errwrite, 2);
+ tmp_cwd = None;
+ if cwd:
+ tmp_cwd = os.getcwd()
+ os.chdir(cwd)
+ if env_list is None:
+ env_list = [envKey + "=" + envVal for envKey,envVal in os.environ.copy().items()]
+ else:
+ env_list = [envKey + "=" + envVal for envKey,envVal in env.items()] #Sacrifice efficiency for readability
+ if p2cwrite > 2:
+ env_list.append("closeFD="+str(p2cwrite))
+ self.pid = _vxwapi.rtpSpawn(
+ executable_list[0].decode("UTF-8"),
+ args,env_list, 100,0x1000000,0,0)
+ if tmp_cwd is not None:
+ os.chdir(tmp_cwd)
+ if tmp_stdin is not None:
+ os.dup2(tmp_stdin, 0)
+ os.close(tmp_stdin)
+ if tmp_stdout is not None:
+ os.dup2(tmp_stdout, 1)
+ os.close(tmp_stdout)
+ if tmp_stderr is not None:
+ os.dup2(tmp_stderr, 2)
+ os.close(tmp_stderr)
+ else:
+ self.pid = _posixsubprocess.fork_exec(
  args, executable_list,
  close_fds, tuple(sorted(map(int, fds_to_keep))),
  cwd, env_list,
@@ Expand DownExpand Up @@
  # exception (limited in size)
  errpipe_data = bytearray()
  while True:
+ if _vxworks:
+ break
  part = os.read(errpipe_read, 50000)
  errpipe_data += part
  if not part or len(errpipe_data) > 50000:
@@ Expand DownExpand Up / @@ -1623,7 +1706,6 @@ def _communicate(self, input, endtime, orig_timeout): @@
  stdout = None
  stderr = None
  # Only create this mapping if we haven't already.
  if not self._communication_started:
  self._fileobj2output ={}
@@ Expand All / @@ -1641,7 +1723,6 @@ def _communicate(self, input, endtime, orig_timeout): @@
  if self._input:
  input_view = memoryview(self._input)
  with _PopenSelector() as selector:
  if self.stdin and input:
  selector.register(self.stdin, selectors.EVENT_WRITE)
@@ Expand All / @@ -1653,11 +1734,16 @@ def _communicate(self, input, endtime, orig_timeout): @@
  while selector.get_map():
  timeout = self._remaining_time(endtime)
  if timeout is not None and timeout < 0:
- raise TimeoutExpired(self.args, orig_timeout)
+ if not _vxworks:
+ raise TimeoutExpired(self.args, orig_timeout)
+ else:
+ break;
  ready = selector.select(timeout)
- self._check_timeout(endtime, orig_timeout)
+ #TODO Also a temporary workaround for V7COR-5635
+ if not _vxworks:
+ self._check_timeout(endtime, orig_timeout)
+ else:
+ pass
  # XXX Rewrite these to use non-blocking I/O on the file
  # objects; they are no longer using C stdio!
@@ Expand All / @@ -1678,11 +1764,8 @@ def _communicate(self, input, endtime, orig_timeout): @@
  data = os.read(key.fd, 32768)
  if not data:
  selector.unregister(key.fileobj)
- key.fileobj.close()
  self._fileobj2output[key.fileobj].append(data)
  self.wait(timeout=self._remaining_time(endtime))
  # All data exchanged. Translate lists into strings.
  if stdout is not None:
  stdout = b''.join(stdout)
@@ Expand Down @@

-Original file line number
+Diff line change
@@ Expand Up / @@ -5384,6 +5384,7 @@ def test_gaps(self): @@
  ldt = tz.fromutc(udt.replace(tzinfo=tz))
  self.assertEqual(ldt.fold, 0)
+ @unittest.skipIf('vxworks' in sys.platform, "NOT SUPPORTED ON VXWORKS")
  def test_system_transitions(self):
  if ('Riyadh8' in self.zonename or
  # From tzdata NEWS file:
@@ Expand Down @@

-Original file line number
+Diff line change
@@ Expand Up / @@ -24,6 +24,7 @@ @@
 except ImportError:
  gc = None
+_vxworks = sys.platform == "vxworks"
 # When tests are run from the Python build directory, it is best practice
 # to keep the test files in a subfolder. This eases the cleanup of leftover
@@ Expand DownExpand Up / @@ -422,8 +423,11 @@ def _test_forever(self, tests): @@
  def display_header(self):
  # Print basic platform information
  print("==", platform.python_implementation(), *sys.version.split())
- print("==", platform.platform(aliased=True),
+ if not _vxworks:
+ print("==", platform.platform(aliased=True),
  "%s-endian" % sys.byteorder)
+ else:
+ print("VxWorks 7");
  print("== cwd:", os.getcwd())
  cpu_count = os.cpu_count()
  if cpu_count:
@@ Expand Down @@

-Original file line number
+Diff line change
@@ Expand Up / @@ -211,7 +211,7 @@ def test_empty_line(self): @@
  self.assertEqual(c.contents,
  [b"hello world", b"", b"I'm not dead yet!"])
+ @unittest.skipIf("vxworks" in sys.platform, 'vxworks doesnt inform the server side when the client disconnects')
  def test_close_when_done(self):
  s, event = start_echo_server()
  s.start_resend_event = threading.Event()
@@ Expand Down @@

-Original file line number
+Diff line change
@@ Expand Up / @@ -18,6 +18,8 @@ @@
 TIMEOUT = 3
 HAS_UNIX_SOCKETS = hasattr(socket, 'AF_UNIX')
+if "vxworks" in sys.platform:
+ HAS_UNIX_SOCKETS = False
 class dummysocket:
  def __init__(self):
@@ Expand Down @@

-Original file line number
+Diff line change
@@ Expand Up / @@ -1784,7 +1784,7 @@ def test_baddecorator(self): @@
 class ShutdownTest(unittest.TestCase):
+ @unittest.skipIf(sys.platform == "vxworks", "VxWorks: V7COR-5635 Needs to be fixed before this runs")
  def test_cleanup(self):
  # Issue #19255: builtins are still available at shutdown
  code = """if 1:
@@ Expand Down @@

-Original file line number
+Diff line change
@@ Expand Up / @@ -154,6 +154,8 @@ def test_non_ascii(self): @@
  # arguments as unicode (using wmain() instead of main()).
  @unittest.skipIf(sys.platform == 'win32',
  'Windows has a native unicode API')
+ @unittest.skipIf('vxworks' in sys.platform,
+ "Not supported on VxWorks: main() does not support unicode arguments")
  def test_undecodable_code(self):
  undecodable = b"\xff"
  env = os.environ.copy()
@@ Expand DownExpand Up / @@ -369,6 +371,7 @@ def test_closed_stdout(self): @@
  # Issue #7111: Python should work without standard streams
  @unittest.skipIf(os.name != 'posix', "test needs POSIX semantics")
+ @unittest.skipIf('vxworks' in sys.platform, "Not supported on VxWorks: No preexec fn")
  def _test_no_stdio(self, streams):
  code = """if 1:
  import os, sys
@@ Expand Down @@

Uh oh!

bpo-31904 : Add support for VxWorks RTOS#4184

Uh oh!

bpo-31904 : Add support for VxWorks RTOS #4184

Uh oh!

Uh oh!

Diff view

Diff view

There are no files selected for viewing

naschemeJan 10, 2019

Choose a reason for hiding this comment

Uh oh!

naschemeJan 10, 2019

Choose a reason for hiding this comment

Uh oh!

naschemeJan 10, 2019

Choose a reason for hiding this comment

Uh oh!

naschemeJan 10, 2019

Choose a reason for hiding this comment

Uh oh!

Uh oh!