You are viewing a plain text version of this content. The canonical link for it is here.
Posted to hdfs-commits@hadoop.apache.org by cm...@apache.org on 2014/05/20 19:19:39 UTC

svn commit: r1596324 - in /hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs: CHANGES.txt src/main/native/libhdfs/test/vecsum.c

Author: cmccabe
Date: Tue May 20 17:19:39 2014
New Revision: 1596324

URL: http://svn.apache.org/r1596324
Log:
HDFS-6421. Fix vecsum.c compile on BSD and some other systems (Mit Desai via Colin Patrick McCabe)

Modified:
    hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
    hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/src/main/native/libhdfs/test/vecsum.c

Modified: hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt?rev=1596324&r1=1596323&r2=1596324&view=diff
==============================================================================
--- hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt (original)
+++ hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt Tue May 20 17:19:39 2014
@@ -498,6 +498,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

Modified: hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/src/main/native/libhdfs/test/vecsum.c
URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/src/main/native/libhdfs/test/vecsum.c?rev=1596324&r1=1596323&r2=1596324&view=diff
==============================================================================
--- hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/src/main/native/libhdfs/test/vecsum.c (original)
+++ hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/src/main/native/libhdfs/test/vecsum.c Tue May 20 17:19:39 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: