You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by jp...@apache.org on 2010/02/27 19:21:11 UTC
svn commit: r917004 - in /incubator/trafficserver/traffic/trunk: ./
iocore/cache/ iocore/eventsystem/ libinktomi++/
Author: jplevyak
Date: Sat Feb 27 18:21:10 2010
New Revision: 917004
URL: http://svn.apache.org/viewvc?rev=917004&view=rev
Log:
TS-142: remove unused cruft for supporting linux 2.0 !! and Digital Unix circa 2000.
Removed:
incubator/trafficserver/traffic/trunk/libinktomi++/ink_pread.h
incubator/trafficserver/traffic/trunk/libinktomi++/ink_pread_alpha.c
incubator/trafficserver/traffic/trunk/libinktomi++/ink_pread_linux.c
Modified:
incubator/trafficserver/traffic/trunk/configure.ac
incubator/trafficserver/traffic/trunk/iocore/cache/Store.cc
incubator/trafficserver/traffic/trunk/iocore/eventsystem/P_UnixSocketManager.h
incubator/trafficserver/traffic/trunk/libinktomi++/Compatability.h
incubator/trafficserver/traffic/trunk/libinktomi++/Makefile.am
incubator/trafficserver/traffic/trunk/libinktomi++/inktomi++.h
Modified: incubator/trafficserver/traffic/trunk/configure.ac
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/configure.ac?rev=917004&r1=917003&r2=917004&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/configure.ac (original)
+++ incubator/trafficserver/traffic/trunk/configure.ac Sat Feb 27 18:21:10 2010
@@ -823,8 +823,6 @@
AC_DEFINE([HTTP_CACHE])
-AC_LIBOBJ([ink_pread_linux])
-
# Testing Framework suffix generation hack
TFW_PACKAGE_SUFFIX=$os_type
Modified: incubator/trafficserver/traffic/trunk/iocore/cache/Store.cc
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/iocore/cache/Store.cc?rev=917004&r1=917003&r2=917004&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/iocore/cache/Store.cc (original)
+++ incubator/trafficserver/traffic/trunk/iocore/cache/Store.cc Sat Feb 27 18:21:10 2010
@@ -1111,7 +1111,7 @@
if (fd < 0)
return -1;
for (int b = 0; ds->blocks; b++)
- if (socketManager.write_to_middle_of_file(fd, z, STORE_BLOCK_SIZE, ds->offset + (b * STORE_BLOCK_SIZE)) < 0) {
+ if (socketManager.pwrite(fd, z, STORE_BLOCK_SIZE, ds->offset + (b * STORE_BLOCK_SIZE)) < 0) {
close(fd);
return -1;
}
Modified: incubator/trafficserver/traffic/trunk/iocore/eventsystem/P_UnixSocketManager.h
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/iocore/eventsystem/P_UnixSocketManager.h?rev=917004&r1=917003&r2=917004&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/iocore/eventsystem/P_UnixSocketManager.h (original)
+++ incubator/trafficserver/traffic/trunk/iocore/eventsystem/P_UnixSocketManager.h Sat Feb 27 18:21:10 2010
@@ -126,21 +126,6 @@
inline int
-SocketManager::read_from_middle_of_file(int fd, void *buf, int size, off_t offset, char *tag)
-{
- int r;
- if (monitor_read_activity)
- monitor_disk_read(fd, buf, size, offset, tag);
- do {
- if ((r =::read_from_middle_of_file(fd, buf, size, offset)) >= 0)
- break;
- r = -errno;
- } while (r == -EINTR);
- return r;
-}
-
-
-inline int
SocketManager::readv(int fd, struct iovec *vector, size_t count, teFDType eT)
{
int r;
@@ -264,23 +249,6 @@
inline int
-SocketManager::write_to_middle_of_file(int fd, void *buf, int size, off_t offset, char *tag)
-{
- int r;
-
- if (monitor_write_activity)
- monitor_disk_write(fd, buf, size, offset, tag);
-
- do {
- if (likely((r =::write_to_middle_of_file(fd, buf, size, offset)) >= 0))
- break;
- r = -errno;
- } while (r == -EINTR);
- return r;
-}
-
-
-inline int
SocketManager::writev(int fd, struct iovec *vector, size_t count, teFDType eT)
{
int r;
Modified: incubator/trafficserver/traffic/trunk/libinktomi++/Compatability.h
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/libinktomi%2B%2B/Compatability.h?rev=917004&r1=917003&r2=917004&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/libinktomi++/Compatability.h (original)
+++ incubator/trafficserver/traffic/trunk/libinktomi++/Compatability.h Sat Feb 27 18:21:10 2010
@@ -111,121 +111,8 @@
extern "C" void bcopy(const void *s1, void *s2, size_t n);
#endif
-//
-// Attempt (in a resonably portable manner) to determine
-// if this O/S rev support pread/pwrite
-//
-#include <sys/syscall.h>
-
-// Some ugliness around pread() vs SYS_pread64 syscall
-#if !defined(SYS_pread) && defined (SYS_pread64)
-# define SYS_pread SYS_pread64
-#endif
-#if !defined(SYS_pwrite) && defined (SYS_pwrite64)
-# define SYS_pwrite SYS_pwrite64
-#endif
-
-#if !defined (SYS_pread)
-
-#include <unistd.h>
-#include <sys/file.h>
-
-//
-// The following functions also check that there are no races
-// for the file descriptor. This only occurs in debug mode.
-//
-
-static inline ssize_t
-read_from_middle_of_file(int fildes, void *buf, size_t nbyte, off_t offset)
-{
-
- off_t there = lseek(fildes, offset, SEEK_SET);
-
- if (there == (off_t) - 1) {
- return -1;
- }
- ssize_t read_ret = read(fildes, buf, nbyte);
- if (read_ret == -1) {
- return -1;
- }
- return read_ret;
-}
-
-static inline ssize_t
-write_to_middle_of_file(int fildes, void *buf, size_t nbyte, off_t offset)
-{
-
- off_t there = lseek(fildes, offset, SEEK_SET);
-
- if (there == (off_t) - 1) {
- return -1;
- }
- ssize_t write_ret = write(fildes, buf, nbyte);
- if (write_ret == -1) {
- return -1;
- }
- return write_ret;
-}
-
-static inline ssize_t
-pread(int fildes, void *buf, size_t nbyte, off_t offset)
-{
- return read_from_middle_of_file(fildes, buf, nbyte, offset);
-}
-static inline ssize_t
-pwrite(int fildes, void *buf, size_t nbytes, off_t offset)
-{
- return write_to_middle_of_file(fildes, buf, nbytes, offset);
-}
-
-#elif (HOST_OS == linux)
-
-#include "ink_pread.h"
-
-static inline ssize_t
-read_from_middle_of_file(int fildes, void *buf, size_t nbytes, off_t offset)
-{
- return _read_from_middle_of_file(fildes, buf, nbytes, offset);
-}
-
-static inline ssize_t
-write_to_middle_of_file(int fildes, void *buf, size_t nbytes, off_t offset)
-{
- return _write_to_middle_of_file(fildes, buf, nbytes, offset);
-}
-
-static inline ssize_t
-__ink_pread(int fildes, void *buf, size_t nbyte, off_t offset)
-{
- return _read_from_middle_of_file(fildes, buf, nbyte, offset);
-}
-static inline ssize_t
-__ink_pwrite(int fildes, void *buf, size_t nbytes, off_t offset)
-{
- return _write_to_middle_of_file(fildes, buf, nbytes, offset);
-}
-
-#define pread __ink_pread
-#define pwrite __ink_pwrite
-
-#else
-
-#include "ink_pread.h"
-
-static inline ssize_t
-read_from_middle_of_file(int fildes, void *buf, size_t nbytes, off_t offset)
-{
- return pread(fildes, buf, nbytes, offset);
-}
-
-static inline ssize_t
-write_to_middle_of_file(int fildes, void *buf, size_t nbytes, off_t offset)
-{
- return pwrite(fildes, buf, nbytes, offset);
-}
-
-#endif
-
+#define ink_pread pread
+#define ink_pwrite pwrite
#define ink_open open
#define ink_close close
#define ink_lseek lseek
Modified: incubator/trafficserver/traffic/trunk/libinktomi++/Makefile.am
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/libinktomi%2B%2B/Makefile.am?rev=917004&r1=917003&r2=917004&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/libinktomi++/Makefile.am (original)
+++ incubator/trafficserver/traffic/trunk/libinktomi++/Makefile.am Sat Feb 27 18:21:10 2010
@@ -82,7 +82,6 @@
ink_platform.h \
InkPool.h \
ink_port.h \
- ink_pread.h \
ink_queue.cc \
ink_queue.h \
ink_queue_utils.c \
Modified: incubator/trafficserver/traffic/trunk/libinktomi++/inktomi++.h
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/libinktomi%2B%2B/inktomi%2B%2B.h?rev=917004&r1=917003&r2=917004&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/libinktomi++/inktomi++.h (original)
+++ incubator/trafficserver/traffic/trunk/libinktomi++/inktomi++.h Sat Feb 27 18:21:10 2010
@@ -101,7 +101,6 @@
#include "ink_mutex.h"
#include "ink_platform.h"
#include "ink_port.h"
-#include "ink_pread.h"
#include "ink_queue.h"
#include "ink_rand.h"
#include "ink_regex-3.6.h"