Author: cmccabe
Date: Tue May 20 17:20:00 2014
New Revision: 1596325
URL: http://svn.apache.org/r1596325
Log:
HDFS-6421. Fix vecsum.c compile on BSD and some other systems (Mit Desai via
Colin Patrick McCabe)
Modified:
hadoop/common/branches/branch-2/hadoop-hdfs-project/ (props changed)
hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/ (props
changed)
hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/main/native/
(props changed)
hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/main/native/libhdfs/test/vecsum.c
Propchange: hadoop/common/branches/branch-2/hadoop-hdfs-project/
------------------------------------------------------------------------------
Merged /hadoop/common/trunk/hadoop-hdfs-project:r1596324
Propchange: hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/
------------------------------------------------------------------------------
Merged /hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs:r1596324
Modified:
hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt?rev=1596325&r1=1596324&r2=1596325&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
(original)
+++ hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
Tue May 20 17:20:00 2014
@@ -246,6 +246,9 @@ Release 2.5.0 - UNRELEASED
HDFS-4913. Deleting file through fuse-dfs when using trash fails requiring
root permissions (cmccabe)
+ HDFS-6421. Fix vecsum.c compile on BSD and some other systems. (Mit Desai
+ via Colin Patrick McCabe)
+
Release 2.4.1 - UNRELEASED
INCOMPATIBLE CHANGES
Propchange:
hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/main/native/
------------------------------------------------------------------------------
Merged
/hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/src/main/native:r1596324
Modified:
hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/main/native/libhdfs/test/vecsum.c
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/main/native/libhdfs/test/vecsum.c?rev=1596325&r1=1596324&r2=1596325&view=diff
==============================================================================
---
hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/main/native/libhdfs/test/vecsum.c
(original)
+++
hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/main/native/libhdfs/test/vecsum.c
Tue May 20 17:20:00 2014
@@ -18,7 +18,6 @@
#include <errno.h>
#include <fcntl.h>
-#include <malloc.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
@@ -48,7 +47,6 @@ static double timespec_to_double(const s
struct stopwatch {
struct timespec start;
struct timespec stop;
- struct rusage rusage;
};
static struct stopwatch *stopwatch_create(void)
@@ -66,12 +64,6 @@ static struct stopwatch *stopwatch_creat
"error %d (%s)\n", err, strerror(err));
goto error;
}
- if (getrusage(RUSAGE_THREAD, &watch->rusage) < 0) {
- int err = errno;
- fprintf(stderr, "getrusage failed: error %d (%s)\n",
- err, strerror(err));
- goto error;
- }
return watch;
error:
