Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -10,3 +10,4 @@ rundb
runcl
3TS
3TS-DAI
contrib/deneva/obj/deps
2 changes: 1 addition & 1 deletion contrib/deneva/Makefile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
CC=/usr/local/bin/gcc10/bin/g++
CC=g++
CFLAGS=-Wall -Werror -std=c++17 -static-libstdc++ -g3 -ggdb -O0 -fno-strict-aliasing -fno-omit-frame-pointer -D_GLIBCXX_USE_CXX11_ABI=0 -static-libasan -fsanitize=address
#CFLAGS += -fsanitize=address -fno-stack-protector -fno-omit-frame-pointer
NNMSG=./nanomsg-0.5-beta
Expand Down
2 changes: 2 additions & 0 deletions contrib/deneva/client/client_main.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,9 @@ int main(int argc, char *argv[]) {
// spawn and run txns again.
starttime = get_server_clock();
simulation->run_starttime = starttime;
#if WORKLOAD == DA
simulation->last_da_query_time = starttime;
#endif
uint64_t id = 0;
for (uint64_t i = 0; i < thd_cnt; i++) {
#if SET_AFFINITY
Expand Down
269 changes: 0 additions & 269 deletions contrib/deneva/concurrency_control/dli.cpp

This file was deleted.

54 changes: 0 additions & 54 deletions contrib/deneva/concurrency_control/dli.h

This file was deleted.

1 change: 0 additions & 1 deletion contrib/deneva/concurrency_control/dta.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@
#include "../system/manager.h"
#include "../system/mem_alloc.h"
#include "../system/txn.h"
#include "dli.h"
#include "row_dta.h"

void get_rw_set(TxnManager* txn, std::list<dta_item>& rset, std::list<dta_item>& wset) {
Expand Down
Loading