FazBrowse GitHub Viewer | Trending |
URL:
| Home
Tools: [Download Repo ZIP]   [Original HTTPS Page]

gh-105331: Fix asyncio.sleep() bug by weijay0804 · Pull Request #105513 · python/cpython · GitHub

Repository navigation

Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension .py  (1) .rst  (1) All 2 file types selected
Viewed files
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Unified
Split
Hide whitespace
Diff view
Unified
Split
Hide whitespace
27 changes: 26 additions & 1 deletion Lib/asyncio/tasks.py
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Original file line number Diff line number Diff line change
Expand Up @@ -640,9 +640,34 @@ def __sleep0():
yield


def _check_delay(delay):
"""Check if the value of 'delay' is valid."""

import sys
import math

SEC_TO_NS = 1000 * 1000 * 1000

if not isinstance(delay, (int, float)):
raise TypeError(f"{type(delay)} object cannot be interpreted as an integer")

# According to Modules/timemodule.c
if (delay > sys.maxsize / SEC_TO_NS):

Eclips4 Jun 8, 2023 •
edited
Loading

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Choose a reason Spam Abuse Off Topic Outdated Duplicate Resolved Low Quality

It is incorrect because of 32-bit platform (and that's why asyncio test failing on Windows 32-bit).
sys.maxsize on 32-bit platform equal to 2 ** 31 -1.
So, in that case sys.maxsize / SEC_TO_NS is equal to 2.147483647

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

Choose a reason Spam Abuse Off Topic Outdated Duplicate Resolved Low Quality

Oh!
I forgot about this matter.
In timemodule.c, INT64_MAX is used and is not subject to the limitation of 32-bit.
If I write it as INT64_MAX = 2**64 - 1, how would it be?

if (delay > INT64_MAX / SEC_TO_NS)

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Choose a reason Spam Abuse Off Topic Outdated Duplicate Resolved Low Quality

Oh! I forgot about this matter. In timemodule.c, INT64_MAX is used and is not subject to the limitation of 32-bit. If I write it as INT64_MAX = 2**64 - 1, how would it be?

if (delay > INT64_MAX / SEC_TO_NS)

I think it's correct solution, but I'm not expert in this area. Let's wait for other opinions

raise OverflowError("timestamp too large to convert to C _PyTime_t")

if (delay < 0):
raise ValueError("sleep length must be non-negative")

if (math.isnan(delay)):

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Choose a reason Spam Abuse Off Topic Outdated Duplicate Resolved Low Quality

Also, seems there need to add check that delay is finite number. Use something like if not math.isfinite(delay): ... for resolve that.

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

Choose a reason Spam Abuse Off Topic Outdated Duplicate Resolved Low Quality

This appears to be more accurate.

Thank you!

raise ValueError("Invalid value NaN (not a number)")


async def sleep(delay, result=None):
"""Coroutine that completes after a given time (in seconds)."""
if delay <= 0:

_check_delay(delay)

if delay == 0:
await __sleep0()
return result

Expand Down
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
fix asyncio.sleep(float('nan')) does not raise ValueError bug

Back | FazBrowse Home | New Git URL