Skip to content

Clean handling of an unexpected errno zero case #1284

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

Open
cbm755 wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Clean handling of an unexpected errno zero case #1284

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
62ce9d4
handle the impossible (?) errno zero case in the same block
cbm755 Jan 5, 2024
7604e5f
Just let the catch-all handle the errno zero case
cbm755 Jan 6, 2024
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
30 changes: 5 additions & 25 deletions inst/private/readblock.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,19 +60,19 @@
done = true;
end

elseif (errno() == EAGAIN || errno() == EINVAL)
elseif (errno () == EAGAIN || errno () == EINVAL)
% with these coefficients, we check about 90 times before the display
% starts at 8 seconds; at that time the waitdelta is approx 1 second.
% We cap the waiting at 1 second (Issue #1255).
waitdelta = min(1, exp(nwaits/10)/1e4);
waitdelta = min (1, exp (nwaits/10)/1e4);
if (time() - start <= wait_disp_thres)
% no-op
elseif (~dispw)
fprintf(stdout, 'Waiting...')
fprintf (stdout, 'Waiting...')
dispw = true;
else
if nwaits - skip >= lastdot
fprintf(stdout, '.')
fprintf (stdout, '.')
lastdot = nwaits;
% Don't draw every second; increase the number of seconds to skip
skip = skip + 1;
Expand All @@ -84,30 +84,10 @@
%end
pause (waitdelta);
nwaits = nwaits + 1;
elseif (errno() == 0)
waitdelta = min(1, exp(nwaits/10)/1e4);
if (time() - start <= wait_disp_thres)
% no-op
elseif (~dispw)
fprintf(stdout, '[usually something wrong if you see stars] Waiting***')
dispw = true;
else
if nwaits - skip >= lastdot
fprintf(stdout, '*')
lastdot = nwaits;
skip = skip + 1;
end
end
fclear (fout);
%if (ispc () && (~isunix ()))
%errno (0); % maybe can do this on win32?
%end
pause (waitdelta);
nwaits = nwaits + 1;
else
warning ('OctSymPy:readblock:invaliderrno', ...
sprintf('readblock: s=%d, errno=%d, perhaps error in the command?', s, errno()))
pause(0.1) % FIXME; replace with waitdelta etc
pause (1)
end
%disp('paused'); pause

Expand Down