Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
134 commits
Select commit Hold shift + click to select a range
f38654a
microLB: Add extra asserts in waiting list
fwsGonzo Nov 20, 2018
f426b6c
test: Make microLB test send 50Mb strings
fwsGonzo Nov 25, 2018
565afc7
tcp: Change RCV WND value from a static value to a dynamic value base…
AndreasAakesson Nov 27, 2018
86e30fe
microLB: Remove session timeouts, close_session properly
fwsGonzo Nov 27, 2018
974847c
microLB: Option to disable active checks
fwsGonzo Nov 27, 2018
ac453cf
Merge branch 'tcp_rcvwnd' of github.com:AndreasAakesson/IncludeOS int…
fwsGonzo Nov 28, 2018
069dae5
tcp: minor changes to window scaling
alfreb Nov 28, 2018
d939be1
Merge branch 'tcp_rcvwnd' of github.com:AndreasAakesson/IncludeOS int…
fwsGonzo Nov 28, 2018
55ecd13
tcp: Assert on size to avoid overshooting buffer
fwsGonzo Nov 28, 2018
ac3c07f
stream: Add transport_bottom() to get the outermost stream
fwsGonzo Nov 28, 2018
d3d20c7
Connect TCP recv window handlers between in/out on sessions
fwsGonzo Nov 28, 2018
c63ed14
openssl: More feedback on failing certs/keys
fwsGonzo Nov 28, 2018
5dedaac
microlb: change send queue warning from full to empty
alfreb Nov 29, 2018
db8f4d6
util: added std::pmr resource pool
alfreb Nov 30, 2018
75450c8
mem: Refactor OS to use pmr vector as buffer_t for most facilities
AndreasAakesson Nov 30, 2018
fcf7637
pmr: refactor full / empty + minor changes
alfreb Nov 30, 2018
7323b68
Merge branch 'v0.13.x' of github.com:alfred-bratterud/IncludeOS into …
AndreasAakesson Nov 30, 2018
0b6fde7
util: Make it possible to default construct pmr alloc
AndreasAakesson Nov 30, 2018
660790e
tcp: Support custom allocators for read buffers
AndreasAakesson Dec 3, 2018
be81d21
tcp: WIP different approaches for adjusting receive window
alfreb Dec 3, 2018
6ce443c
PMR: fix an issue with resource counting
alfreb Dec 3, 2018
86982db
Merge branch 'lbfix' of github.com:fwsGonzo/IncludeOS into v0.13.x
alfreb Dec 4, 2018
1671385
microLB: Signal home only when something changed
fwsGonzo Dec 4, 2018
bcb6d73
microLB: Prune dead clients before connecting out, and show active co…
fwsGonzo Dec 4, 2018
a6cba3c
microLB: Fix some printouts after cherry-pick
fwsGonzo Dec 4, 2018
b0a6265
Merge branch 'v0.13.x' of github.com:fwsGonzo/IncludeOS into v0.13.x
alfreb Dec 4, 2018
d34779c
tcp: add getter for mempool
alfreb Dec 5, 2018
159869a
tcp: reset recv_wnd_getter with reset_callbacks / cleanup
alfreb Dec 5, 2018
bff3d76
pmr: implement allocations / deallocations counter
alfreb Dec 5, 2018
9641e46
microlb: add on_close for new waiting
alfreb Dec 5, 2018
57d9405
test: update pmr test, allow 4b alignment for test memalign
alfreb Dec 5, 2018
89f4aa4
tcp: Replace global rcv wnd getter with one based on the connections …
AndreasAakesson Dec 5, 2018
97eb09a
Merge branch 'tcp_rcvwnd' of github.com:AndreasAakesson/IncludeOS int…
alfreb Dec 5, 2018
da87ce7
tcp: avoid using delegate by default for receive window calculation
alfreb Dec 5, 2018
cf1cd14
examples: Add a TCP-to-TCP transfer example
fwsGonzo Dec 5, 2018
dfa9c4e
pmr: add on_non_full event to notify when not full anymore
alfreb Dec 6, 2018
d439ec0
Merge branch '0.13.x' of github.com:KristianJerpetjon/IncludeOS into …
AndreasAakesson Dec 6, 2018
8393490
Merge branch '0.13.x' of github.com:KristianJerpetjon/IncludeOS into …
alfreb Dec 6, 2018
fc56de0
tcp: Fixed SND ack comparison
KristianJerpetjon Dec 6, 2018
c865b20
tcp: removed uneccesary old print
KristianJerpetjon Dec 6, 2018
5512518
Merge branch '0.13.x' of github.com:KristianJerpetjon/IncludeOS into …
alfreb Dec 6, 2018
d22f68c
Merge branch '0.13.x' of github.com:KristianJerpetjon/IncludeOS into …
alfreb Dec 6, 2018
461343d
Merge pull request #2003 from KristianJerpetjon/0.13.x
alfreb Dec 6, 2018
4ddb164
Merge branch 'v0.13.x' of https://github.com/hioa-cs/IncludeOS into v…
alfreb Dec 6, 2018
2a5af62
tcp: Calc rcv wnd more frequent etc
AndreasAakesson Dec 6, 2018
07b1a3b
Merge branch '0.13.x' of github.com:KristianJerpetjon/IncludeOS into …
AndreasAakesson Dec 6, 2018
629e6ca
Merge branch 'v0.13.x' of github.com:alfred-bratterud/IncludeOS into …
alfreb Dec 6, 2018
1e9612f
Merge branch 'tcp_rcvwnd' of github.com:AndreasAakesson/IncludeOS int…
alfreb Dec 6, 2018
421d897
tcp: WIP move drop on rcv-win closed and allow window updates when cl…
alfreb Dec 6, 2018
a3093fe
test: TCP circle of evil
alfreb Dec 6, 2018
c6e0079
liveupdate: allocate new memory resource on deserialize connection
alfreb Dec 7, 2018
fbbc1a1
microlb: give default to new ctor param to preserve API
alfreb Dec 7, 2018
57d11b8
tcp: update rcv win on all dropped packets
alfreb Dec 7, 2018
26f1b9a
tcp: update receive window on all acks, avoid silly windows
alfreb Dec 7, 2018
b10f96b
microlb: use TCP's internal receive window calculations
alfreb Dec 7, 2018
0b44040
Merge branch 'v0.13.x' of github.com:fwsGonzo/IncludeOS into v0.13.x
fwsGonzo Dec 7, 2018
2a5396b
tcp: SSSE3 checksum algo added alongside AVX need -mssse3 for it to b…
KristianJerpetjon Dec 7, 2018
a32d6eb
Merge branch '0.13.x' of github.com:KristianJerpetjon/IncludeOS into …
alfreb Dec 8, 2018
506b3fa
tcp: return early if connection couldn't be established
alfreb Dec 11, 2018
2f44d2b
test: add stats printing for lb test
alfreb Dec 11, 2018
3c8ec30
pmr: avoid giving whole pool to a single resource
alfreb Dec 11, 2018
75497dc
tcp: flush mem on time-wait, abort when no memory etc.
alfreb Dec 11, 2018
1a788bd
test: Link with experimental lib when clang apple
AndreasAakesson Dec 12, 2018
a8b3475
tcp: Only increase rtx attempts on rtx timeout
AndreasAakesson Dec 13, 2018
729f32b
test: update pmr test to reflect division factor
alfreb Dec 13, 2018
ca0bd7d
test: add back MSL timeout to microlb test
alfreb Dec 13, 2018
acbe909
tcp: shared ptr cleanup magic
AndreasAakesson Dec 13, 2018
0caa610
Merge branch 'tcp_rcvwnd' of github.com:AndreasAakesson/IncludeOS int…
alfreb Dec 13, 2018
c6e9ebf
tcp: Don't use shared ptr when cleaning up
AndreasAakesson Dec 13, 2018
c270d4b
Merge branch 'tcp_rcvwnd' of github.com:AndreasAakesson/IncludeOS int…
alfreb Dec 13, 2018
6e99a2e
test: update stress test to handle new arping API
alfreb Dec 13, 2018
41631ee
pmr: add on_avail event for notification of allocatable >= N
alfreb Dec 14, 2018
d640be0
tcp: Avoid bug when ts get lost by reparsing if lost, trigger window …
AndreasAakesson Dec 15, 2018
c94cf30
Merge branch 'v0.13.x' of github.com:alfred-bratterud/IncludeOS into …
AndreasAakesson Dec 15, 2018
ebc56aa
tcp: Change trigger send window event to avail
AndreasAakesson Dec 15, 2018
6fa9617
net: remove wrong endif from new checksum.cpp
alfreb Dec 17, 2018
b45230c
Merge branch 'v0.13.x' of github.com:alfred-bratterud/IncludeOS into …
alfreb Dec 17, 2018
6b00d25
Merge branch 'tcp_rcvwnd' of github.com:AndreasAakesson/IncludeOS int…
alfreb Dec 17, 2018
04deec3
microlb: removed code that closed connection once buffer limit of 8k …
KristianJerpetjon Dec 17, 2018
b01d4de
Merge pull request #9 from KristianJerpetjon/tcp_rcvwnd
AndreasAakesson Dec 18, 2018
c22072d
Merge branch 'tcp_rcvwnd' of github.com:AndreasAakesson/IncludeOS int…
alfreb Dec 18, 2018
39d538e
tcp: Avoid wrap in seq num check, reparse TS if missing
AndreasAakesson Dec 18, 2018
43d4344
Merge branch 'tcp_rcvwnd' of github.com:AndreasAakesson/IncludeOS int…
AndreasAakesson Dec 18, 2018
4debeac
net: added function to check if a buffer has unhandled data to check …
KristianJerpetjon Dec 18, 2018
d6b28af
microlb: wrong ordering between flush and session create caused out o…
KristianJerpetjon Dec 18, 2018
e1f2fb1
Merge pull request #10 from KristianJerpetjon/tcp_rcvwnd
AndreasAakesson Dec 18, 2018
72cf163
Merge branch 'tcp_rcvwnd' of github.com:AndreasAakesson/IncludeOS int…
alfreb Dec 20, 2018
079e8e4
tcp: added some debugging prints, remove later
AndreasAakesson Dec 20, 2018
9d89358
Merge branch 'tcp_rcvwnd' of github.com:AndreasAakesson/IncludeOS int…
AndreasAakesson Dec 20, 2018
6f7c159
tcp: comment out some debugging
AndreasAakesson Jan 4, 2019
ae0b58e
Correct connection tracking cherry picked from ipv6
KristianJerpetjon Jan 6, 2019
74a5a6e
tcp: add on_data event with sync read. WIP.
alfreb Jan 8, 2019
bc7ad77
net::Stream: add on_data & friends. WIP.
alfreb Jan 8, 2019
3f94857
tcp: allow buffer reuse and pop completed after pushing to on_read
alfreb Jan 8, 2019
7e56f12
refactor: Moved tls from header to source code
KristianJerpetjon Jan 8, 2019
cea1161
Merge remote-tracking branch 'alfred/v0.13.x' into 0.13.x
KristianJerpetjon Jan 8, 2019
7ec4f5b
0.13.x: Created StreamBuffer to wrap Stream and refactor out parts of…
KristianJerpetjon Jan 10, 2019
1b87519
pmr: make default resource throw on failure
alfreb Jan 11, 2019
4317157
typo: violated address
alfreb Jan 11, 2019
6a95e51
microlb: Timer event to handle congestion
KristianJerpetjon Jan 11, 2019
4893912
Merge remote-tracking branch 'alfred/v0.13.x' into 0.13.x
KristianJerpetjon Jan 11, 2019
2c112ee
0.13.x: Cleaned up code
KristianJerpetjon Jan 14, 2019
5d66015
test: improved server.js so that it can generate file size on request
KristianJerpetjon Jan 14, 2019
d0318e7
microlb: deferred destruction of stream elements
KristianJerpetjon Jan 14, 2019
28347fe
tls_streams: further hardening of m_busy.
KristianJerpetjon Jan 14, 2019
2eefdb1
tls_streams: further hardening of m_busy.
KristianJerpetjon Jan 14, 2019
ba7384d
Merge branch 'v0.13.x' of https://github.com/alfred-bratterud/Include…
KristianJerpetjon Jan 15, 2019
1f71b32
Merge branch '0.13.x' of https://github.com/KristianJerpetjon/Include…
KristianJerpetjon Jan 15, 2019
b6b381d
0.13.x: if reset callbacks is called in loop exit
KristianJerpetjon Jan 15, 2019
21c3c28
0.13.x: if reset callbacks is called in loop exit
KristianJerpetjon Jan 15, 2019
8f38456
Merge branch '0.13.x' of https://github.com/KristianJerpetjon/Include…
KristianJerpetjon Jan 16, 2019
1e33fb1
Merge branch '0.13.x' of github.com:KristianJerpetjon/IncludeOS into …
AndreasAakesson Jan 17, 2019
6ae0fc9
pmr: Don't promise more capacity than whats actually remaining in pool
AndreasAakesson Jan 18, 2019
08a8a28
tcp: Throw exception when trying to connect if not enough resource mem
AndreasAakesson Jan 18, 2019
1b7b646
microlb: Handle exception when connect and terminate hack for unused …
AndreasAakesson Jan 18, 2019
27fd8af
misc: removed some dead code
AndreasAakesson Jan 18, 2019
03b3017
Merge pull request #1 from AndreasAakesson/tcp_rcvwnd
KristianJerpetjon Jan 18, 2019
e3a098c
Merge pull request #9 from KristianJerpetjon/0.13.x
alfreb Jan 18, 2019
d4f295f
net: Remove namespace from call to ntohs for building unittest on mac
AndreasAakesson Jan 21, 2019
73e5f23
test: Update tcp read request test to reflect changes to API
AndreasAakesson Jan 21, 2019
0081283
net: removed unicode char in stream buffer code
AndreasAakesson Jan 21, 2019
82b0219
pmr: return subcap if set
AndreasAakesson Jan 21, 2019
1db1523
net: Flush data in stream buffer when handler is set
AndreasAakesson Jan 22, 2019
afc9044
microlb: Replace lambda with member functions
AndreasAakesson Jan 22, 2019
9cfc81e
test: Increase memory for microLB test
AndreasAakesson Jan 22, 2019
a181276
microlb: Add try/catch to avoid silently invalidating the client queue
fwsGonzo Jan 22, 2019
1f59bc0
Merge with Andreas v0.13.x
fwsGonzo Jan 22, 2019
dcfdbaa
microlb: Remove reference to readq
fwsGonzo Jan 22, 2019
6a5f8a5
Test: Set a timeout for microlb get connection
mnordsletten Jan 22, 2019
03fccd6
Merge pull request #11 from mnordsletten/xx
AndreasAakesson Jan 22, 2019
b94c9f7
Merge branch 'tcp_rcvwnd' of github.com:AndreasAakesson/IncludeOS int…
AndreasAakesson Jan 22, 2019
948f230
posix: Fix TCP posix hanging when data and FIN is recv right after ea…
AndreasAakesson Jan 22, 2019
39a3790
Merge pull request #10 from AndreasAakesson/tcp_rcvwnd
alfreb Jan 22, 2019
cc87322
Merge pull request #1999 from alfred-bratterud/v0.13.x
KristianJerpetjon Jan 22, 2019
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
5 changes: 3 additions & 2 deletions api/fs/common.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@

#include <memory>
#include <string>
#include <pmr>
#include <vector>
#include "path.hpp"
#include <common>
Expand All @@ -35,12 +36,12 @@ namespace fs {
/**
* @brief Shared vector used as a buffer within the filesystem subsystem
*/
using buffer_t = std::shared_ptr<std::vector<uint8_t>>;
using buffer_t = os::mem::buf_ptr;

/** Construct a shared vector **/
template <typename... Args>
buffer_t construct_buffer(Args&&... args) {
return std::make_shared<std::vector<uint8_t>> (std::forward<Args> (args)...);
return std::make_shared<os::mem::buffer> (std::forward<Args> (args)...);
}

/** Container types **/
Expand Down
5 changes: 3 additions & 2 deletions api/hw/block_device.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
#include <cstdint>
#include <delegate>
#include <memory>
#include <pmr>
#include <vector>

namespace hw {
Expand All @@ -32,7 +33,7 @@ namespace hw {
class Block_device {
public:
using block_t = uint64_t;
using buffer_t = std::shared_ptr<std::vector<uint8_t>>;
using buffer_t = os::mem::buf_ptr;
using on_read_func = delegate<void(buffer_t)>;
using on_write_func = delegate<void(bool error)>;

Expand Down Expand Up @@ -149,7 +150,7 @@ class Block_device {
* This functionality is not enabled by default, nor always supported
**/
virtual void write(block_t blk, buffer_t, on_write_func) = 0;

virtual bool write_sync(block_t blk, buffer_t) = 0;

/**
Expand Down
12 changes: 12 additions & 0 deletions api/net/botan/tls_server.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,18 @@ class Server : public Botan::TLS::Callbacks, public net::Stream
m_transport->on_read(bs, {this, &Server::tls_read});
this->m_on_read = cb;
}
void on_data(DataCallback cb) override {
// FIXME
throw std::runtime_error("on_data not implemented on botan::server");
}
size_t next_size() override {
// FIXME
throw std::runtime_error("next_size not implemented on botan::server");
}
buffer_t read_next() override {
// FIXME
throw std::runtime_error("read_next not implemented on botan::server");
}
void on_write(WriteCallback cb) override {
this->m_on_write = cb;
}
Expand Down
Loading