Mercurial > public > ostc4
annotate ostc4pack/OSTC4pack_V4.exe @ 240:625d20070261 div-fixes-5
Improvement SPI stability/recoverability
The core part of this commit comes from careful code reading. The core is the
swap of Scheduler_Request_sync_with_SPI(SPI_SYNC_METHOD_SOFT) and
SPI_Start_single_TxRx_with_Master(). This code is sitting in an if-clause
that is triggered on SPI comms failure. Instead of blindly trying to
communicate again (which will very likely fail again), first try to reset
the comms link, and then try to communicate again. That simply makes
more sense in this case.
This is heavily tested, on 2 simple dives, and 5 very long deco schedules
from the simulator (10+ hour deco's), and a lot of small simulated dives
(upto 2h runtime). Of all these tests, only one long session failed after
9 out of 11h runtime. Analyzing that one failure, suggests that the
RTE is looping in some error handler, which (obviously) results in
a SPI comms failure as a result. I consider this not part of this change.
Additionally, some more cleanup is done in this code.
Signed-off-by: Jan Mulder <jlmulder@xs4all.nl>
--> -->
| <type 'exceptions.AttributeError'> | Python 2.7.17: /usr/bin/python Mon Nov 4 18:31:03 2024 |
A problem occurred in a Python script. Here is the sequence of function calls leading up to the error, in the order they occurred.
| /var/www/vhosts/heinrichsweikamp.com/code/hgweb-public.cgi in <module>() |
| 15 |
| 16 from mercurial import demandimport; demandimport.enable() |
| 17 from mercurial.hgweb import hgweb, wsgicgi |
| 18 application = hgweb(config) |
| => 19 wsgicgi.launch(application) |
| wsgicgi = <module 'mercurial.hgweb.wsgicgi' from '/usr/lib...on2.7/dist-packages/mercurial/hgweb/wsgicgi.pyc'>, wsgicgi.launch = <function launch>, application = <mercurial.hgweb.hgwebdir_mod.hgwebdir object> |
| /usr/lib/python2.7/dist-packages/mercurial/hgweb/wsgicgi.py in launch(application=<mercurial.hgweb.hgwebdir_mod.hgwebdir object>) |
| 83 content = application(environ, start_response) |
| 84 try: |
| => 85 for chunk in content: |
| 86 write(chunk) |
| 87 if not headers_sent: |
| chunk = 'rev/625d20070261">changeset</a></li>\n<li><a href...ned-off-by: Jan Mulder <jlmulder@xs4all.nl>', content = <generator object run_wsgi> |
| /usr/lib/python2.7/dist-packages/mercurial/hgweb/hgwebdir_mod.py in run_wsgi(self=<mercurial.hgweb.hgwebdir_mod.hgwebdir object>, req=<mercurial.hgweb.request.wsgirequest object>) |
| 227 with profiling.profile(self.ui, enabled=profile): |
| 228 try: |
| => 229 for r in self._runwsgi(req): |
| 230 yield r |
| 231 finally: |
| r = 'rev/625d20070261">changeset</a></li>\n<li><a href...ned-off-by: Jan Mulder <jlmulder@xs4all.nl>', self = <mercurial.hgweb.hgwebdir_mod.hgwebdir object>, self._runwsgi = <bound method hgwebdir._runwsgi of <mercurial.hgweb.hgwebdir_mod.hgwebdir object>>, req = <mercurial.hgweb.request.wsgirequest object> |
| /usr/lib/python2.7/dist-packages/mercurial/hgweb/hgweb_mod.py in run_wsgi(self=<mercurial.hgweb.hgweb_mod.hgweb object>, req=<mercurial.hgweb.request.wsgirequest object>) |
| 316 profile = repo.ui.configbool('profiling', 'enabled') |
| 317 with profiling.profile(repo.ui, enabled=profile): |
| => 318 for r in self._runwsgi(req, repo): |
| 319 yield r |
| 320 |
| r = 'rev/625d20070261">changeset</a></li>\n<li><a href...ned-off-by: Jan Mulder <jlmulder@xs4all.nl>', self = <mercurial.hgweb.hgweb_mod.hgweb object>, self._runwsgi = <bound method hgweb._runwsgi of <mercurial.hgweb.hgweb_mod.hgweb object>>, req = <mercurial.hgweb.request.wsgirequest object>, repo = <filteredrepo:served <mercurial.localrepo.localrepository object>> |
| /usr/lib/python2.7/dist-packages/mercurial/util.py in increasingchunks(source=<generator object _flatten>, min=4096, max=65536) |
| 1015 buf = [] |
| 1016 blen = 0 |
| => 1017 for chunk in source: |
| 1018 buf.append(chunk) |
| 1019 blen += len(chunk) |
| chunk = '">\n ', source = <generator object _flatten> |
| /usr/lib/python2.7/dist-packages/mercurial/templater.py in _flatten(thing=<generator object runtemplate>) |
| 1279 yield pycompat.bytestr(i) |
| 1280 else: |
| => 1281 for j in _flatten(i): |
| 1282 yield j |
| 1283 |
| j = '">\n<span>Ignore whitespace changes - </span>\n<sp..."ignorewseol-checkbox" type="checkbox" />\n</form>', global _flatten = <function _flatten>, i = <generator object runmap> |
| /usr/lib/python2.7/dist-packages/mercurial/templater.py in _flatten(thing=<generator object runmap>) |
| 1270 yield pycompat.bytestr(thing) |
| 1271 else: |
| => 1272 for i in thing: |
| 1273 i = templatekw.unwraphybrid(i) |
| 1274 if isinstance(i, bytes): |
| i undefined, thing = <generator object runmap> |
| /usr/lib/python2.7/dist-packages/mercurial/templater.py in runmap(context=<mercurial.templater.engine object>, mapping={'annotate': <function annotate>, 'author': 'Jan Mulder <jlmulder@xs4all.nl>', 'bookmarks': [], 'branch': [{'name': 'div-fixes-5'}], 'branches': [], 'child': <function <lambda>>, 'date': (1554716953.0, -7200), 'desc': 'Improvement SPI stability/recoverability\n\nThe co....\n\nSigned-off-by: Jan Mulder <jlmulder@xs4all.nl>', 'diffopts': {'context': 3, 'git': False, 'ignoreblanklines': False, 'ignorews': False, 'ignorewsamount': False, 'ignorewseol': False, 'index': 0, 'nobinary': False, 'nodates': False, 'noprefix': False, ...}, 'extra': {'branch': 'div-fixes-5', 'histedit_source': 'd6c18750170e992422e53f7ba8e347cfd713f6cc'}, ...}, data=((<function runsymbol>, 'annotate'), (<function runtemplate>, [(<function runstring>, '\n<tr id="'), (<function runsymbol>, 'lineid'), (<function runstring>, '"'), (<function ifeq>, [(<function runsymbol>, 'node'), (<function runsymbol>, 'originalnode'), (<function runstring>, ' class="thisrev"')]), (<function runstring>, '>\n<td class="annotate parity'), (<function runsymbol>, 'blockparity'), (<function runstring>, '">\n'), (<function if_>, [(<function runsymbol>, 'blockhead'), (<function runtemplate>, [...])]), (<function runstring>, '\n<div class="annotate-info">\n<div>\n<a href="'), (<function runfilter>, ((<function runsymbol>, 'url'), <function urlescape>)), (<function runstring>, 'annotate/'), (<function runfilter>, ((<function runsymbol>, 'node'), <function short>)), (<function runstring>, '/'), (<function runfilter>, ((<function runsymbol>, 'file'), <function urlescape>)), (<function runmap>, ((<function runsymbol>, 'sessionvars'), (<function runtemplate>, [...]))), (<function runstring>, '#l'), (<function runsymbol>, 'targetline'), (<function runstring>, '">\n'), (<function runfilter>, ((<function runsymbol>, 'node'), <function short>)), (<function runstring>, '</a>\n'), ...]))) |
| 460 raise error.ParseError(_("%r is not iterable") % d) |
| 461 |
| => 462 for i, v in enumerate(diter): |
| 463 lm = mapping.copy() |
| 464 lm['index'] = i |
| i undefined, v undefined, builtin enumerate = <type 'enumerate'>, diter = <generator object annotate> |
| /usr/lib/python2.7/dist-packages/mercurial/hgweb/webcommands.py in annotate(**map={'annotate': <function annotate>, 'author': 'Jan Mulder <jlmulder@xs4all.nl>', 'bookmarks': [], 'branch': [{'name': 'div-fixes-5'}], 'branches': [], 'child': <function <lambda>>, 'date': (1554716953.0, -7200), 'desc': 'Improvement SPI stability/recoverability\n\nThe co....\n\nSigned-off-by: Jan Mulder <jlmulder@xs4all.nl>', 'diffopts': {'context': 3, 'git': False, 'ignoreblanklines': False, 'ignorews': False, 'ignorewsamount': False, 'ignorewseol': False, 'index': 0, 'nobinary': False, 'nodates': False, 'noprefix': False, ...}, 'extra': {'branch': 'div-fixes-5', 'histedit_source': 'd6c18750170e992422e53f7ba8e347cfd713f6cc'}, ...}) |
| 907 blockparitygen = paritygen(1) |
| 908 for lineno, (aline, l) in enumerate(lines): |
| => 909 f = aline.fctx |
| 910 rev = f.rev() |
| 911 if rev != previousrev: |
| f undefined, aline = (<filectx ostc4pack/OSTC4pack_V4.exe@1e707b34667e>, 1), aline.fctx undefined |
<type 'exceptions.AttributeError'>: 'tuple' object has no attribute 'fctx'
args =
("'tuple' object has no attribute 'fctx'",)
message =
"'tuple' object has no attribute 'fctx'"