diff options
| author | yoda <[email protected]> | 2022-02-10 16:50:00 +0300 | 
|---|---|---|
| committer | Daniil Cherednik <[email protected]> | 2022-02-10 16:50:00 +0300 | 
| commit | 86ac2045bfe9733d3396425a6ecade74c11ac489 (patch) | |
| tree | 5d5cb817648f650d76cf1076100726fd9b8448e8 /library/cpp | |
| parent | ddd64736134d6d92b80a934c8cf8228944ee4236 (diff) | |
Restoring authorship annotation for <[email protected]>. Commit 2 of 2.
Diffstat (limited to 'library/cpp')
| -rw-r--r-- | library/cpp/getopt/small/last_getopt_support.h | 4 | ||||
| -rw-r--r-- | library/cpp/getopt/ut/last_getopt_ut.cpp | 28 | ||||
| -rw-r--r-- | library/cpp/on_disk/chunks/chunked_helpers.cpp | 96 | ||||
| -rw-r--r-- | library/cpp/on_disk/chunks/chunked_helpers.h | 34 | ||||
| -rw-r--r-- | library/cpp/testing/unittest/utmain.cpp | 50 | 
5 files changed, 106 insertions, 106 deletions
diff --git a/library/cpp/getopt/small/last_getopt_support.h b/library/cpp/getopt/small/last_getopt_support.h index 48ae33b23ac..17bed3e614e 100644 --- a/library/cpp/getopt/small/last_getopt_support.h +++ b/library/cpp/getopt/small/last_getopt_support.h @@ -111,7 +111,7 @@ namespace NLastGetopt {          private:              TpTarget* Target_;              const TpFunc Func_; -  +          public:              TStoreMappedResultFunctor(TpTarget* target, const TpFunc& func)                  : Target_(target) @@ -123,7 +123,7 @@ namespace NLastGetopt {                  *Target_ = Func_(val);              }          }; -  +          template <typename T, typename TpVal = T>          class TStoreValueFunctor {              T* Target; diff --git a/library/cpp/getopt/ut/last_getopt_ut.cpp b/library/cpp/getopt/ut/last_getopt_ut.cpp index 57e5d7dc3f1..c99a1d053d1 100644 --- a/library/cpp/getopt/ut/last_getopt_ut.cpp +++ b/library/cpp/getopt/ut/last_getopt_ut.cpp @@ -437,23 +437,23 @@ Y_UNIT_TEST_SUITE(TLastGetoptTests) {      }      Y_UNIT_TEST(TestStoreValue) { -        int a = 0, b = 0;  -        size_t c = 0;  -        EHasArg e = NO_ARGUMENT;  -  +        int a = 0, b = 0; +        size_t c = 0; +        EHasArg e = NO_ARGUMENT; +          TOptsNoDefault opts; -        opts.AddLongOption('a', "alpha").NoArgument().StoreValue(&a, 42);  -        opts.AddLongOption('b', "beta").NoArgument().StoreValue(&b, 24);  -        opts.AddLongOption('e', "enum").NoArgument().StoreValue(&e, REQUIRED_ARGUMENT).StoreValue(&c, 12345);  -  +        opts.AddLongOption('a', "alpha").NoArgument().StoreValue(&a, 42); +        opts.AddLongOption('b', "beta").NoArgument().StoreValue(&b, 24); +        opts.AddLongOption('e', "enum").NoArgument().StoreValue(&e, REQUIRED_ARGUMENT).StoreValue(&c, 12345); +          TOptsParseResultTestWrapper r(&opts, V({"cmd", "-a", "-e"})); -  -        UNIT_ASSERT_VALUES_EQUAL(42, a);  -        UNIT_ASSERT_VALUES_EQUAL(0, b);  -        UNIT_ASSERT(e == REQUIRED_ARGUMENT);  + +        UNIT_ASSERT_VALUES_EQUAL(42, a); +        UNIT_ASSERT_VALUES_EQUAL(0, b); +        UNIT_ASSERT(e == REQUIRED_ARGUMENT);          UNIT_ASSERT_VALUES_EQUAL(12345u, c); -    }  -  +    } +      Y_UNIT_TEST(TestSetFlag) {          bool a = false, b = true, c = false, d = true; diff --git a/library/cpp/on_disk/chunks/chunked_helpers.cpp b/library/cpp/on_disk/chunks/chunked_helpers.cpp index b3aa5c8234c..b7adba27535 100644 --- a/library/cpp/on_disk/chunks/chunked_helpers.cpp +++ b/library/cpp/on_disk/chunks/chunked_helpers.cpp @@ -9,59 +9,59 @@ TBlob GetBlock(const TBlob& blob, size_t index) {      size_t begin = (const char*)reader.GetBlock(index) - (const char*)blob.Data();      return blob.SubBlob(begin, begin + reader.GetBlockLen(index));  } -  -/*************************** TNamedChunkedDataReader ***************************/  -  + +/*************************** TNamedChunkedDataReader ***************************/ +  static const char* NamedChunkedDataMagic = "NamedChunkedData"; -  +  TNamedChunkedDataReader::TNamedChunkedDataReader(const TBlob& blob)      : TChunkedDataReader(blob) -{  -    if (TChunkedDataReader::GetBlocksCount() < 1)  -        throw yexception() << "Too few blocks";  -  -    size_t block = TChunkedDataReader::GetBlocksCount() - 1;  -    size_t magicLen = strlen(NamedChunkedDataMagic);  -    if (GetBlockLen(block) < magicLen || memcmp(GetBlock(block), NamedChunkedDataMagic, magicLen) != 0)  -        throw yexception() << "Not a valid named chunked data file";  -  +{ +    if (TChunkedDataReader::GetBlocksCount() < 1) +        throw yexception() << "Too few blocks"; + +    size_t block = TChunkedDataReader::GetBlocksCount() - 1; +    size_t magicLen = strlen(NamedChunkedDataMagic); +    if (GetBlockLen(block) < magicLen || memcmp(GetBlock(block), NamedChunkedDataMagic, magicLen) != 0) +        throw yexception() << "Not a valid named chunked data file"; +      TMemoryInput input(static_cast<const char*>(GetBlock(block)) + magicLen, GetBlockLen(block) - magicLen); -    Load(&input, Names);  -  -    size_t index = 0;  +    Load(&input, Names); + +    size_t index = 0;      for (TVector<TString>::const_iterator it = Names.begin(); it != Names.end(); ++it, ++index) { -        if (!it->empty())  -            NameToIndex[*it] = index;  -    }  -}  -  -/*************************** TNamedChunkedDataWriter ***************************/  -  +        if (!it->empty()) +            NameToIndex[*it] = index; +    } +} + +/*************************** TNamedChunkedDataWriter ***************************/ +  TNamedChunkedDataWriter::TNamedChunkedDataWriter(IOutputStream& slave) -    : TChunkedDataWriter(slave)  -{  -}  -  +    : TChunkedDataWriter(slave) +{ +} +  TNamedChunkedDataWriter::~TNamedChunkedDataWriter() { -}  -  -void TNamedChunkedDataWriter::NewBlock() {  -    NewBlock("");  -}  -  +} + +void TNamedChunkedDataWriter::NewBlock() { +    NewBlock(""); +} +  void TNamedChunkedDataWriter::NewBlock(const TString& name) { -    if (!name.empty()) {  -        if (NameToIndex.count(name) != 0)  -            throw yexception() << "Block name is not unique";  -        NameToIndex[name] = Names.size();  -    }  -    Names.push_back(name);  -    TChunkedDataWriter::NewBlock();  -}  -  -void TNamedChunkedDataWriter::WriteFooter() {  -    NewBlock("");  -    Write(NamedChunkedDataMagic);  -    Save(this, Names);  -    TChunkedDataWriter::WriteFooter();  -}  +    if (!name.empty()) { +        if (NameToIndex.count(name) != 0) +            throw yexception() << "Block name is not unique"; +        NameToIndex[name] = Names.size(); +    } +    Names.push_back(name); +    TChunkedDataWriter::NewBlock(); +} + +void TNamedChunkedDataWriter::WriteFooter() { +    NewBlock(""); +    Write(NamedChunkedDataMagic); +    Save(this, Names); +    TChunkedDataWriter::WriteFooter(); +} diff --git a/library/cpp/on_disk/chunks/chunked_helpers.h b/library/cpp/on_disk/chunks/chunked_helpers.h index a20bed1f62d..5fa96afdca0 100644 --- a/library/cpp/on_disk/chunks/chunked_helpers.h +++ b/library/cpp/on_disk/chunks/chunked_helpers.h @@ -453,34 +453,34 @@ void WriteBlock(TChunkedDataWriter& writer, T& t) {      t.Save(writer);  } -// Extends TChunkedDataWriter, allowing user to name blocks with arbitrary strings.  -class TNamedChunkedDataWriter: public TChunkedDataWriter {  +// Extends TChunkedDataWriter, allowing user to name blocks with arbitrary strings. +class TNamedChunkedDataWriter: public TChunkedDataWriter {  public:      TNamedChunkedDataWriter(IOutputStream& slave);      ~TNamedChunkedDataWriter() override; -  +      // Start a new unnamed block, overrides TChunkedDataReader::NewBlock().      void NewBlock(); -  +      // Start a new block with given name (possibly empty, in which case block is unnamed).      // Throws an exception if name is a duplicate.      void NewBlock(const TString& name); -  +      void WriteFooter(); -  +  private:      TVector<TString> Names;      THashMap<TString, size_t> NameToIndex; -};  -  +}; +  class TNamedChunkedDataReader: public TChunkedDataReader {  public:      TNamedChunkedDataReader(const TBlob& blob); -  +      inline bool HasBlock(const char* name) const {          return NameToIndex.find(name) != NameToIndex.end();      } -  +      inline size_t GetIndexByName(const char* name) const {          THashMap<TString, size_t>::const_iterator it = NameToIndex.find(name);          if (it == NameToIndex.end()) @@ -488,31 +488,31 @@ public:          else              return it->second;      } -  +      // Returns number of blocks written to the file by user of TNamedChunkedDataReader.      inline size_t GetBlocksCount() const {          // Last block is for internal usage          return TChunkedDataReader::GetBlocksCount() - 1;      } -  +      inline const char* GetBlockName(size_t index) const {          Y_ASSERT(index < GetBlocksCount());          return Names[index].data();      } -  +      inline const void* GetBlockByName(const char* name) const {          return GetBlock(GetIndexByName(name));      } -  +      inline size_t GetBlockLenByName(const char* name) const {          return GetBlockLen(GetIndexByName(name));      } -  +      inline TBlob GetBlobByName(const char* name) const {          size_t id = GetIndexByName(name);          return TBlob::NoCopy(GetBlock(id), GetBlockLen(id));      } -  +      inline bool GetBlobByName(const char* name, TBlob& blob) const {          THashMap<TString, size_t>::const_iterator it = NameToIndex.find(name);          if (it == NameToIndex.end()) @@ -524,7 +524,7 @@ public:  private:      TVector<TString> Names;      THashMap<TString, size_t> NameToIndex; -};  +};  template <class T>  struct TSaveLoadVectorNonPodElement { diff --git a/library/cpp/testing/unittest/utmain.cpp b/library/cpp/testing/unittest/utmain.cpp index 5a32064163b..305bc6b40fc 100644 --- a/library/cpp/testing/unittest/utmain.cpp +++ b/library/cpp/testing/unittest/utmain.cpp @@ -537,8 +537,8 @@ private:  const char* const TColoredProcessor::ForkCorrectExitMsg = "--END--"; -class TEnumeratingProcessor: public ITestSuiteProcessor {  -public:  +class TEnumeratingProcessor: public ITestSuiteProcessor { +public:      TEnumeratingProcessor(bool verbose, IOutputStream& stream) noexcept          : Verbose_(verbose)          , Stream_(stream) @@ -546,8 +546,8 @@ public:      }      ~TEnumeratingProcessor() override { -    }  -  +    } +      bool CheckAccess(TString name, size_t /*num*/) override {          if (Verbose_) {              return true; @@ -559,14 +559,14 @@ public:      bool CheckAccessTest(TString suite, const char* name) override {          Stream_ << suite << "::" << name << "\n"; -        return false;  -    }  +        return false; +    }  private:      bool Verbose_;      IOutputStream& Stream_; -};  -  +}; +  #ifdef _win_  class TWinEnvironment {  public: @@ -602,29 +602,29 @@ static const TWinEnvironment Instance;  static int DoList(bool verbose, IOutputStream& stream) {      TEnumeratingProcessor eproc(verbose, stream); -    TTestFactory::Instance().SetProcessor(&eproc);  -    TTestFactory::Instance().Execute();  -    return 0;  -}  -  -static int DoUsage(const char* progname) {  -    Cout << "Usage: " << progname << " [options] [[+|-]test]...\n\n"  -         << "Options:\n"  -         << "  -h, --help            print this help message\n"  -         << "  -l, --list            print a list of available tests\n"  +    TTestFactory::Instance().SetProcessor(&eproc); +    TTestFactory::Instance().Execute(); +    return 0; +} + +static int DoUsage(const char* progname) { +    Cout << "Usage: " << progname << " [options] [[+|-]test]...\n\n" +         << "Options:\n" +         << "  -h, --help            print this help message\n" +         << "  -l, --list            print a list of available tests\n"           << "  -A --list-verbose        print a list of available subtests\n"           << "  --print-before-test   print each test name before running it\n"           << "  --print-before-suite  print each test suite name before running it\n" -         << "  --show-fails          print a list of all failed tests at the end\n"  +         << "  --show-fails          print a list of all failed tests at the end\n"           << "  --dont-show-fails     do not print a list of all failed tests at the end\n"           << "  --continue-on-fail    print a message and continue running test suite instead of break\n"           << "  --print-times         print wall clock duration of each test\n"           << "  --fork-tests          run each test in a separate process\n"           << "  --trace-path          path to the trace file to be generated\n"           << "  --trace-path-append   path to the trace file to be appended\n"; -    return 0;  -}  -  +    return 0; +} +  #if defined(_linux_) && defined(CLANG_COVERAGE)  extern "C" int __llvm_profile_write_file(void); @@ -679,9 +679,9 @@ int NUnitTest::RunMain(int argc, char** argv) {              const char* name = argv[i];              if (name && *name) { -                if (strcmp(name, "--help") == 0 || strcmp(name, "-h") == 0) {  -                    return DoUsage(argv[0]);  -                } else if (strcmp(name, "--list") == 0 || strcmp(name, "-l") == 0) {  +                if (strcmp(name, "--help") == 0 || strcmp(name, "-h") == 0) { +                    return DoUsage(argv[0]); +                } else if (strcmp(name, "--list") == 0 || strcmp(name, "-l") == 0) {                      listTests = LIST;                  } else if (strcmp(name, "--list-verbose") == 0 || strcmp(name, "-A") == 0) {                      listTests = LIST_VERBOSE;  | 
