You are viewing a plain text version of this content. The canonical link for it is here.
Posted to mapreduce-commits@hadoop.apache.org by el...@apache.org on 2011/02/01 00:44:02 UTC
svn commit: r1065861 - in /hadoop/mapreduce/trunk: ./ src/c++/pipes/
src/c++/pipes/impl/ src/c++/task-controller/ src/c++/utils/
src/c++/utils/impl/ src/examples/pipes/ src/examples/pipes/impl/
Author: eli
Date: Mon Jan 31 23:44:00 2011
New Revision: 1065861
URL: http://svn.apache.org/viewvc?rev=1065861&view=rev
Log:
MAPREDUCE-2260. Remove auto-generated native build files. Contributed by Roman Shaposhnik
Added:
hadoop/mapreduce/trunk/src/c++/task-controller/.autom4te.cfg
hadoop/mapreduce/trunk/src/c++/task-controller/Makefile.am
hadoop/mapreduce/trunk/src/c++/task-controller/configuration.h
Removed:
hadoop/mapreduce/trunk/src/c++/pipes/Makefile.in
hadoop/mapreduce/trunk/src/c++/pipes/aclocal.m4
hadoop/mapreduce/trunk/src/c++/pipes/compile
hadoop/mapreduce/trunk/src/c++/pipes/config.guess
hadoop/mapreduce/trunk/src/c++/pipes/config.sub
hadoop/mapreduce/trunk/src/c++/pipes/configure
hadoop/mapreduce/trunk/src/c++/pipes/depcomp
hadoop/mapreduce/trunk/src/c++/pipes/impl/config.h.in
hadoop/mapreduce/trunk/src/c++/pipes/install-sh
hadoop/mapreduce/trunk/src/c++/pipes/ltmain.sh
hadoop/mapreduce/trunk/src/c++/pipes/missing
hadoop/mapreduce/trunk/src/c++/task-controller/Makefile.in
hadoop/mapreduce/trunk/src/c++/task-controller/configuration.h.in
hadoop/mapreduce/trunk/src/c++/task-controller/configure
hadoop/mapreduce/trunk/src/c++/utils/Makefile.in
hadoop/mapreduce/trunk/src/c++/utils/aclocal.m4
hadoop/mapreduce/trunk/src/c++/utils/config.guess
hadoop/mapreduce/trunk/src/c++/utils/config.sub
hadoop/mapreduce/trunk/src/c++/utils/configure
hadoop/mapreduce/trunk/src/c++/utils/depcomp
hadoop/mapreduce/trunk/src/c++/utils/impl/config.h.in
hadoop/mapreduce/trunk/src/c++/utils/install-sh
hadoop/mapreduce/trunk/src/c++/utils/ltmain.sh
hadoop/mapreduce/trunk/src/c++/utils/missing
hadoop/mapreduce/trunk/src/examples/pipes/Makefile.in
hadoop/mapreduce/trunk/src/examples/pipes/aclocal.m4
hadoop/mapreduce/trunk/src/examples/pipes/config.guess
hadoop/mapreduce/trunk/src/examples/pipes/config.sub
hadoop/mapreduce/trunk/src/examples/pipes/configure
hadoop/mapreduce/trunk/src/examples/pipes/depcomp
hadoop/mapreduce/trunk/src/examples/pipes/impl/config.h.in
hadoop/mapreduce/trunk/src/examples/pipes/install-sh
hadoop/mapreduce/trunk/src/examples/pipes/ltmain.sh
hadoop/mapreduce/trunk/src/examples/pipes/missing
Modified:
hadoop/mapreduce/trunk/CHANGES.txt
hadoop/mapreduce/trunk/build.xml
hadoop/mapreduce/trunk/src/c++/pipes/configure.ac
hadoop/mapreduce/trunk/src/c++/task-controller/configure.ac
hadoop/mapreduce/trunk/src/c++/utils/configure.ac
hadoop/mapreduce/trunk/src/examples/pipes/configure.ac
Modified: hadoop/mapreduce/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/trunk/CHANGES.txt?rev=1065861&r1=1065860&r2=1065861&view=diff
==============================================================================
--- hadoop/mapreduce/trunk/CHANGES.txt (original)
+++ hadoop/mapreduce/trunk/CHANGES.txt Mon Jan 31 23:44:00 2011
@@ -238,6 +238,8 @@ Release 0.22.0 - Unreleased
MAPREDUCE-2250. Fix logging in raid code. (Ramkumar Vadali via schen)
+ MAPREDUCE-2260. Remove auto-generated native build files. (rvs via eli)
+
OPTIMIZATIONS
MAPREDUCE-1354. Enhancements to JobTracker for better performance and
Modified: hadoop/mapreduce/trunk/build.xml
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/trunk/build.xml?rev=1065861&r1=1065860&r2=1065861&view=diff
==============================================================================
--- hadoop/mapreduce/trunk/build.xml (original)
+++ hadoop/mapreduce/trunk/build.xml Mon Jan 31 23:44:00 2011
@@ -1656,20 +1656,63 @@
</chmod>
</target>
- <target name="create-c++-configure" depends="init" if="compile.c++">
+ <target name="check-c++-configure" depends="init" if="compile.c++">
+ <condition property="need.c++.utils.configure">
+ <not> <available file="${c++.utils.src}/configure"/> </not>
+ </condition>
+ <condition property="need.c++.pipes.configure">
+ <not> <available file="${c++.pipes.src}/configure"/> </not>
+ </condition>
+ <condition property="need.c++.examples.pipes.configure">
+ <not> <available file="${c++.examples.pipes.src}/configure"/> </not>
+ </condition>
+ <condition property="need.c++.task-controller.configure">
+ <not> <available file="${c++.task-controller.src}/configure"/> </not>
+ </condition>
+ </target>
+
+ <target name="create-c++-utils-configure" depends="check-c++-configure"
+ if="need.c++.utils.configure">
<exec executable="autoreconf" dir="${c++.utils.src}" searchpath="yes"
failonerror="yes">
- <arg value="-if"/>
+ <arg value="-i"/>
+ <arg value="-f"/>
</exec>
+ </target>
+
+ <target name="create-c++-pipes-configure" depends="check-c++-configure"
+ if="need.c++.pipes.configure">
<exec executable="autoreconf" dir="${c++.pipes.src}" searchpath="yes"
failonerror="yes">
- <arg value="-if"/>
+ <arg value="-i"/>
+ <arg value="-f"/>
</exec>
+ </target>
+
+ <target name="create-c++-examples-pipes-configure" depends="check-c++-configure"
+ if="need.c++.examples.pipes.configure">
<exec executable="autoreconf" dir="${c++.examples.pipes.src}"
searchpath="yes" failonerror="yes">
- <arg value="-if"/>
+ <arg value="-i"/>
+ <arg value="-f"/>
+ </exec>
+ </target>
+
+ <target name="create-c++-task-controller-configure" depends="check-c++-configure"
+ if="need.c++.task-controller.configure">
+ <exec executable="autoreconf" dir="${c++.task-controller.src}"
+ searchpath="yes" failonerror="yes">
+ <arg value="-i"/>
+ <arg value="-f"/>
</exec>
- </target>
+ </target>
+
+ <target name="create-c++-configure" depends="create-c++-utils-configure,
+ create-c++-pipes-configure,
+ create-c++-examples-pipes-configure,
+ create-c++-task-controller-configure"
+ if="compile.c++">
+ </target>
<target name="check-c++-makefiles" depends="init" if="compile.c++">
<condition property="need.c++.utils.makefile">
@@ -1685,6 +1728,7 @@
<target name="create-c++-utils-makefile" depends="check-c++-makefiles"
if="need.c++.utils.makefile">
+ <antcall target="create-c++-utils-configure"/>
<mkdir dir="${build.c++.utils}"/>
<chmod file="${c++.utils.src}/configure" perm="ugo+x"/>
<exec executable="${c++.utils.src}/configure" dir="${build.c++.utils}"
@@ -1703,6 +1747,7 @@
<target name="create-c++-pipes-makefile" depends="check-c++-makefiles"
if="need.c++.pipes.makefile">
+ <antcall target="create-c++-pipes-configure"/>
<mkdir dir="${build.c++.pipes}"/>
<chmod file="${c++.pipes.src}/configure" perm="ugo+x"/>
<exec executable="${c++.pipes.src}/configure" dir="${build.c++.pipes}"
@@ -1726,6 +1771,7 @@
<target name="create-c++-examples-pipes-makefile"
depends="check-c++-makefiles"
if="need.c++.examples.pipes.makefile">
+ <antcall target="create-c++-examples-pipes-configure"/>
<mkdir dir="${build.c++.examples.pipes}"/>
<chmod file="${c++.examples.pipes.src}/configure" perm="ugo+x"/>
<exec executable="${c++.examples.pipes.src}/configure"
@@ -2107,6 +2153,7 @@
<!-- taskcontroller targets -->
<target name="init-task-controller-build">
+ <antcall target="create-c++-task-controller-configure"/>
<mkdir dir="${build.c++.task-controller}" />
<copy todir="${build.c++.task-controller}">
<fileset dir="${c++.task-controller.src}" includes="*.c"/>
Modified: hadoop/mapreduce/trunk/src/c++/pipes/configure.ac
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/trunk/src/c%2B%2B/pipes/configure.ac?rev=1065861&r1=1065860&r2=1065861&view=diff
==============================================================================
--- hadoop/mapreduce/trunk/src/c++/pipes/configure.ac (original)
+++ hadoop/mapreduce/trunk/src/c++/pipes/configure.ac Mon Jan 31 23:44:00 2011
@@ -20,6 +20,9 @@
AC_PREREQ(2.59)
AC_INIT(hadoop-pipes, 0.13.0, omalley@apache.org)
+AC_CONFIG_AUX_DIR([config])
+AC_CONFIG_MACRO_DIR([../utils/m4])
+
AM_INIT_AUTOMAKE([subdir-objects foreign no-dist])
AC_CONFIG_SRCDIR([impl/HadoopPipes.cc])
Added: hadoop/mapreduce/trunk/src/c++/task-controller/.autom4te.cfg
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/trunk/src/c%2B%2B/task-controller/.autom4te.cfg?rev=1065861&view=auto
==============================================================================
--- hadoop/mapreduce/trunk/src/c++/task-controller/.autom4te.cfg (added)
+++ hadoop/mapreduce/trunk/src/c++/task-controller/.autom4te.cfg Mon Jan 31 23:44:00 2011
@@ -0,0 +1,42 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+#
+# autom4te configuration for hadoop utils library
+#
+
+begin-language: "Autoheader-preselections"
+args: --no-cache
+end-language: "Autoheader-preselections"
+
+begin-language: "Automake-preselections"
+args: --no-cache
+end-language: "Automake-preselections"
+
+begin-language: "Autoreconf-preselections"
+args: --no-cache
+end-language: "Autoreconf-preselections"
+
+begin-language: "Autoconf-without-aclocal-m4"
+args: --no-cache
+end-language: "Autoconf-without-aclocal-m4"
+
+begin-language: "Autoconf"
+args: --no-cache
+end-language: "Autoconf"
+
Added: hadoop/mapreduce/trunk/src/c++/task-controller/Makefile.am
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/trunk/src/c%2B%2B/task-controller/Makefile.am?rev=1065861&view=auto
==============================================================================
--- hadoop/mapreduce/trunk/src/c++/task-controller/Makefile.am (added)
+++ hadoop/mapreduce/trunk/src/c++/task-controller/Makefile.am Mon Jan 31 23:44:00 2011
@@ -0,0 +1,33 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+ACLOCAL_AMFLAGS = -I ../utils/m4
+AM_CFLAGS = -Wall
+
+bindir = $(exec_prefix)
+
+bin_PROGRAMS = task-controller
+check_PROGRAMS = tests/test-task-controller
+TESTS = $(check_PROGRAMS)
+
+task_controller_SOURCES = main.c task-controller.c configuration.c \
+ task-controller.h
+
+tests_test_task_controller_SOURCES = tests/test-task-controller.c \
+ task-controller.c configuration.c task-controller.h
+
+test: $(check_PROGRAMS)
+ @echo Done with $<
Added: hadoop/mapreduce/trunk/src/c++/task-controller/configuration.h
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/trunk/src/c%2B%2B/task-controller/configuration.h?rev=1065861&view=auto
==============================================================================
--- hadoop/mapreduce/trunk/src/c++/task-controller/configuration.h (added)
+++ hadoop/mapreduce/trunk/src/c++/task-controller/configuration.h Mon Jan 31 23:44:00 2011
@@ -0,0 +1,59 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <errno.h>
+#include <unistd.h>
+
+#define INCREMENT_SIZE 1000
+#define MAX_SIZE 10
+
+struct confentry {
+ const char *key;
+ const char *value;
+};
+
+
+struct configuration {
+ int size;
+ struct confentry **confdetails;
+};
+
+FILE *LOGFILE;
+
+#ifdef HADOOP_CONF_DIR
+ #define CONF_FILE_PATTERN "%s/taskcontroller.cfg"
+#else
+ #define CONF_FILE_PATTERN "%s/conf/taskcontroller.cfg"
+#endif
+
+extern struct configuration config;
+//configuration file contents
+#ifndef HADOOP_CONF_DIR
+ extern char *hadoop_conf_dir;
+#endif
+//method exposed to get the configurations
+const char * get_value(const char* key);
+//method to free allocated configuration
+void free_configurations();
+
+//function to return array of values pointing to the key. Values are
+//comma seperated strings.
+const char ** get_values(const char* key);
Modified: hadoop/mapreduce/trunk/src/c++/task-controller/configure.ac
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/trunk/src/c%2B%2B/task-controller/configure.ac?rev=1065861&r1=1065860&r2=1065861&view=diff
==============================================================================
--- hadoop/mapreduce/trunk/src/c++/task-controller/configure.ac (original)
+++ hadoop/mapreduce/trunk/src/c++/task-controller/configure.ac Mon Jan 31 23:44:00 2011
@@ -29,7 +29,9 @@ AC_PREFIX_DEFAULT(.)
#add new argument called -with-confdir
AC_ARG_WITH(confdir,[--with-confdir path to hadoop conf dir])
AC_CONFIG_SRCDIR([task-controller.h])
-AC_CONFIG_HEADER([configuration.h])
+AC_CONFIG_AUX_DIR([config])
+AC_CONFIG_MACRO_DIR([../utils/m4])
+AM_INIT_AUTOMAKE([subdir-objects foreign no-dist])
# Checks for programs.
AC_PROG_CC
@@ -45,7 +47,7 @@ AC_CHECK_HEADERS([stdlib.h string.h unis
if test "$with_confdir" != ""
then
-AC_DEFINE_UNQUOTED(HADOOP_CONF_DIR,"$with_confdir")
+AC_DEFINE_UNQUOTED(HADOOP_CONF_DIR, ["$with_confdir"], [Location of Hadoop configuration])
fi
# Checks for typedefs, structures, and compiler characteristics.
AC_C_CONST
Modified: hadoop/mapreduce/trunk/src/c++/utils/configure.ac
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/trunk/src/c%2B%2B/utils/configure.ac?rev=1065861&r1=1065860&r2=1065861&view=diff
==============================================================================
--- hadoop/mapreduce/trunk/src/c++/utils/configure.ac (original)
+++ hadoop/mapreduce/trunk/src/c++/utils/configure.ac Mon Jan 31 23:44:00 2011
@@ -20,6 +20,9 @@
AC_PREREQ(2.59)
AC_INIT(hadoop-utils, 0.13.0, omalley@apache.org)
+AC_CONFIG_AUX_DIR([config])
+AC_CONFIG_MACRO_DIR([m4])
+
AM_INIT_AUTOMAKE([subdir-objects foreign no-dist])
AC_CONFIG_SRCDIR([impl/SerialUtils.cc])
Modified: hadoop/mapreduce/trunk/src/examples/pipes/configure.ac
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/trunk/src/examples/pipes/configure.ac?rev=1065861&r1=1065860&r2=1065861&view=diff
==============================================================================
--- hadoop/mapreduce/trunk/src/examples/pipes/configure.ac (original)
+++ hadoop/mapreduce/trunk/src/examples/pipes/configure.ac Mon Jan 31 23:44:00 2011
@@ -20,6 +20,9 @@
AC_PREREQ(2.59)
AC_INIT(hadoop-pipes-examples, 0.13.0, omalley@apache.org)
+AC_CONFIG_AUX_DIR([config])
+AC_CONFIG_MACRO_DIR([../../c++/utils/m4])
+
AM_INIT_AUTOMAKE([subdir-objects foreign no-dist])
AC_CONFIG_SRCDIR([impl/wordcount-simple.cc])