Skip to content

bpo-33608: Fix the Py_atomic_* macros.#12240

Merged
ericsnowcurrently merged 1 commit intopython:masterfrom
ericsnowcurrently:fix-pyatomic-macros
Mar 8, 2019
Merged

bpo-33608: Fix the Py_atomic_* macros.#12240
ericsnowcurrently merged 1 commit intopython:masterfrom
ericsnowcurrently:fix-pyatomic-macros

Conversation

@ericsnowcurrently
Copy link
Member

@ericsnowcurrently ericsnowcurrently commented Mar 8, 2019 •
edited by bedevere-bot
Loading

The macros currently work because our usage happens to parse correctly. I ran into the problem while working on a PR (for bpo-33608) that involves a pointer indirection.

Note that this was part of a PR (gh-12062) that already landed and had to be reverted. This is the part that was unrelated to the need to revert.

https://bugs.python.org/issue33608

@ericsnowcurrently ericsnowcurrently merged commit 2aab5d3 into python:master Mar 8, 2019
@bedevere-bot
Copy link

bedevere-bot commented Mar 8, 2019

@ericsnowcurrently: Please replace # with GH- in the commit message next time. Thanks!

@ericsnowcurrently ericsnowcurrently deleted the fix-pyatomic-macros branch March 8, 2019 19:07
@bedevere-bot
Copy link

bedevere-bot commented Mar 8, 2019

⚠️⚠️⚠️ Buildbot failure ⚠️⚠️⚠️

Hi! The buildbot x86 Gentoo Non-Debug with X 3.x has failed when building commit 2aab5d3.

What do you need to do:

  1. Don't panic.
  2. Check the buildbot page in the devguide if you don't know what the buildbots are or how they work.
  3. Go to the page of the buildbot that failed (https://buildbot.python.org/all/#builders/99/builds/2269) and take a look at the build logs.
  4. Check if the failure is related to this commit (2aab5d3) or if it is a false positive.
  5. If the failure is related to this commit, please, reflect that on the issue and make a new Pull Request with a fix.

You can take a look at the buildbot page here:

https://buildbot.python.org/all/#builders/99/builds/2269

Click to see traceback logs 
Traceback (most recent call last):
  File "/buildbot/buildarea/cpython/3.x.ware-gentoo-x86.nondebug/build/Lib/test/test_nntplib.py", line 242, in wrapped
    meth(self)
  File "/buildbot/buildarea/cpython/3.x.ware-gentoo-x86.nondebug/build/Lib/test/test_nntplib.py", line 269, in test_with_statement
    with self.NNTP_CLASS(self.NNTP_HOST, timeout=TIMEOUT, usenetrc=False) as server:
  File "/buildbot/buildarea/cpython/3.x.ware-gentoo-x86.nondebug/build/Lib/nntplib.py", line 1077, in __init__
    self.sock = _encrypt_on(self.sock, ssl_context, host)
  File "/buildbot/buildarea/cpython/3.x.ware-gentoo-x86.nondebug/build/Lib/nntplib.py", line 292, in _encrypt_on
    return context.wrap_socket(sock, server_hostname=hostname)
  File "/buildbot/buildarea/cpython/3.x.ware-gentoo-x86.nondebug/build/Lib/ssl.py", line 405, in wrap_socket
    return self.sslsocket_class._create(
  File "/buildbot/buildarea/cpython/3.x.ware-gentoo-x86.nondebug/build/Lib/ssl.py", line 853, in _create
    self.do_handshake()
  File "/buildbot/buildarea/cpython/3.x.ware-gentoo-x86.nondebug/build/Lib/ssl.py", line 1117, in do_handshake
    self._sslobj.do_handshake()
ssl.SSLEOFError: EOF occurred in violation of protocol (_ssl.c:1055)

----------------------------------------------------------------------

Ran 106 tests in 248.592s

FAILED (errors=1, skipped=4)


Traceback (most recent call last):
  File "/buildbot/buildarea/cpython/3.x.ware-gentoo-x86.nondebug/build/Lib/test/test_nntplib.py", line 242, in wrapped
    meth(self)
  File "/buildbot/buildarea/cpython/3.x.ware-gentoo-x86.nondebug/build/Lib/test/test_nntplib.py", line 269, in test_with_statement
    with self.NNTP_CLASS(self.NNTP_HOST, timeout=TIMEOUT, usenetrc=False) as server:
  File "/buildbot/buildarea/cpython/3.x.ware-gentoo-x86.nondebug/build/Lib/nntplib.py", line 1047, in __init__
    _NNTPBase.__init__(self, file, host,
  File "/buildbot/buildarea/cpython/3.x.ware-gentoo-x86.nondebug/build/Lib/nntplib.py", line 334, in __init__
    self.getcapabilities()
  File "/buildbot/buildarea/cpython/3.x.ware-gentoo-x86.nondebug/build/Lib/nntplib.py", line 390, in getcapabilities
    resp, caps = self.capabilities()
  File "/buildbot/buildarea/cpython/3.x.ware-gentoo-x86.nondebug/build/Lib/nntplib.py", line 558, in capabilities
    resp, lines = self._longcmdstring("CAPABILITIES")
  File "/buildbot/buildarea/cpython/3.x.ware-gentoo-x86.nondebug/build/Lib/nntplib.py", line 525, in _longcmdstring
    resp, list = self._getlongresp(file)
  File "/buildbot/buildarea/cpython/3.x.ware-gentoo-x86.nondebug/build/Lib/nntplib.py", line 476, in _getlongresp
    resp = self._getresp()
  File "/buildbot/buildarea/cpython/3.x.ware-gentoo-x86.nondebug/build/Lib/nntplib.py", line 449, in _getresp
    resp = self._getline()
  File "/buildbot/buildarea/cpython/3.x.ware-gentoo-x86.nondebug/build/Lib/nntplib.py", line 437, in _getline
    if not line: raise EOFError
EOFError

----------------------------------------------------------------------

Ran 106 tests in 349.352s

FAILED (errors=1, skipped=5)

@ericsnowcurrently
Copy link
Member Author

ericsnowcurrently commented Mar 8, 2019

I'm pretty sure this isn't due to this commit.

paulmon
paulmon reviewed Mar 20, 2019
View reviewed changes
Include/internal/pycore_atomic.h
switch (ORDER) { \
case _Py_memory_order_acquire: \
_InterlockedExchange_acq((volatile long*)ATOMIC_VAL, (int)NEW_VAL); \
_InterlockedExchange_acq((volatile long*)&((ATOMIC_VAL)->_value), (int)NEW_VAL); \
Copy link
Contributor

@paulmon paulmon Mar 20, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This ends up evaluating to _InterlockedExchange_acq((volatile long*)&((&((&_PyRuntime.ceval.gil.last_holder)->_value))->_value) causing a build error for _M_ARM

@paulmon paulmon mentioned this pull request Apr 12, 2019
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

1 more reviewer

@paulmon paulmon paulmon left review comments

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

skip news

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@ericsnowcurrently @bedevere-bot @paulmon @the-knights-who-say-ni