* file.c (rb_thread_flock): wrap the flock system call by

akr · akr · commit 5b2eef31aa2f · 2005-09-18T18:22:44.000Z
TRAP_BEG/TRAP_END to enable signals.  [ruby-dev:27122]

* ext/socket/socket.c (bsock_send): wrap the sendto and send system
  call by TRAP_BEG/TRAP_END to enable signals when writing to a socket
  which is full.  [ruby-dev:27132]

* io.c (rb_io_syswrite): wrap the write system call by
  TRAP_BEG/TRAP_END to enable signals when writing to a pipe which is
  full.  [ruby-dev:27134]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@9211 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,16 @@
+Mon Sep 19 03:17:48 2005  Tanaka Akira  <akr@m17n.org>
+
+	* file.c (rb_thread_flock): wrap the flock system call by
+	  TRAP_BEG/TRAP_END to enable signals.  [ruby-dev:27122]
+
+	* ext/socket/socket.c (bsock_send): wrap the sendto and send system
+	  call by TRAP_BEG/TRAP_END to enable signals when writing to a socket
+	  which is full.  [ruby-dev:27132]
+
+	* io.c (rb_io_syswrite): wrap the write system call by
+	  TRAP_BEG/TRAP_END to enable signals when writing to a pipe which is
+	  full.  [ruby-dev:27134]
+
 Mon Sep 19 03:02:08 2005  Tanaka Akira  <akr@m17n.org>
 
 	* io.c (io_fwrite): wrap the write system call by TRAP_BEG/TRAP_END to
diff --git a/ext/socket/socket.c b/ext/socket/socket.c
@@ -499,11 +499,15 @@ bsock_send(argc, argv, sock)
     rb_thread_fd_writable(fd);
   retry:
     if (!NIL_P(to)) {
+        TRAP_BEG;
 	n = sendto(fd, RSTRING(mesg)->ptr, RSTRING(mesg)->len, NUM2INT(flags),
 		   (struct sockaddr*)RSTRING(to)->ptr, RSTRING(to)->len);
+        TRAP_END;
     }
     else {
+        TRAP_BEG;
 	n = send(fd, RSTRING(mesg)->ptr, RSTRING(mesg)->len, NUM2INT(flags));
+        TRAP_END;
     }
     if (n < 0) {
 	if (rb_io_wait_writable(fd)) {
diff --git a/file.c b/file.c
@@ -2915,7 +2915,11 @@ rb_thread_flock(fd, op, fptr)
     OpenFile *fptr;
 {
     if (rb_thread_alone() || (op & LOCK_NB)) {
-	return flock(fd, op);
+        int ret;
+        TRAP_BEG;
+	ret = flock(fd, op);
+        TRAP_END;
+	return ret;
     }
     op |= LOCK_NB;
     while (flock(fd, op) < 0) {
diff --git a/io.c b/io.c
@@ -2331,7 +2331,9 @@ rb_io_syswrite(io, str)
     if (!rb_thread_fd_writable(fileno(f))) {
         rb_io_check_closed(fptr);
     }
+    TRAP_BEG;
     n = write(fileno(f), RSTRING(str)->ptr, RSTRING(str)->len);
+    TRAP_END;
 
     if (n == -1) rb_sys_fail(fptr->path);
 

Original file line number	Diff line number	Diff line change
`@@ -2915,7 +2915,11 @@ rb_thread_flock(fd, op, fptr)`
`2915`	`2915`	`OpenFile *fptr;`
`2916`	`2916`	`{`
`2917`	`2917`	`if (rb_thread_alone() \|\| (op & LOCK_NB)) {`
`2918`		`- return flock(fd, op);`
	`2918`	`+ int ret;`
	`2919`	`+ TRAP_BEG;`
	`2920`	`+ ret = flock(fd, op);`
	`2921`	`+ TRAP_END;`
	`2922`	`+ return ret;`
`2919`	`2923`	`}`
`2920`	`2924`	`op \|= LOCK_NB;`
`2921`	`2925`	`while (flock(fd, op) < 0) {`
Original file line number	Diff line number	Diff line change
`@@ -2331,7 +2331,9 @@ rb_io_syswrite(io, str)`
`2331`	`2331`	`if (!rb_thread_fd_writable(fileno(f))) {`
`2332`	`2332`	`rb_io_check_closed(fptr);`
`2333`	`2333`	`}`
	`2334`	`+ TRAP_BEG;`
`2334`	`2335`	`n = write(fileno(f), RSTRING(str)->ptr, RSTRING(str)->len);`
	`2336`	`+ TRAP_END;`
`2335`	`2337`
`2336`	`2338`	`if (n == -1) rb_sys_fail(fptr->path);`
`2337`	`2339`