diff options
author | Håvard Pettersen <havardpe@yahooinc.com> | 2023-03-01 10:01:32 +0000 |
---|---|---|
committer | Håvard Pettersen <havardpe@yahooinc.com> | 2023-03-01 10:01:32 +0000 |
commit | 3393ff7cdf012c1e51ca32bd57ef2cb86fd5127d (patch) | |
tree | f08e0b532f395454c272d0a38b114698351b793d /searchsummary | |
parent | cbc3aed54f82cd78bcd40225539ce9fa2f2ca5ec (diff) |
remove additional no-longer-relevant fastos references
Diffstat (limited to 'searchsummary')
-rw-r--r-- | searchsummary/src/tests/juniper/auxTest.cpp | 2 | ||||
-rw-r--r-- | searchsummary/src/tests/juniper/testenv.cpp | 4 | ||||
-rw-r--r-- | searchsummary/src/vespa/juniper/juniperdebug.h | 13 | ||||
-rw-r--r-- | searchsummary/src/vespa/juniper/rpinterface.cpp | 8 | ||||
-rw-r--r-- | searchsummary/src/vespa/juniper/tokenizer.cpp | 1 |
5 files changed, 0 insertions, 28 deletions
diff --git a/searchsummary/src/tests/juniper/auxTest.cpp b/searchsummary/src/tests/juniper/auxTest.cpp index 8eda6a2132a..a43294e709f 100644 --- a/searchsummary/src/tests/juniper/auxTest.cpp +++ b/searchsummary/src/tests/juniper/auxTest.cpp @@ -11,9 +11,7 @@ LOG_SETUP(".auxtest"); #define COLOR_HIGH_ON "\e[1;31m" #define COLOR_HIGH_OFF "\e[0m" -#ifndef FASTOS_DEBUG static int debug_level = 0; -#endif bool color_highlight = false; bool verbose = false; diff --git a/searchsummary/src/tests/juniper/testenv.cpp b/searchsummary/src/tests/juniper/testenv.cpp index cc6a6458376..1f8f52d8766 100644 --- a/searchsummary/src/tests/juniper/testenv.cpp +++ b/searchsummary/src/tests/juniper/testenv.cpp @@ -26,11 +26,7 @@ TestEnv::TestEnv(int argc, char **argv, const char* propfile) : switch (c) { case 'd': -#ifdef FASTOS_DEBUG - debug_level = strtol(optarg, NULL, 0); -#else fprintf(stderr, "This version of Juniper compiled without debug\n"); -#endif break; case 'c': color_highlight = true; diff --git a/searchsummary/src/vespa/juniper/juniperdebug.h b/searchsummary/src/vespa/juniper/juniperdebug.h index d475134dae3..f6d4eda2c46 100644 --- a/searchsummary/src/vespa/juniper/juniperdebug.h +++ b/searchsummary/src/vespa/juniper/juniperdebug.h @@ -27,23 +27,10 @@ /* Logging to log object (juniperlog summary field) */ #define JL(level, stmt) do { if (_log_mask & level) { stmt; } } while (0) -#ifdef FASTOS_DEBUG -extern unsigned debug_level; -#define JD(level, stmt) do { if (debug_level & level) { stmt; } } while (0) -# warning "FASTOS_DEBUG is defined" - -/* Invariant checking */ - -#define JD_INVAR(level, condition, action, log) \ - do { if (!(condition)) { if (debug_level & level) { log; } action; } } while (0) -#else - #define JD_INVAR(level, condition, action, log) \ do { if (!(condition)) { action; } } while (0) #define JD(level, stmt) -#endif - template <class _container> void dump_list(_container& __c) { diff --git a/searchsummary/src/vespa/juniper/rpinterface.cpp b/searchsummary/src/vespa/juniper/rpinterface.cpp index 202b96a442d..afda82c1110 100644 --- a/searchsummary/src/vespa/juniper/rpinterface.cpp +++ b/searchsummary/src/vespa/juniper/rpinterface.cpp @@ -26,13 +26,6 @@ bool AnalyseCompatible(Config* conf1, Config* conf2) void SetDebug(unsigned int mask) { -#ifdef FASTOS_DEBUG - if (mask & ~1 && mask != debug_level) - LOG(info, "Juniper debug mode enabled (0x%x)", mask); - else if (! (debug_level & ~1)) - LOG(info, "Juniper debug mode disabled (0x%x)", mask); - debug_level = mask; -#else // Make sure we do not get 200 of these warnings per query.. static bool warning_printed = false; if (mask && !warning_printed) @@ -41,7 +34,6 @@ void SetDebug(unsigned int mask) "Juniper debug mode requested in binary compiled without debug support!"); warning_printed = true; } -#endif } diff --git a/searchsummary/src/vespa/juniper/tokenizer.cpp b/searchsummary/src/vespa/juniper/tokenizer.cpp index 9253f81cf25..1b58be2d451 100644 --- a/searchsummary/src/vespa/juniper/tokenizer.cpp +++ b/searchsummary/src/vespa/juniper/tokenizer.cpp @@ -40,7 +40,6 @@ void JuniperTokenizer::scan() { if (_registry == NULL) { // explicit prefetching seems to have negative effect with many threads - // FastOS_Prefetch::NT(const_cast<void *>((const void *)(src + 32))); src = _wordfolder->UCS4Tokenize(src, src_end, dst, dst_end, startpos, result_len); } else { const char * tmpSrc = _registry->tokenize(src, src_end, dst, dst_end, startpos, result_len); |