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
238b64dd
Commit
238b64dd
authored
Oct 13, 2018
by
knowledge4igor
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix server crashes: abort on epoll_ctl and multiple memory deletion + server tests
parent
8cbb750f
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
230 additions
and
5 deletions
+230
-5
src/common/transport.cc
src/common/transport.cc
+4
-5
tests/CMakeLists.txt
tests/CMakeLists.txt
+1
-0
tests/http_server_test.cc
tests/http_server_test.cc
+225
-0
No files found.
src/common/transport.cc
View file @
238b64dd
...
...
@@ -176,6 +176,7 @@ Transport::handlePeerDisconnection(const std::shared_ptr<Peer>& peer) {
auto
raw
=
buffer
.
raw
();
if
(
raw
.
isOwned
)
delete
[]
raw
.
data
;
}
wq
.
pop_front
();
}
toWrite
.
erase
(
fd
);
...
...
@@ -316,12 +317,10 @@ Transport::handleWriteQueue() {
auto
&
write
=
entry
->
data
();
auto
fd
=
write
.
peerFd
;
if
(
!
isPeerFd
(
fd
))
continue
;
toWrite
[
fd
].
push_back
(
std
::
move
(
write
));
// Sometimes writes can be enqueued after a client has already disconnected.
// // In that case, clear the queue
// auto it = toWrite.find(fd);
// if (it == std::end(toWrite)) { continue; }
// it->second.push_back(std::move(write));
reactor
()
->
modifyFd
(
key
(),
fd
,
NotifyOn
::
Read
|
NotifyOn
::
Write
,
Polling
::
Mode
::
Edge
);
}
}
...
...
tests/CMakeLists.txt
View file @
238b64dd
...
...
@@ -18,6 +18,7 @@ pistache_test(cookie_test_2)
pistache_test
(
view_test
)
pistache_test
(
http_parsing_test
)
pistache_test
(
http_uri_test
)
pistache_test
(
http_server_test
)
pistache_test
(
http_client_test
)
pistache_test
(
net_test
)
pistache_test
(
listener_test
)
...
...
tests/http_server_test.cc
0 → 100644
View file @
238b64dd
#include <pistache/http.h>
#include <pistache/client.h>
#include <pistache/endpoint.h>
#include "gtest/gtest.h"
#include <chrono>
#include <future>
using
namespace
Pistache
;
struct
HelloHandlerWithDelay
:
public
Http
::
Handler
{
HTTP_PROTOTYPE
(
HelloHandlerWithDelay
)
explicit
HelloHandlerWithDelay
(
int
delay
=
0
)
:
delay_
(
delay
)
{
}
void
onRequest
(
const
Http
::
Request
&
/*request*/
,
Http
::
ResponseWriter
writer
)
{
std
::
this_thread
::
sleep_for
(
std
::
chrono
::
seconds
(
delay_
));
writer
.
send
(
Http
::
Code
::
Ok
,
"Hello, World!"
);
}
int
delay_
;
};
constexpr
char
SPECIAL_PAGE
[]
=
"/specialpage"
;
struct
SlowHandlerOnSpecialPage
:
public
Http
::
Handler
{
HTTP_PROTOTYPE
(
SlowHandlerOnSpecialPage
)
explicit
SlowHandlerOnSpecialPage
(
int
delay
=
0
)
:
delay_
(
delay
)
{
}
void
onRequest
(
const
Http
::
Request
&
request
,
Http
::
ResponseWriter
writer
)
{
if
(
request
.
resource
()
==
SPECIAL_PAGE
)
{
std
::
this_thread
::
sleep_for
(
std
::
chrono
::
seconds
(
delay_
));
}
writer
.
send
(
Http
::
Code
::
Ok
,
"Hello, World!"
);
}
int
delay_
;
};
TEST
(
http_server_test
,
client_disconnection_on_timeout_from_single_threaded_server
)
{
const
std
::
string
address
=
"localhost:9095"
;
Http
::
Endpoint
server
(
address
);
auto
flags
=
Tcp
::
Options
::
InstallSignalHandler
|
Tcp
::
Options
::
ReuseAddr
;
auto
server_opts
=
Http
::
Endpoint
::
options
().
flags
(
flags
);
server
.
init
(
server_opts
);
const
int
SEVEN_SECONDS_DELAY
=
6
;
server
.
setHandler
(
Http
::
make_handler
<
HelloHandlerWithDelay
>
(
SEVEN_SECONDS_DELAY
));
server
.
serveThreaded
();
Http
::
Client
client
;
client
.
init
();
std
::
vector
<
Async
::
Promise
<
Http
::
Response
>>
responses
;
auto
rb
=
client
.
get
(
address
);
auto
response
=
rb
.
send
();
bool
done
=
false
;
response
.
then
([
&
](
Http
::
Response
rsp
)
{
if
(
rsp
.
code
()
==
Http
::
Code
::
Ok
)
done
=
true
;
},
Async
::
IgnoreException
);
responses
.
push_back
(
std
::
move
(
response
));
auto
sync
=
Async
::
whenAll
(
responses
.
begin
(),
responses
.
end
());
Async
::
Barrier
<
std
::
vector
<
Http
::
Response
>>
barrier
(
sync
);
barrier
.
wait_for
(
std
::
chrono
::
seconds
(
5
));
server
.
shutdown
();
client
.
shutdown
();
ASSERT_FALSE
(
done
);
}
TEST
(
http_server_test
,
client_multiple_requests_disconnection_on_timeout_from_single_threaded_server
)
{
const
std
::
string
address
=
"localhost:9096"
;
Http
::
Endpoint
server
(
address
);
auto
flags
=
Tcp
::
Options
::
InstallSignalHandler
|
Tcp
::
Options
::
ReuseAddr
;
auto
server_opts
=
Http
::
Endpoint
::
options
().
flags
(
flags
);
server
.
init
(
server_opts
);
const
int
SEVEN_SECONDS_DELAY
=
6
;
server
.
setHandler
(
Http
::
make_handler
<
HelloHandlerWithDelay
>
(
SEVEN_SECONDS_DELAY
));
server
.
serveThreaded
();
Http
::
Client
client
;
client
.
init
();
std
::
vector
<
Async
::
Promise
<
Http
::
Response
>>
responses
;
auto
rb
=
client
.
get
(
address
);
int
counter
=
0
;
const
int
RESPONSE_SIZE
=
3
;
for
(
int
i
=
0
;
i
<
RESPONSE_SIZE
;
++
i
)
{
auto
response
=
rb
.
send
();
response
.
then
([
&
](
Http
::
Response
rsp
)
{
if
(
rsp
.
code
()
==
Http
::
Code
::
Ok
)
++
counter
;
},
Async
::
IgnoreException
);
responses
.
push_back
(
std
::
move
(
response
));
}
auto
sync
=
Async
::
whenAll
(
responses
.
begin
(),
responses
.
end
());
Async
::
Barrier
<
std
::
vector
<
Http
::
Response
>>
barrier
(
sync
);
barrier
.
wait_for
(
std
::
chrono
::
seconds
(
5
));
server
.
shutdown
();
client
.
shutdown
();
ASSERT_EQ
(
counter
,
0
);
}
TEST
(
http_server_test
,
multiple_client_with_requests_to_multithreaded_server
)
{
const
std
::
string
address
=
"localhost:9097"
;
Http
::
Endpoint
server
(
address
);
auto
flags
=
Tcp
::
Options
::
InstallSignalHandler
|
Tcp
::
Options
::
ReuseAddr
;
auto
server_opts
=
Http
::
Endpoint
::
options
().
flags
(
flags
).
threads
(
3
);
server
.
init
(
server_opts
);
server
.
setHandler
(
Http
::
make_handler
<
HelloHandlerWithDelay
>
());
server
.
serveThreaded
();
auto
client_logic
=
[
&
address
](
int
response_size
)
{
Http
::
Client
client
;
client
.
init
();
std
::
vector
<
Async
::
Promise
<
Http
::
Response
>>
responses
;
auto
rb
=
client
.
get
(
address
);
int
counter
=
0
;
for
(
int
i
=
0
;
i
<
response_size
;
++
i
)
{
auto
response
=
rb
.
send
();
response
.
then
([
&
](
Http
::
Response
rsp
)
{
if
(
rsp
.
code
()
==
Http
::
Code
::
Ok
)
++
counter
;
},
Async
::
IgnoreException
);
responses
.
push_back
(
std
::
move
(
response
));
}
auto
sync
=
Async
::
whenAll
(
responses
.
begin
(),
responses
.
end
());
Async
::
Barrier
<
std
::
vector
<
Http
::
Response
>>
barrier
(
sync
);
barrier
.
wait_for
(
std
::
chrono
::
seconds
(
5
));
client
.
shutdown
();
return
counter
;
};
const
int
FIRST_CLIENT_REQUEST_SIZE
=
4
;
std
::
future
<
int
>
result1
(
std
::
async
(
client_logic
,
FIRST_CLIENT_REQUEST_SIZE
));
const
int
SECOND_CLIENT_REQUEST_SIZE
=
5
;
std
::
future
<
int
>
result2
(
std
::
async
(
client_logic
,
SECOND_CLIENT_REQUEST_SIZE
));
int
res1
=
result1
.
get
();
int
res2
=
result2
.
get
();
server
.
shutdown
();
ASSERT_EQ
(
res1
,
FIRST_CLIENT_REQUEST_SIZE
);
ASSERT_EQ
(
res2
,
SECOND_CLIENT_REQUEST_SIZE
);
}
TEST
(
http_server_test
,
multiple_client_with_different_requests_to_multithreaded_server
)
{
const
std
::
string
address
=
"localhost:9098"
;
Http
::
Endpoint
server
(
address
);
auto
flags
=
Tcp
::
Options
::
InstallSignalHandler
|
Tcp
::
Options
::
ReuseAddr
;
auto
server_opts
=
Http
::
Endpoint
::
options
().
flags
(
flags
).
threads
(
3
);
server
.
init
(
server_opts
);
const
int
SEVEN_SECONDS_DELAY
=
6
;
server
.
setHandler
(
Http
::
make_handler
<
SlowHandlerOnSpecialPage
>
(
SEVEN_SECONDS_DELAY
));
server
.
serveThreaded
();
auto
client_logic
=
[
&
address
](
int
response_size
,
const
std
::
string
&
page
)
{
Http
::
Client
client
;
client
.
init
();
std
::
vector
<
Async
::
Promise
<
Http
::
Response
>>
responses
;
auto
rb
=
client
.
get
(
address
+
page
);
int
counter
=
0
;
for
(
int
i
=
0
;
i
<
response_size
;
++
i
)
{
auto
response
=
rb
.
send
();
response
.
then
([
&
](
Http
::
Response
rsp
)
{
if
(
rsp
.
code
()
==
Http
::
Code
::
Ok
)
++
counter
;
},
Async
::
IgnoreException
);
responses
.
push_back
(
std
::
move
(
response
));
}
auto
sync
=
Async
::
whenAll
(
responses
.
begin
(),
responses
.
end
());
Async
::
Barrier
<
std
::
vector
<
Http
::
Response
>>
barrier
(
sync
);
barrier
.
wait_for
(
std
::
chrono
::
seconds
(
5
));
client
.
shutdown
();
return
counter
;
};
const
int
FIRST_CLIENT_REQUEST_SIZE
=
1
;
std
::
future
<
int
>
result1
(
std
::
async
(
client_logic
,
FIRST_CLIENT_REQUEST_SIZE
,
SPECIAL_PAGE
));
const
int
SECOND_CLIENT_REQUEST_SIZE
=
2
;
std
::
future
<
int
>
result2
(
std
::
async
(
client_logic
,
SECOND_CLIENT_REQUEST_SIZE
,
""
));
int
res1
=
result1
.
get
();
int
res2
=
result2
.
get
();
server
.
shutdown
();
if
(
hardware_concurrency
()
>
1
)
{
ASSERT_EQ
(
res1
,
0
);
ASSERT_EQ
(
res2
,
SECOND_CLIENT_REQUEST_SIZE
);
}
else
{
ASSERT_TRUE
(
true
);
}
}
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