X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=chiark-utils.git;a=blobdiff_plain;f=fishdescriptor%2Fpy%2Ffishdescriptor%2Findonor.py;h=e227fb24b53a7a538ae6827a662f6ce9e7cbb0a2;hp=f01f9eb0c6e910de98ee65c8c654de3f8d091325;hb=7adf096856bc7ae9735f570b25c2d20d9edde588;hpb=9103059a4f81085859c56f5508f9d76022041869

diff --git a/fishdescriptor/py/fishdescriptor/indonor.py b/fishdescriptor/py/fishdescriptor/indonor.py
index f01f9eb..e227fb2 100644
--- a/fishdescriptor/py/fishdescriptor/indonor.py
+++ b/fishdescriptor/py/fishdescriptor/indonor.py
@@ -1,6 +1,27 @@
 
+# This file is part of chiark-utils, a collection of useful programs
+# used on chiark.greenend.org.uk.
+#
+# This file is:
+#  Copyright 2018 Citrix Systems Ltd
+#
+# This is free software; you can redistribute it and/or modify it under the
+# terms of the GNU General Public License as published by the Free Software
+# Foundation; either version 3, or (at your option) any later version.
+#
+# This is distributed in the hope that it will be useful, but WITHOUT ANY
+# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+# details.
+#
+# You should have received a copy of the GNU General Public License along
+# with this program; if not, consult the Free Software Foundation's
+# website at www.fsf.org, or the GNU Project website at www.gnu.org.
+
 # class for use inside gdb which is debugging the donor process
 
+from __future__ import print_function
+
 import gdb
 import copy
 import os
@@ -82,6 +103,7 @@ class DonorImplementation():
         di._structs = { }
         di._saved_errno = None
         di._result_stream = os.fdopen(3, 'w')
+        di._errno_workaround = None
 
     # assembling structs
     # sigh, we have to record the order of the arguments!
@@ -97,6 +119,31 @@ class DonorImplementation():
         fields = di._find_fields(typename)
         return fields.substitute(values)
 
+    # hideous workaround
+
+    def _parse_eval_errno(di, expr_pat):
+        # evaluates  expr_pat % 'errno'
+        if di._errno_workaround is not True:
+            try:
+                x = parse_eval(expr_pat % 'errno')
+                di._errno_workaround = False
+                return x
+            except gdb.error as e:
+                if di._errno_workaround is False:
+                    raise e
+            di._errno_workaround = True
+        # Incomprehensibly, gdb.parse_and_eval('errno') can sometimes
+        # fail with
+        #   gdb.error: Cannot find thread-local variables on this target
+        # even though plain gdb `print errno' works while `print errno = 25'
+        # doesn't.   OMG.  This may be related to:
+        #  https://github.com/cloudburst/libheap/issues/24
+        # although I can't find it in the gdb bug db (which is half-broken
+        # in my browser).  Also the error is very nonspecific :-/.
+        # This seems to happen on jessie, and is fixed in stretch.
+        # Anyway:
+        return parse_eval(expr_pat % '(*((int*(*)(void))__errno_location)())')
+
     # calling functions (need to cast the function name to the right
     # type in case maybe gdb doesn't know the type)
 
@@ -107,7 +154,7 @@ class DonorImplementation():
     def _must_func(di, functype, funcname, realargs):
         retval = di._func(functype, funcname, realargs)
         if retval < 0:
-            errnoval = parse_eval('errno')
+            errnoval = di._parse_eval_errno('%s')
             raise RuntimeError("%s gave errno=%d `%s'" %
                                (funcname, errnoval, os.strerror(errnoval)))
         return retval
@@ -164,7 +211,7 @@ class DonorImplementation():
             '("%s", %d)' % (_string_escape_for_c(path), mode)
         )
         if r < 0:
-            errnoval = parse_eval('errno')
+            errnoval = di._parse_eval_errno('%s')
             if errnoval != os.errno.EEXIST:
                 raise RuntimeError("mkdir %s failed: `%s'" %
                                    (repr(path), os.strerror(errnoval)))
@@ -172,13 +219,13 @@ class DonorImplementation():
         return 1
 
     def _errno_save(di):
-        di._saved_errno = parse_eval('errno')
+        di._saved_errno = di._parse_eval_errno('%s')
 
     def _errno_restore(di):
         to_restore = di._saved_errno
         di._saved_errno = None
         if to_restore is not None:
-            parse_eval('errno = %d' % to_restore)
+            di._parse_eval_errno('%%s = %d' % to_restore)
 
     def _result(di, output):
         sys.stderr.write("#> %s" % output)
@@ -234,6 +281,9 @@ class DonorImplementation():
         return input
 
     def eval_loop(di):
+        if not gdb.selected_inferior().was_attached:
+            print('gdb inferior not attached', file=sys.stderr)
+            sys.exit(0)
         while True:
             di._result('!\n')
             cmd = di._protocol_read()