Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
P
pistache
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Libraries
pistache
Commits
fc16ec32
Unverified
Commit
fc16ec32
authored
Dec 19, 2018
by
Dennis Jenkins
Committed by
GitHub
Dec 19, 2018
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #380 from xurxoham/test/#379
Add unit test to reproduce #379
parents
4600c150
d7bba510
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
67 additions
and
31 deletions
+67
-31
include/pistache/mailbox.h
include/pistache/mailbox.h
+28
-19
include/pistache/transport.h
include/pistache/transport.h
+1
-2
src/client/client.cc
src/client/client.cc
+3
-6
src/common/transport.cc
src/common/transport.cc
+2
-4
tests/CMakeLists.txt
tests/CMakeLists.txt
+1
-0
tests/mailbox_test.cc
tests/mailbox_test.cc
+32
-0
No files found.
include/pistache/mailbox.h
View file @
fc16ec32
...
...
@@ -155,6 +155,22 @@ public:
struct
Entry
{
friend
class
Queue
;
Entry
()
:
storage
(),
next
(
nullptr
)
{
}
template
<
class
U
>
Entry
(
U
&&
u
)
:
storage
(),
next
(
nullptr
)
{
new
(
&
storage
)
T
(
std
::
forward
<
U
>
(
u
));
}
~
Entry
()
=
default
;
const
T
&
data
()
const
{
return
*
reinterpret_cast
<
const
T
*>
(
&
storage
);
}
...
...
@@ -162,11 +178,6 @@ public:
T
&
data
()
{
return
*
reinterpret_cast
<
T
*>
(
&
storage
);
}
~
Entry
()
{
auto
*
d
=
reinterpret_cast
<
T
*>
(
&
storage
);
d
->~
T
();
}
private:
typedef
typename
std
::
aligned_storage
<
sizeof
(
T
),
alignof
(
T
)
>::
type
Storage
;
Storage
storage
;
...
...
@@ -184,18 +195,17 @@ public:
}
virtual
~
Queue
()
{
while
(
auto
*
e
=
pop
())
delete
e
;
while
(
!
empty
())
{
Entry
*
e
=
pop
();
e
->
data
().
~
T
();
delete
e
;
}
delete
tail
;
}
template
<
typename
U
>
Entry
*
allocEntry
(
U
&&
u
)
const
{
auto
*
e
=
new
Entry
;
new
(
&
e
->
storage
)
T
(
std
::
forward
<
U
>
(
u
));
return
e
;
}
void
push
(
Entry
*
entry
)
{
entry
->
next
=
nullptr
;
void
push
(
U
&&
u
)
{
Entry
*
entry
=
new
Entry
(
std
::
forward
<
U
>
(
u
));
// @Note: we're using SC atomics here (exchange will issue a full fence),
// but I don't think we should bother relaxing them for now
auto
*
prev
=
head
.
exchange
(
entry
);
...
...
@@ -215,9 +225,7 @@ public:
}
bool
empty
()
{
auto
*
res
=
tail
;
auto
*
next
=
res
->
next
.
load
(
std
::
memory_order_acquire
);
return
next
!=
nullptr
;
return
head
==
tail
;
}
std
::
unique_ptr
<
Entry
>
popSafe
()
{
...
...
@@ -261,8 +269,9 @@ public:
return
tag
;
}
void
push
(
Entry
*
entry
)
{
Queue
<
T
>::
push
(
entry
);
template
<
class
U
>
void
push
(
U
&&
u
)
{
Queue
<
T
>::
push
(
std
::
forward
<
U
>
(
u
));
if
(
isBound
())
{
uint64_t
val
=
1
;
...
...
include/pistache/transport.h
View file @
fc16ec32
...
...
@@ -46,8 +46,7 @@ public:
auto
detached
=
holder
.
detach
();
WriteEntry
write
(
std
::
move
(
deferred
),
detached
,
flags
);
write
.
peerFd
=
fd
;
auto
*
e
=
writesQueue
.
allocEntry
(
std
::
move
(
write
));
writesQueue
.
push
(
e
);
writesQueue
.
push
(
std
::
move
(
write
));
});
}
...
...
src/client/client.cc
View file @
fc16ec32
...
...
@@ -184,8 +184,7 @@ Transport::asyncConnect(const std::shared_ptr<Connection>& connection, const str
{
return
Async
::
Promise
<
void
>
([
=
](
Async
::
Resolver
&
resolve
,
Async
::
Rejection
&
reject
)
{
ConnectionEntry
entry
(
std
::
move
(
resolve
),
std
::
move
(
reject
),
connection
,
address
,
addr_len
);
auto
*
e
=
connectionsQueue
.
allocEntry
(
std
::
move
(
entry
));
connectionsQueue
.
push
(
e
);
connectionsQueue
.
push
(
std
::
move
(
entry
));
});
}
...
...
@@ -199,8 +198,7 @@ Transport::asyncSendRequest(
auto
ctx
=
context
();
RequestEntry
req
(
std
::
move
(
resolve
),
std
::
move
(
reject
),
connection
,
std
::
move
(
timer
),
std
::
move
(
buffer
));
if
(
std
::
this_thread
::
get_id
()
!=
ctx
.
thread
())
{
auto
*
e
=
requestsQueue
.
allocEntry
(
std
::
move
(
req
));
requestsQueue
.
push
(
e
);
requestsQueue
.
push
(
std
::
move
(
req
));
}
else
{
asyncSendRequestImpl
(
req
);
}
...
...
@@ -480,14 +478,13 @@ Connection::perform(
Connection
::
OnDone
onDone
)
{
return
Async
::
Promise
<
Response
>
([
=
](
Async
::
Resolver
&
resolve
,
Async
::
Rejection
&
reject
)
{
if
(
!
isConnected
())
{
auto
*
entry
=
requestsQueue
.
allocEntry
(
requestsQueue
.
push
(
RequestData
(
std
::
move
(
resolve
),
std
::
move
(
reject
),
request
,
timeout
,
std
::
move
(
onDone
)));
requestsQueue
.
push
(
entry
);
}
else
{
performImpl
(
request
,
timeout
,
std
::
move
(
resolve
),
std
::
move
(
reject
),
std
::
move
(
onDone
));
}
...
...
src/common/transport.cc
View file @
fc16ec32
...
...
@@ -49,8 +49,7 @@ Transport::handleNewPeer(const std::shared_ptr<Tcp::Peer>& peer) {
const
bool
isInRightThread
=
std
::
this_thread
::
get_id
()
==
ctx
.
thread
();
if
(
!
isInRightThread
)
{
PeerEntry
entry
(
peer
);
auto
*
e
=
peersQueue
.
allocEntry
(
entry
);
peersQueue
.
push
(
e
);
peersQueue
.
push
(
std
::
move
(
entry
));
}
else
{
handlePeer
(
peer
);
}
...
...
@@ -278,8 +277,7 @@ Transport::armTimerMs(
TimerEntry
entry
(
fd
,
value
,
std
::
move
(
deferred
));
if
(
!
isInRightThread
)
{
auto
*
e
=
timersQueue
.
allocEntry
(
std
::
move
(
entry
));
timersQueue
.
push
(
e
);
timersQueue
.
push
(
std
::
move
(
entry
));
}
else
{
armTimerMsImpl
(
std
::
move
(
entry
));
}
...
...
tests/CMakeLists.txt
View file @
fc16ec32
...
...
@@ -27,3 +27,4 @@ pistache_test(payload_test)
pistache_test
(
streaming_test
)
pistache_test
(
rest_server_test
)
pistache_test
(
string_view_test
)
pistache_test
(
mailbox_test
)
tests/mailbox_test.cc
0 → 100644
View file @
fc16ec32
#include "gtest/gtest.h"
#include <pistache/mailbox.h>
struct
Data
{
static
int
num_instances
;
static
constexpr
int
fingerprint
=
0xdeadbeef
;
Data
()
:
val
(
Data
::
fingerprint
)
{
num_instances
++
;
}
~
Data
()
{
EXPECT_EQ
(
val
,
Data
::
fingerprint
);
EXPECT_GE
(
0
,
--
num_instances
);
}
int
val
;
};
int
Data
::
num_instances
=
0
;
constexpr
int
Data
::
fingerprint
;
TEST
(
queue_test
,
destructor_test
)
{
Pistache
::
Queue
<
Data
>
queue
;
EXPECT_TRUE
(
queue
.
empty
());
for
(
int
i
=
0
;
i
<
5
;
i
++
)
{
queue
.
push
(
Data
());
}
// Should call Data::~Data 5 times and not 6 (placeholder entry)
}
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment