mirrors/scst
1
0
Fork 0
mirror of https://github.com/SCST-project/scst.git synced 2026-05-18 19:21:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

scstadmin: Handle -EAGAIN when reading from sysfs (merge r4498 from trunk)

Browse Source 
git-svn-id: http://svn.code.sf.net/p/scst/svn/branches/2.2.x@4587 d57e44dd-8a1f-0410-8b47-8ef2f437770f
This commit is contained in:
Bart Van Assche
2012-11-03 14:37:21 +00:00
parent c758bd4ebd
commit e562179bab
1 changed files with 20 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
scstadmin/scstadmin.sysfs/scst-0.9.10/lib/SCST/SCST.pm
View File

@@ -2614,10 +2614,10 @@ sub deviceAttributes {
return undef;
}
my $value = <$io>;
my ($value, $is_key) = split("\n", _sysread($io) , 2);
chomp $value;
my $is_key = <$io>;
$is_key = new_sysfs_interface() &&
(!$is_static || defined($$dca{$attribute}))
|| ($is_key =~ /\[key\]/) ? TRUE : FALSE;
@@ -4842,6 +4842,24 @@ sub errorString {
return $string;
}
# Read from the SCST sysfs file $1. Return either the data read or undef if
# reading failed.
sub _sysread {
my $io = shift;
my $deadline = time() + $TIMEOUT;
my $result;
while (time() < $deadline) {
my $bytes = sysread($io, $result, 4096);
last if (defined($bytes) || $! != EAGAIN);
sleep 1;
}
return $result;
}
# Write the first $3 bytes of $2 into the SCST sysfs file $1. Return either
# the number of bytes written or undef if writing failed.
sub _syswrite {
my $io = shift;
my $cmd = shift;