Improved file I/O in case of EINTR

This commit is contained in:
Klaus Schmidinger 2002-03-22 15:18:58 +01:00
parent 70db7f17bc
commit 0be1a13c60
2 changed files with 18 additions and 9 deletions

View File

@ -1125,3 +1125,5 @@ Video Disk Recorder Revision History
- Fixed restoring CICAM setup values for a fourth DVB card. - Fixed restoring CICAM setup values for a fourth DVB card.
- Completed internationalization of OSD texts (thanks to Hannu Savolainen, - Completed internationalization of OSD texts (thanks to Hannu Savolainen,
Arnold Niessen, Paulo Lopes). Arnold Niessen, Paulo Lopes).
- Improved file I/O in case of EINTR, which may occur e.g. with heavy system
load (thanks to Werner Fink).

25
tools.c
View File

@ -4,7 +4,7 @@
* See the main source file 'vdr.c' for copyright information and * See the main source file 'vdr.c' for copyright information and
* how to reach the author. * how to reach the author.
* *
* $Id: tools.c 1.59 2002/02/17 12:57:23 kls Exp $ * $Id: tools.c 1.60 2002/03/22 15:18:58 kls Exp $
*/ */
#include "tools.h" #include "tools.h"
@ -33,14 +33,21 @@ ssize_t safe_read(int filedes, void *buffer, size_t size)
ssize_t safe_write(int filedes, const void *buffer, size_t size) ssize_t safe_write(int filedes, const void *buffer, size_t size)
{ {
for (;;) { ssize_t p = -1;
ssize_t p = write(filedes, buffer, size); const unsigned char *ptr = (const unsigned char *)buffer;
if (p < 0 && errno == EINTR) { while (size > 0) {
dsyslog(LOG_INFO, "EINTR while writing to file handle %d - retrying", filedes); p = write(filedes, ptr, size);
continue; if (p < 0) {
} if (errno == EINTR) {
return p; dsyslog(LOG_INFO, "EINTR while writing to file handle %d - retrying", filedes);
} continue;
}
break;
}
ptr += p;
size -= p;
}
return p;
} }
void writechar(int filedes, char c) void writechar(int filedes, char c)