From c767ac1f7ed9999c0df66904765ce0382fd8f910 Mon Sep 17 00:00:00 2001
From: Irene Y Zhang <iyzhang@cs.washington.edu>
Date: Mon, 22 Jun 2015 18:04:39 -0700
Subject: [PATCH] fixing up compile errors in transport library and finishing
up porting
---
lib/configuration.cc | 6 +++---
lib/configuration.h | 2 +-
lib/latency.cc | 8 +++++---
lib/simtransport.cc | 10 ++++++----
lib/tests/configuration-test.cc | 2 +-
lib/tests/simtransport-test.cc | 8 ++++----
lib/transport.cc | 8 +++++---
lib/transport.h | 2 +-
8 files changed, 26 insertions(+), 20 deletions(-)
diff --git a/lib/configuration.cc b/lib/configuration.cc
index 963b656..08c7520 100644
--- a/lib/configuration.cc
+++ b/lib/configuration.cc
@@ -29,9 +29,9 @@
*
**********************************************************************/
-#include "paxos-lib/lib/assert.h"
-#include "paxos-lib/lib/configuration.h"
-#include "paxos-lib/lib/message.h"
+#include "lib/assert.h"
+#include "lib/configuration.h"
+#include "lib/message.h"
#include <iostream>
#include <fstream>
diff --git a/lib/configuration.h b/lib/configuration.h
index 391ef7b..c6b0055 100644
--- a/lib/configuration.h
+++ b/lib/configuration.h
@@ -32,7 +32,7 @@
#ifndef _LIB_CONFIGURATION_H_
#define _LIB_CONFIGURATION_H_
-#include "paxos-lib/lib/viewstamp.h"
+#include "replication/vr/viewstamp.h"
#include <fstream>
#include <stdbool.h>
diff --git a/lib/latency.cc b/lib/latency.cc
index b2a6dce..1b6a533 100644
--- a/lib/latency.cc
+++ b/lib/latency.cc
@@ -4,7 +4,9 @@
* latency.cc:
* latency profiling functions
*
- * Copyright 2013 Dan R. K. Ports <drkp@cs.washington.edu>
+ * Copyright 2013-2015 Irene Zhang <iyzhang@cs.washington.edu>
+ * Naveen Kr. Sharma <nksharma@cs.washington.edu>
+ * Dan R. K. Ports <drkp@cs.washington.edu>
* Copyright 2009-2012 Massachusetts Institute of Technology
*
* Permission is hereby granted, free of charge, to any person
@@ -40,8 +42,8 @@
#include <iostream>
#include <fstream>
-#include "paxos-lib/lib/message.h"
-#include "paxos-lib/lib/latency-format.pb.h"
+#include "lib/message.h"
+#include "lib/latency-format.pb.h"
static struct Latency_t *latencyHead;
diff --git a/lib/simtransport.cc b/lib/simtransport.cc
index ce79c3a..743dfa1 100644
--- a/lib/simtransport.cc
+++ b/lib/simtransport.cc
@@ -4,7 +4,9 @@
* simtransport.cc:
* simulated message-passing interface for testing use
*
- * Copyright 2013 Dan R. K. Ports <drkp@cs.washington.edu>
+ * Copyright 2013-2015 Irene Zhang <iyzhang@cs.washington.edu>
+ * Naveen Kr. Sharma <nksharma@cs.washington.edu>
+ * Dan R. K. Ports <drkp@cs.washington.edu>
*
* Permission is hereby granted, free of charge, to any person
* obtaining a copy of this software and associated documentation
@@ -28,9 +30,9 @@
*
**********************************************************************/
-#include "paxos-lib/lib/assert.h"
-#include "paxos-lib/lib/message.h"
-#include "paxos-lib/lib/simtransport.h"
+#include "lib/assert.h"
+#include "lib/message.h"
+#include "lib/simtransport.h"
#include <google/protobuf/message.h>
SimulatedTransportAddress::SimulatedTransportAddress(int addr)
diff --git a/lib/tests/configuration-test.cc b/lib/tests/configuration-test.cc
index 485c895..5a9a18a 100644
--- a/lib/tests/configuration-test.cc
+++ b/lib/tests/configuration-test.cc
@@ -28,7 +28,7 @@
*
**********************************************************************/
-#include "paxos-lib/lib/configuration.h"
+#include "lib/configuration.h"
#include <gtest/gtest.h>
diff --git a/lib/tests/simtransport-test.cc b/lib/tests/simtransport-test.cc
index d3387a5..fbce3ad 100644
--- a/lib/tests/simtransport-test.cc
+++ b/lib/tests/simtransport-test.cc
@@ -28,10 +28,10 @@
*
**********************************************************************/
-#include "paxos-lib/lib/configuration.h"
-#include "paxos-lib/lib/message.h"
-#include "paxos-lib/lib/simtransport.h"
-#include "paxos-lib/lib/tests/simtransport-testmessage.pb.h"
+#include "lib/configuration.h"
+#include "lib/message.h"
+#include "lib/simtransport.h"
+#include "lib/tests/simtransport-testmessage.pb.h"
#include <gtest/gtest.h>
diff --git a/lib/transport.cc b/lib/transport.cc
index d38c6ee..1c00df4 100644
--- a/lib/transport.cc
+++ b/lib/transport.cc
@@ -4,7 +4,9 @@
* transport.cc:
* message-passing network interface; common definitions
*
- * Copyright 2013 Dan R. K. Ports <drkp@cs.washington.edu>
+ * Copyright 2013-2015 Irene Zhang <iyzhang@cs.washington.edu>
+ * Naveen Kr. Sharma <nksharma@cs.washington.edu>
+ * Dan R. K. Ports <drkp@cs.washington.edu>
*
* Permission is hereby granted, free of charge, to any person
* obtaining a copy of this software and associated documentation
@@ -28,8 +30,8 @@
*
**********************************************************************/
-#include "paxos-lib/lib/assert.h"
-#include "paxos-lib/lib/transport.h"
+#include "lib/assert.h"
+#include "lib/transport.h"
TransportReceiver::~TransportReceiver()
{
diff --git a/lib/transport.h b/lib/transport.h
index 4d282e4..c725e57 100644
--- a/lib/transport.h
+++ b/lib/transport.h
@@ -31,7 +31,7 @@
#ifndef _LIB_TRANSPORT_H_
#define _LIB_TRANSPORT_H_
-#include "paxos-lib/lib/configuration.h"
+#include "lib/configuration.h"
#include <google/protobuf/message.h>
#include <functional>
--
GitLab