Changeset 372

Timestamp:

08/01/05 19:37:41 (5 years ago)

Author:

bradfitz

Message:

use Sys::Syscall, not syscall directly

Location:

trunk

Files:

• Makefile.PL (modified) (1 diff)
• lib/Perlbal/ClientHTTPBase.pm (modified) (4 diffs)

trunk/Makefile.PL

@@ -26 +26 @@
     PREREQ_PM               => {
         'Danga::Socket' => '1.43',
+        'Sys::Syscall'  => 0,
         'BSD::Resource' => 0,
-        'Test::More' => 0,
-        'File::Find' => 0,
+        'Test::More'    => 0,
+        'File::Find'    => 0,
     },
     dist                    => {

trunk/lib/Perlbal/ClientHTTPBase.pm

@@ -11 +11 @@
 # Copyright 2005, Six Apart, Ltd.
 
-package main;
-
-# loading syscall.ph into package main in case some other module wants
-# to use it (like Danga::Socket, or whoever else)
-eval { require 'syscall.ph'; 1 } || eval { require 'sys/syscall.ph'; 1 };
-
 package Perlbal::ClientHTTPBase;
 use strict;
@@ -22 +16 @@
 no  warnings qw(deprecated);
 
+use Sys::Syscall;
 use base "Perlbal::Socket";
 use HTTP::Date ();
@@ -44 +39 @@
 use Errno qw( EPIPE ECONNRESET );
 use POSIX ();
-
-our $SYS_sendfile = $ENV{NR_SENDFILE} || &::SYS_sendfile;
 
 # ghetto hard-coding.  should let siteadmin define or something.
@@ -234 +227 @@
         my $to_send = $self->{reproxy_file_size} - $self->{reproxy_file_offset};
         $self->tcp_cork(1) if $self->{reproxy_file_offset} == 0;
-        my $sent = syscall($SYS_sendfile,
-                           $self->{fd},
-                           fileno($self->{reproxy_fh}),
-                           0, # NULL offset means kernel moves offset
-                           $to_send);
+        my $sent = Sys::Syscall::sendfile(
+                                          $self->{fd},
+                                          fileno($self->{reproxy_fh}),
+                                          $to_send);
         print "REPROXY Sent: $sent\n" if Perlbal::DEBUG >= 2;
         if ($sent < 0) {