Skip to content
This repository has been archived by the owner on Sep 27, 2019. It is now read-only.

Commit

Permalink
Change logging & header files
Browse files Browse the repository at this point in the history
  • Loading branch information
Aaron Tian committed May 6, 2018
1 parent c6564d9 commit 5a73bcf
Show file tree
Hide file tree
Showing 3 changed files with 35 additions and 16 deletions.
22 changes: 11 additions & 11 deletions src/logging/log_util.cpp
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
/*-------------------------------------------------------------------------
*
* logger.h
* file description
*
* Copyright(c) 2015, CMU
*
* /peloton/src/backend/logging/logging_util.cpp
*
*-------------------------------------------------------------------------
*/
//===----------------------------------------------------------------------===//
//
// Peloton
//
// log_til.cpp
//
// Identification: src/logging/log_til.cpp
//
// Copyright (c) 2015-18, Carnegie Mellon University Database Group
//
//===----------------------------------------------------------------------===//

#include <sys/stat.h>
#include <dirent.h>
Expand Down
13 changes: 12 additions & 1 deletion src/logging/wal_recovery.cpp
Original file line number Diff line number Diff line change
@@ -1,7 +1,18 @@
//===----------------------------------------------------------------------===//
//
// Peloton
//
// wal_recovery.cpp
//
// Identification: src/logging/wal_recovery.cpp
//
// Copyright (c) 2015-18, Carnegie Mellon University Database Group
//
//===----------------------------------------------------------------------===//

#include <include/catalog/catalog.h>
#include "index/index_factory.h"

#include "catalog/catalog.h"
#include "catalog/index_catalog.h"
#include "catalog/column_catalog.h"
#include "catalog/table_catalog.h"
Expand Down
16 changes: 12 additions & 4 deletions src/threadpool/logger_queue_pool.cpp
Original file line number Diff line number Diff line change
@@ -1,16 +1,24 @@
//===----------------------------------------------------------------------===//
//
// Peloton
//
// logger_queue_pool.cpp
//
// Identification: src/threadpool/logger_queue_pool.cpp
//
// Copyright (c) 2015-18, Carnegie Mellon University Database Group
//
//===----------------------------------------------------------------------===//

#include "threadpool/logger_queue_pool.h"
#include "common/container/lock_free_queue.h"
#include "logging/wal_logger.h"
#include <exception>


namespace peloton{
namespace threadpool{



void LoggerFunc(std::atomic_bool *is_running, LoggerQueue *logger_queue) {
LOG_INFO("aaron: LoggerFunc");
constexpr auto kMinPauseTime = std::chrono::microseconds(1);
constexpr auto kMaxPauseTime = std::chrono::microseconds(1000);
auto pause_time = kMinPauseTime;
Expand Down

0 comments on commit 5a73bcf

Please sign in to comment.