Commit 563b484a authored by Paul Asmuth's avatar Paul Asmuth
Browse files

Merge branch 'fnordmetric2' of obelix.fnrd.net:paulbox/fnordmetric into fnordmetric2

parents 61d46389 074f2825

fnordmetric-core/src/sstable/sstablewriter.cc

+4 −0
Original line number Diff line number Diff line
@@ -142,6 +142,10 @@ void SSTableWriter::writeIndex(uint32_t index_type, void* data, size_t size) { 
    RAISE(kIllegalStateError, "table is immutable (alread finalized)");

  }



  if (size == 0) {

    return;

  }



  auto alloc = mmap_->allocPage(sizeof(BinaryFormat::FooterHeader) + size);

  auto page = mmap_->getPage(alloc, io::MmapPageManager::kNoPadding{});

fnordmetric-core/src/util/exceptionhandler.cc

+3 −2
Original line number Diff line number Diff line
@@ -36,10 +36,11 @@ void CatchAndAbortExceptionHandler::onException( 
  try {

    auto rte = dynamic_cast<const RuntimeException&>(error);

    rte.debugPrint();

  } catch (const std::exception& e) {

    fprintf(stderr, "Aborting...\n");

  } catch (const std::exception& cast_error) {

    fprintf(stderr, "foreign exception: %s\n", error.what());

  }



  fprintf(stderr, "Aborting...\n");

  abort(); // core dump if enabled

}

fnordmetric-core/src/util/inspect.cc

+6 −0
Original line number Diff line number Diff line
@@ -44,6 +44,12 @@ std::string inspect<long long>( 
  return std::to_string(value);

}



template <>

std::string inspect<long>(

    const long& value) {

  return std::to_string(value);

}



template <>

std::string inspect<float>(const float& value) {

  return std::to_string(value);

CRA Git | Maintained and supported by SUSTech CRA and CCSE