Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Normalization of H5_nanosleep() with VFD SWMR branch #746

Merged
merged 2 commits into from
Jun 11, 2021
Merged

Normalization of H5_nanosleep() with VFD SWMR branch #746

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
eecf379
Normalization of H5_nanosleep() with VFD SWMR branch
derobins Jun 11, 2021
b8555ae
Committing clang-format changes
github-actions[bot] Jun 11, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 29 additions & 13 deletions src/H5system.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -967,10 +967,7 @@ H5_combine_path(const char *path1, const char *path2, char **full_name /*out*/)
* Note that commodity hardware is probably going to have a
* resolution of milliseconds, not nanoseconds.
*
* Return: SUCCEED/FAIL
*
* Programmer: Quincey Koziol
* October 01, 2016
* Return: void
*--------------------------------------------------------------------------
*/
void
Expand All @@ -979,21 +976,40 @@ H5_nanosleep(uint64_t nanosec)
FUNC_ENTER_NOAPI_NOINIT_NOERR

#ifdef H5_HAVE_WIN32_API
DWORD dwMilliseconds = (DWORD)HDceil(nanosec / 1.0e6);
DWORD ignore;

/* On Windows, Sleep() is in milliseconds. Passing 0 to Sleep()
* causes the thread to relinquish the rest of its time slice.
/* Windows can't sleep at a ns resolution. Best we can do is ~1 ms. We
* don't care about the return value since the second parameter
* (bAlertable) is FALSE, so it will always be zero.
*/
Sleep(nanosec / (1000 * 1000));
ignore = SleepEx(dwMilliseconds, FALSE);

#else
{
struct timespec sleeptime; /* Struct to hold time to sleep */

/* Set up time to sleep */
sleeptime.tv_sec = 0;
sleeptime.tv_nsec = (long)nanosec;
const uint64_t nanosec_per_sec = 1000 * 1000 * 1000;
struct timespec sleeptime; /* Struct to hold time to sleep */

HDnanosleep(&sleeptime, NULL);
/* Set up time to sleep
*
* Assuming ILP32 or LP64 or wider architecture, (long)operand
* satisfies 0 <= operand < nanosec_per_sec < LONG_MAX.
*
* It's harder to be sure that we don't overflow time_t.
*/
sleeptime.tv_sec = (time_t)(nanosec / nanosec_per_sec);
sleeptime.tv_nsec = (long)(nanosec % nanosec_per_sec);

/* Sleep for up to `sleeptime` and, in the event of an interruption,
* save the unslept time back to `sleeptime`.
*/
while (HDnanosleep(&sleeptime, &sleeptime) == -1) {
/* If we were just interrupted, sleep for the remaining time.
* Otherwise, the error was essentially impossible, so just stop
* sleeping.
*/
if (errno != EINTR)
break;
}
#endif

Expand Down
1 change: 0 additions & 1 deletion src/H5win32defs.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,6 @@ typedef __int64 h5_stat_size_t;
#define HDlseek(F, O, W) _lseeki64(F, O, W)
#define HDlstat(S, B) _lstati64(S, B)
#define HDmkdir(S, M) _mkdir(S)
#define HDnanosleep(N, O) Wnanosleep(N, O)
#define HDoff_t __int64

/* Note that the variadic HDopen macro is using a VC++ extension
Expand Down