Remove more clutter in fastos/types.h

6 files changed, 19 insertions, 47 deletions

diff --git a/searchlib/src/tests/attribute/benchmark/attributebenchmark.cpp b/searchlib/src/tests/attribute/benchmark/attributebenchmark.cpp
index 00321093600..8eef498d85c 100644
--- a/searchlib/src/tests/attribute/benchmark/attributebenchmark.cpp
+++ b/searchlib/src/tests/attribute/benchmark/attributebenchmark.cpp
@@ -8,13 +8,12 @@
 #include <vespa/searchlib/attribute/singlestringattribute.h>
 #include <vespa/searchlib/attribute/multistringattribute.h>
 #include <vespa/searchlib/attribute/attrvector.h>
-#include <vespa/vespalib/util/sync.h>
 #include <vespa/fastos/app.h>
 #include <iostream>
 #include <fstream>
 #include "../attributesearcher.h"
 #include "../attributeupdater.h"
-#include "../runnable.h"
+#include <sys/resource.h>
 
 #include <vespa/log/log.h>
 
diff --git a/searchlib/src/tests/groupingengine/groupingengine_benchmark.cpp b/searchlib/src/tests/groupingengine/groupingengine_benchmark.cpp
index ba78f00ffca..37aa9cc3268 100644
--- a/searchlib/src/tests/groupingengine/groupingengine_benchmark.cpp
+++ b/searchlib/src/tests/groupingengine/groupingengine_benchmark.cpp
@@ -13,6 +13,8 @@
 #include <vespa/vespalib/objects/objectpredicate.h>
 #include <vespa/vespalib/objects/objectoperation.h>
 #include <vespa/vespalib/util/rusage.h>
+#include <csignal>
+
 #include <vespa/log/log.h>
 LOG_SETUP("grouping_benchmark");
 
diff --git a/searchlib/src/tests/query/query-old-large.cpp b/searchlib/src/tests/query/query-old-large.cpp
index 8bdc65c12c1..f1ff391cc2c 100644
--- a/searchlib/src/tests/query/query-old-large.cpp
+++ b/searchlib/src/tests/query/query-old-large.cpp
@@ -4,7 +4,7 @@
 #include <vespa/searchlib/query/tree/simplequery.h>
 #include <vespa/searchlib/query/tree/stackdumpcreator.h>
 #include <vespa/vespalib/testkit/test_kit.h>
-#include <limits>
+#include <sys/resource.h>
 
 using namespace search;
 using namespace search::query;
diff --git a/searchlib/src/vespa/searchlib/common/address_space.cpp b/searchlib/src/vespa/searchlib/common/address_space.cpp
index a2dcaf024e5..af5e754e68f 100644
--- a/searchlib/src/vespa/searchlib/common/address_space.cpp
+++ b/searchlib/src/vespa/searchlib/common/address_space.cpp
@@ -2,7 +2,7 @@
 
 #include "address_space.h"
 #include <ostream>
-#include <assert.h>
+#include <cassert>
 
 namespace search {
 
diff --git a/searchlib/src/vespa/searchlib/diskindex/fileheader.cpp b/searchlib/src/vespa/searchlib/diskindex/fileheader.cpp
index b8ac5822692..7e479cb2905 100644
--- a/searchlib/src/vespa/searchlib/diskindex/fileheader.cpp
+++ b/searchlib/src/vespa/searchlib/diskindex/fileheader.cpp
@@ -5,6 +5,7 @@
 #include <vespa/vespalib/stllike/asciistream.h>
 #include <vespa/vespalib/data/fileheader.h>
 #include <vespa/fastos/file.h>
+#include <arpa/inet.h>
 
 #include <vespa/log/log.h>
 LOG_SETUP(".diskindex.fileheader");
@@ -25,19 +26,7 @@ FileHeader::FileHeader()
 {
 }
 
-
-FileHeader::~FileHeader()
-{
-}
-
-
-static inline uint32_t
-bswap(uint32_t val)
-{
-    __asm__("bswap %0" : "=r" (val) : "0" (val));
-    return val;
-}
-
+FileHeader::~FileHeader() {}
 
 bool
 FileHeader::taste(const vespalib::string &name,
@@ -62,10 +51,8 @@ FileHeader::taste(const vespalib::string &name,
     } catch (vespalib::IllegalHeaderException &e) {
         if (e.getMessage() != "Failed to read header info." &&
             e.getMessage() != "Failed to verify magic bits.") {
-            LOG(error,
-                "FileHeader::tastGeneric(\"%s\") exception: %s",
-                name.c_str(),
-                e.getMessage().c_str());
+            LOG(error, "FileHeader::tastGeneric(\"%s\") exception: %s",
+                name.c_str(), e.getMessage().c_str());
         }
         file.Close();
         return false;
@@ -82,9 +69,7 @@ FileHeader::taste(const vespalib::string &name,
         } else if (endian == "little") {
             _bigEndian = false;
         } else {
-            LOG(error,
-                "Bad endian: %s",
-                endian.c_str());
+            LOG(error, "Bad endian: %s", endian.c_str());
             return false;
         }
     }
@@ -92,33 +77,23 @@ FileHeader::taste(const vespalib::string &name,
     if (header.hasTag("frozen")) {
         _completed = header.getTag("frozen").asInteger() != 0;
     } else {
-        LOG(error,
-            "FileHeader::taste(\"%s\"): Missing frozen tag",
-            name.c_str());
+        LOG(error, "FileHeader::taste(\"%s\"): Missing frozen tag", name.c_str());
         return false;
     }
     if (header.hasTag("fileBitSize")) {
         _fileBitSize = header.getTag("fileBitSize").asInteger();
         if (_completed && _fileBitSize < 8 * _headerLen) {
-            LOG(error,
-                "FileHeader::taste(\"%s\"): "
-                "fleBitSize(%" PRIu64 ") < 8 * headerLen(%u)",
-                name.c_str(),
-                _fileBitSize, _headerLen);
+            LOG(error, "FileHeader::taste(\"%s\"): fleBitSize(%" PRIu64 ") < 8 * headerLen(%u)",
+                name.c_str(), _fileBitSize, _headerLen);
             return false;
         }
         if (_completed && _fileBitSize > 8 * fileSize) {
-            LOG(error,
-                "FileHeader::taste(\"%s\"): "
-                "fleBitSize(%" PRIu64 ") > 8 * fileSize(%" PRIu64 ")",
-                name.c_str(),
-                _fileBitSize, fileSize);
+            LOG(error, "FileHeader::taste(\"%s\"): fleBitSize(%" PRIu64 ") > 8 * fileSize(%" PRIu64 ")",
+                name.c_str(), _fileBitSize, fileSize);
             abort();
         }
     } else if (!_allowNoFileBitSize) {
-        LOG(error,
-            "FileHeader::taste(\"%s\"): Missing fileBitSize tag",
-            name.c_str());
+        LOG(error, "FileHeader::taste(\"%s\"): Missing fileBitSize tag", name.c_str());
         return false;
     }
     for (uint32_t i = 0; ;++i) {
@@ -132,10 +107,8 @@ FileHeader::taste(const vespalib::string &name,
     return true;
 }
 
-
 bool
-FileHeader::taste(const vespalib::string &name,
-                  const TuneFileSeqWrite &tuneFileWrite)
+FileHeader::taste(const vespalib::string &name, const TuneFileSeqWrite &tuneFileWrite)
 {
     TuneFileSeqRead tuneFileRead;
     if (tuneFileWrite.getWantDirectIO())
@@ -143,10 +116,8 @@ FileHeader::taste(const vespalib::string &name,
     return taste(name, tuneFileRead);
 }
 
-
 bool
-FileHeader::taste(const vespalib::string &name,
-                  const TuneFileRandRead &tuneFileSearch)
+FileHeader::taste(const vespalib::string &name, const TuneFileRandRead &tuneFileSearch)
 {
     TuneFileSeqRead tuneFileRead;
     if (tuneFileSearch.getWantDirectIO())
diff --git a/searchlib/src/vespa/searchlib/fef/simpletermdata.h b/searchlib/src/vespa/searchlib/fef/simpletermdata.h
index 2126d1c69ba..ef2d91d6e68 100644
--- a/searchlib/src/vespa/searchlib/fef/simpletermdata.h
+++ b/searchlib/src/vespa/searchlib/fef/simpletermdata.h
@@ -7,7 +7,7 @@
 #include "simpletermfielddata.h"
 #include <vespa/searchlib/query/weight.h>
 #include <vector>
-#include <assert.h>
+#include <cassert>
 
 namespace search {
 namespace fef {