aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--CMakeLists.txt2
-rw-r--r--README.md6
-rw-r--r--icnet/ccnx/icnet_ccnx_local_connector.h2
-rw-r--r--icnet/ccnx/icnet_ccnx_portal.h2
-rw-r--r--icnet/transport/icnet_transport_vegas.cc3
5 files changed, 8 insertions, 7 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9e98174c..5e3320a2 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -74,7 +74,7 @@ find_package(Boost 1.54.0 COMPONENTS system REQUIRED)
include_directories(SYSTEM ${Boost_INCLUDE_DIR})
set(CMAKE_VERBOSE_MAKEFILE off)
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -Wall -fpermissive")
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -Wall -fpermissive -O3")
set(LIBRARIES
${CCNX_PORTAL_LIBRARIES}
diff --git a/README.md b/README.md
index b65e9c08..9ab72419 100644
--- a/README.md
+++ b/README.md
@@ -9,6 +9,7 @@ Dependencies
- libboost-system-dev
- libparc
- libccnx-common
+- libccnx-transport-rta
- long-bow
Build the library
@@ -17,11 +18,16 @@ Build the library
For building the library, from the root folder of the project:
```bash
+ $ git clone -b libicnet/master https://gerrit.fd.io/r/cicn libicnet
+ $ cd libicnet
$ mkdir build && cd build
$ cmake ..
$ make
```
+The library should be compiled with a level of optimization >= 2, in order to achieve better performances. The CMakeFile.txt
+already specifies a level of optimization of 3. To change it (for debugging) just modify the CMakeFile.txt.
+
If you do not want to build the tools:
```bash
diff --git a/icnet/ccnx/icnet_ccnx_local_connector.h b/icnet/ccnx/icnet_ccnx_local_connector.h
index b08d1c5a..2181df96 100644
--- a/icnet/ccnx/icnet_ccnx_local_connector.h
+++ b/icnet/ccnx/icnet_ccnx_local_connector.h
@@ -26,8 +26,6 @@ extern "C" {
#include <ccnx/common/ccnx_Interest.h>
#include <ccnx/common/ccnx_ContentObject.h>
#include <parc/security/parc_Security.h>
-#include <ccnx/api/ccnx_Portal/ccnx_Portal.h>
-#include <ccnx/api/ccnx_Portal/ccnx_PortalRTA.h>
#include <ccnx/common/codec/schema_v1/ccnxCodecSchemaV1_PacketEncoder.h>
};
diff --git a/icnet/ccnx/icnet_ccnx_portal.h b/icnet/ccnx/icnet_ccnx_portal.h
index 5076fcd9..9ccc4bc6 100644
--- a/icnet/ccnx/icnet_ccnx_portal.h
+++ b/icnet/ccnx/icnet_ccnx_portal.h
@@ -26,8 +26,6 @@
#include <future>
extern "C" {
-#include <ccnx/api/ccnx_Portal/ccnx_Portal.h>
-#include <ccnx/api/ccnx_Portal/ccnx_PortalRTA.h>
#include <ccnx/api/control/cpi_Acks.h>
#include <ccnx/common/ccnx_ContentObject.h>
#include <parc/security/parc_Security.h>
diff --git a/icnet/transport/icnet_transport_vegas.cc b/icnet/transport/icnet_transport_vegas.cc
index 166e4ef0..b64678f7 100644
--- a/icnet/transport/icnet_transport_vegas.cc
+++ b/icnet/transport/icnet_transport_vegas.cc
@@ -208,8 +208,7 @@ void VegasTransportProtocol::decreaseWindow() {
void VegasTransportProtocol::increaseWindow() {
double max_window_size = -1;
socket_->getSocketOption(MAX_WINDOW_SIZE, max_window_size);
- if (current_window_size_ < max_window_size) // don't expand window above max level
- {
+ if (current_window_size_ < max_window_size) {
current_window_size_++;
socket_->setSocketOption(CURRENT_WINDOW_SIZE, current_window_size_);
}