You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by dd...@apache.org on 2010/12/01 09:07:13 UTC
svn commit: r1040884 [1/3] - in /hadoop/common/branches/branch-0.22: ./
src/java/org/apache/hadoop/io/ src/java/org/apache/hadoop/io/nativeio/
src/native/ src/native/lib/ src/native/src/
src/native/src/org/apache/hadoop/io/nativeio/ src/test/core/org/a...
Author: ddas
Date: Wed Dec 1 08:07:12 2010
New Revision: 1040884
URL: http://svn.apache.org/viewvc?rev=1040884&view=rev
Log:
Merge -r 1040882:1040883 from trunk onto 0.22 branch.
Added:
hadoop/common/branches/branch-0.22/src/java/org/apache/hadoop/io/SecureIOUtils.java
- copied unchanged from r1040883, hadoop/common/trunk/src/java/org/apache/hadoop/io/SecureIOUtils.java
hadoop/common/branches/branch-0.22/src/java/org/apache/hadoop/io/nativeio/
- copied from r1040883, hadoop/common/trunk/src/java/org/apache/hadoop/io/nativeio/
hadoop/common/branches/branch-0.22/src/java/org/apache/hadoop/io/nativeio/Errno.java
- copied unchanged from r1040883, hadoop/common/trunk/src/java/org/apache/hadoop/io/nativeio/Errno.java
hadoop/common/branches/branch-0.22/src/java/org/apache/hadoop/io/nativeio/NativeIO.java
- copied unchanged from r1040883, hadoop/common/trunk/src/java/org/apache/hadoop/io/nativeio/NativeIO.java
hadoop/common/branches/branch-0.22/src/java/org/apache/hadoop/io/nativeio/NativeIOException.java
- copied unchanged from r1040883, hadoop/common/trunk/src/java/org/apache/hadoop/io/nativeio/NativeIOException.java
hadoop/common/branches/branch-0.22/src/native/src/org/apache/hadoop/io/nativeio/
- copied from r1040883, hadoop/common/trunk/src/native/src/org/apache/hadoop/io/nativeio/
hadoop/common/branches/branch-0.22/src/native/src/org/apache/hadoop/io/nativeio/NativeIO.c
- copied unchanged from r1040883, hadoop/common/trunk/src/native/src/org/apache/hadoop/io/nativeio/NativeIO.c
hadoop/common/branches/branch-0.22/src/native/src/org/apache/hadoop/io/nativeio/errno_enum.c
- copied unchanged from r1040883, hadoop/common/trunk/src/native/src/org/apache/hadoop/io/nativeio/errno_enum.c
hadoop/common/branches/branch-0.22/src/native/src/org/apache/hadoop/io/nativeio/errno_enum.h
- copied unchanged from r1040883, hadoop/common/trunk/src/native/src/org/apache/hadoop/io/nativeio/errno_enum.h
hadoop/common/branches/branch-0.22/src/native/src/org/apache/hadoop/io/nativeio/file_descriptor.c
- copied unchanged from r1040883, hadoop/common/trunk/src/native/src/org/apache/hadoop/io/nativeio/file_descriptor.c
hadoop/common/branches/branch-0.22/src/native/src/org/apache/hadoop/io/nativeio/file_descriptor.h
- copied unchanged from r1040883, hadoop/common/trunk/src/native/src/org/apache/hadoop/io/nativeio/file_descriptor.h
hadoop/common/branches/branch-0.22/src/test/core/org/apache/hadoop/io/TestSecureIOUtils.java
- copied unchanged from r1040883, hadoop/common/trunk/src/test/core/org/apache/hadoop/io/TestSecureIOUtils.java
hadoop/common/branches/branch-0.22/src/test/core/org/apache/hadoop/io/nativeio/
- copied from r1040883, hadoop/common/trunk/src/test/core/org/apache/hadoop/io/nativeio/
hadoop/common/branches/branch-0.22/src/test/core/org/apache/hadoop/io/nativeio/TestNativeIO.java
- copied unchanged from r1040883, hadoop/common/trunk/src/test/core/org/apache/hadoop/io/nativeio/TestNativeIO.java
Modified:
hadoop/common/branches/branch-0.22/CHANGES.txt
hadoop/common/branches/branch-0.22/build.xml
hadoop/common/branches/branch-0.22/src/native/Makefile.am
hadoop/common/branches/branch-0.22/src/native/Makefile.in
hadoop/common/branches/branch-0.22/src/native/config.h.in
hadoop/common/branches/branch-0.22/src/native/configure
hadoop/common/branches/branch-0.22/src/native/configure.ac
hadoop/common/branches/branch-0.22/src/native/lib/Makefile.am
hadoop/common/branches/branch-0.22/src/native/src/org_apache_hadoop.h
Modified: hadoop/common/branches/branch-0.22/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.22/CHANGES.txt?rev=1040884&r1=1040883&r2=1040884&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.22/CHANGES.txt (original)
+++ hadoop/common/branches/branch-0.22/CHANGES.txt Wed Dec 1 08:07:12 2010
@@ -41,6 +41,9 @@ Release 0.22.0 - Unreleased
HADOOP-7013. Add boolean field isCorrupt to BlockLocation.
(Patrick Kling via hairong)
+ HADOOP-6978. Adds support for NativeIO using JNI.
+ (Todd Lipcon, Devaraj Das & Owen O'Malley via ddas)
+
IMPROVEMENTS
HADOOP-6644. util.Shell getGROUPS_FOR_USER_COMMAND method name
Modified: hadoop/common/branches/branch-0.22/build.xml
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.22/build.xml?rev=1040884&r1=1040883&r2=1040884&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.22/build.xml (original)
+++ hadoop/common/branches/branch-0.22/build.xml Wed Dec 1 08:07:12 2010
@@ -366,6 +366,7 @@
<mkdir dir="${build.native}/lib"/>
<mkdir dir="${build.native}/src/org/apache/hadoop/io/compress/zlib"/>
+ <mkdir dir="${build.native}/src/org/apache/hadoop/io/nativeio"/>
<mkdir dir="${build.native}/src/org/apache/hadoop/security"/>
<javah
@@ -386,6 +387,14 @@
>
<class name="org.apache.hadoop.security.JniBasedUnixGroupsMapping" />
</javah>
+ <javah
+ classpath="${build.classes}"
+ destdir="${build.native}/src/org/apache/hadoop/io/nativeio"
+ force="yes"
+ verbose="yes"
+ >
+ <class name="org.apache.hadoop.io.nativeio.NativeIO" />
+ </javah>
<exec dir="${build.native}" executable="sh" failonerror="true">
<env key="OS_NAME" value="${os.name}"/>
Modified: hadoop/common/branches/branch-0.22/src/native/Makefile.am
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.22/src/native/Makefile.am?rev=1040884&r1=1040883&r2=1040884&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.22/src/native/Makefile.am (original)
+++ hadoop/common/branches/branch-0.22/src/native/Makefile.am Wed Dec 1 08:07:12 2010
@@ -33,7 +33,8 @@ export PLATFORM = $(shell echo $$OS_NAME
AM_CPPFLAGS = @JNI_CPPFLAGS@ -I$(HADOOP_NATIVE_SRCDIR)/src \
-Isrc/org/apache/hadoop/io/compress/zlib \
- -Isrc/org/apache/hadoop/security
+ -Isrc/org/apache/hadoop/security \
+ -Isrc/org/apache/hadoop/io/nativeio/
AM_LDFLAGS = @JNI_LDFLAGS@ -m$(JVM_DATA_MODEL)
AM_CFLAGS = -g -Wall -fPIC -O2 -m$(JVM_DATA_MODEL)
@@ -41,8 +42,12 @@ lib_LTLIBRARIES = libhadoop.la
libhadoop_la_SOURCES = src/org/apache/hadoop/io/compress/zlib/ZlibCompressor.c \
src/org/apache/hadoop/io/compress/zlib/ZlibDecompressor.c \
src/org/apache/hadoop/security/getGroup.c \
- src/org/apache/hadoop/security/JniBasedUnixGroupsMapping.c
-libhadoop_la_LDFLAGS = -version-info 1:0:0
+ src/org/apache/hadoop/security/JniBasedUnixGroupsMapping.c \
+ src/org/apache/hadoop/io/nativeio/file_descriptor.c \
+ src/org/apache/hadoop/io/nativeio/errno_enum.c \
+ src/org/apache/hadoop/io/nativeio/NativeIO.c
+
+libhadoop_la_LDFLAGS = -version-info 1:0:0 $(AM_LDFLAGS)
libhadoop_la_LIBADD = -ldl -ljvm
#
Modified: hadoop/common/branches/branch-0.22/src/native/Makefile.in
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.22/src/native/Makefile.in?rev=1040884&r1=1040883&r2=1040884&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.22/src/native/Makefile.in (original)
+++ hadoop/common/branches/branch-0.22/src/native/Makefile.in Wed Dec 1 08:07:12 2010
@@ -93,7 +93,8 @@ libLTLIBRARIES_INSTALL = $(INSTALL)
LTLIBRARIES = $(lib_LTLIBRARIES)
libhadoop_la_DEPENDENCIES =
am_libhadoop_la_OBJECTS = ZlibCompressor.lo ZlibDecompressor.lo \
- getGroup.lo JniBasedUnixGroupsMapping.lo
+ getGroup.lo JniBasedUnixGroupsMapping.lo file_descriptor.lo \
+ errno_enum.lo NativeIO.lo
libhadoop_la_OBJECTS = $(am_libhadoop_la_OBJECTS)
DEFAULT_INCLUDES = -I. -I$(srcdir) -I.
depcomp = $(SHELL) $(top_srcdir)/config/depcomp
@@ -222,7 +223,8 @@ sysconfdir = @sysconfdir@
target_alias = @target_alias@
AM_CPPFLAGS = @JNI_CPPFLAGS@ -I$(HADOOP_NATIVE_SRCDIR)/src \
-Isrc/org/apache/hadoop/io/compress/zlib \
- -Isrc/org/apache/hadoop/security
+ -Isrc/org/apache/hadoop/security \
+ -Isrc/org/apache/hadoop/io/nativeio/
AM_LDFLAGS = @JNI_LDFLAGS@ -m$(JVM_DATA_MODEL)
AM_CFLAGS = -g -Wall -fPIC -O2 -m$(JVM_DATA_MODEL)
@@ -230,9 +232,12 @@ lib_LTLIBRARIES = libhadoop.la
libhadoop_la_SOURCES = src/org/apache/hadoop/io/compress/zlib/ZlibCompressor.c \
src/org/apache/hadoop/io/compress/zlib/ZlibDecompressor.c \
src/org/apache/hadoop/security/getGroup.c \
- src/org/apache/hadoop/security/JniBasedUnixGroupsMapping.c
+ src/org/apache/hadoop/security/JniBasedUnixGroupsMapping.c \
+ src/org/apache/hadoop/io/nativeio/file_descriptor.c \
+ src/org/apache/hadoop/io/nativeio/errno_enum.c \
+ src/org/apache/hadoop/io/nativeio/NativeIO.c
-libhadoop_la_LDFLAGS = -version-info 1:0:0
+libhadoop_la_LDFLAGS = -version-info 1:0:0 $(AM_LDFLAGS)
libhadoop_la_LIBADD = -ldl -ljvm
all: config.h
$(MAKE) $(AM_MAKEFLAGS) all-am
@@ -326,8 +331,11 @@ distclean-compile:
-rm -f *.tab.c
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/JniBasedUnixGroupsMapping.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/NativeIO.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ZlibCompressor.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ZlibDecompressor.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/errno_enum.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/file_descriptor.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/getGroup.Plo@am__quote@
.c.o:
@@ -379,6 +387,27 @@ JniBasedUnixGroupsMapping.lo: src/org/ap
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o JniBasedUnixGroupsMapping.lo `test -f 'src/org/apache/hadoop/security/JniBasedUnixGroupsMapping.c' || echo '$(srcdir)/'`src/org/apache/hadoop/security/JniBasedUnixGroupsMapping.c
+file_descriptor.lo: src/org/apache/hadoop/io/nativeio/file_descriptor.c
+@am__fastdepCC_TRUE@ if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT file_descriptor.lo -MD -MP -MF "$(DEPDIR)/file_descriptor.Tpo" -c -o file_descriptor.lo `test -f 'src/org/apache/hadoop/io/nativeio/file_descriptor.c' || echo '$(srcdir)/'`src/org/apache/hadoop/io/nativeio/file_descriptor.c; \
+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/file_descriptor.Tpo" "$(DEPDIR)/file_descriptor.Plo"; else rm -f "$(DEPDIR)/file_descriptor.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='src/org/apache/hadoop/io/nativeio/file_descriptor.c' object='file_descriptor.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o file_descriptor.lo `test -f 'src/org/apache/hadoop/io/nativeio/file_descriptor.c' || echo '$(srcdir)/'`src/org/apache/hadoop/io/nativeio/file_descriptor.c
+
+errno_enum.lo: src/org/apache/hadoop/io/nativeio/errno_enum.c
+@am__fastdepCC_TRUE@ if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT errno_enum.lo -MD -MP -MF "$(DEPDIR)/errno_enum.Tpo" -c -o errno_enum.lo `test -f 'src/org/apache/hadoop/io/nativeio/errno_enum.c' || echo '$(srcdir)/'`src/org/apache/hadoop/io/nativeio/errno_enum.c; \
+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/errno_enum.Tpo" "$(DEPDIR)/errno_enum.Plo"; else rm -f "$(DEPDIR)/errno_enum.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='src/org/apache/hadoop/io/nativeio/errno_enum.c' object='errno_enum.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o errno_enum.lo `test -f 'src/org/apache/hadoop/io/nativeio/errno_enum.c' || echo '$(srcdir)/'`src/org/apache/hadoop/io/nativeio/errno_enum.c
+
+NativeIO.lo: src/org/apache/hadoop/io/nativeio/NativeIO.c
+@am__fastdepCC_TRUE@ if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT NativeIO.lo -MD -MP -MF "$(DEPDIR)/NativeIO.Tpo" -c -o NativeIO.lo `test -f 'src/org/apache/hadoop/io/nativeio/NativeIO.c' || echo '$(srcdir)/'`src/org/apache/hadoop/io/nativeio/NativeIO.c; \
+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/NativeIO.Tpo" "$(DEPDIR)/NativeIO.Plo"; else rm -f "$(DEPDIR)/NativeIO.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='src/org/apache/hadoop/io/nativeio/NativeIO.c' object='NativeIO.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o NativeIO.lo `test -f 'src/org/apache/hadoop/io/nativeio/NativeIO.c' || echo '$(srcdir)/'`src/org/apache/hadoop/io/nativeio/NativeIO.c
+
mostlyclean-libtool:
-rm -f *.lo
Modified: hadoop/common/branches/branch-0.22/src/native/config.h.in
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.22/src/native/config.h.in?rev=1040884&r1=1040883&r2=1040884&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.22/src/native/config.h.in (original)
+++ hadoop/common/branches/branch-0.22/src/native/config.h.in Wed Dec 1 08:07:12 2010
@@ -3,6 +3,10 @@
/* The 'actual' dynamic-library for '-lz' */
#undef HADOOP_ZLIB_LIBRARY
+/* Define to 1 if you have the declaration of `strerror_r', and to 0 if you
+ don't. */
+#undef HAVE_DECL_STRERROR_R
+
/* Define to 1 if you have the <dlfcn.h> header file. */
#undef HAVE_DLFCN_H
@@ -39,6 +43,9 @@
/* Define to 1 if you have the <stdlib.h> header file. */
#undef HAVE_STDLIB_H
+/* Define to 1 if you have the `strerror_r' function. */
+#undef HAVE_STRERROR_R
+
/* Define to 1 if you have the <strings.h> header file. */
#undef HAVE_STRINGS_H
@@ -81,8 +88,17 @@
/* Define to 1 if you have the ANSI C header files. */
#undef STDC_HEADERS
+/* Define to 1 if strerror_r returns char *. */
+#undef STRERROR_R_CHAR_P
+
/* Version number of package */
#undef VERSION
+/* Number of bits in a file offset, on hosts where this is settable. */
+#undef _FILE_OFFSET_BITS
+
+/* Define for large files, on AIX-style hosts. */
+#undef _LARGE_FILES
+
/* Define to empty if `const' does not conform to ANSI C. */
#undef const