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
622cefef
Commit
622cefef
authored
Feb 13, 2020
by
hyperxor
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Code simplification in ResponseWriter
parent
fe02566c
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
11 additions
and
20 deletions
+11
-20
include/pistache/http.h
include/pistache/http.h
+2
-9
src/common/http.cc
src/common/http.cc
+9
-11
No files found.
include/pistache/http.h
View file @
622cefef
...
...
@@ -421,7 +421,8 @@ public:
ResponseWriter
clone
()
const
;
private:
ResponseWriter
(
Tcp
::
Transport
*
transport
,
Request
request
,
Handler
*
handler
);
ResponseWriter
(
Tcp
::
Transport
*
transport
,
Request
request
,
Handler
*
handler
,
std
::
weak_ptr
<
Tcp
::
Peer
>
peer
);
ResponseWriter
(
const
ResponseWriter
&
other
);
...
...
@@ -429,14 +430,6 @@ private:
const
size_t
size
,
const
Mime
::
MediaType
&
mime
);
template
<
typename
Ptr
>
void
associatePeer
(
const
Ptr
&
peer
)
{
if
(
peer_
.
use_count
()
>
0
)
throw
std
::
runtime_error
(
"A peer was already associated to the response"
);
peer_
=
peer
;
timeout_
.
associatePeer
(
peer_
);
}
Async
::
Promise
<
ssize_t
>
putOnWire
(
const
char
*
data
,
size_t
len
);
Response
response_
;
...
...
src/common/http.cc
View file @
622cefef
...
...
@@ -656,9 +656,11 @@ ResponseWriter::ResponseWriter(ResponseWriter &&other)
timeout_
(
std
::
move
(
other
.
timeout_
))
{}
ResponseWriter
::
ResponseWriter
(
Tcp
::
Transport
*
transport
,
Request
request
,
Handler
*
handler
)
:
response_
(
request
.
version
()),
peer_
(),
buf_
(
DefaultStreamSize
),
transport_
(
transport
),
timeout_
(
transport
,
handler
,
std
::
move
(
request
))
{}
Handler
*
handler
,
std
::
weak_ptr
<
Tcp
::
Peer
>
peer
)
:
response_
(
request
.
version
()),
peer_
(
peer
),
buf_
(
DefaultStreamSize
),
transport_
(
transport
),
timeout_
(
transport
,
handler
,
std
::
move
(
request
))
{
timeout_
.
associatePeer
(
peer
);
}
ResponseWriter
::
ResponseWriter
(
const
ResponseWriter
&
other
)
:
response_
(
other
.
response_
),
peer_
(
other
.
peer_
),
buf_
(
DefaultStreamSize
),
...
...
@@ -908,8 +910,7 @@ void Handler::onInput(const char *buffer, size_t len,
auto
state
=
parser
.
parse
();
if
(
state
==
Private
::
State
::
Done
)
{
ResponseWriter
response
(
transport
(),
parser
.
request
,
this
);
response
.
associatePeer
(
peer
);
ResponseWriter
response
(
transport
(),
parser
.
request
,
this
,
peer
);
#ifdef LIBSTDCPP_SMARTPTR_LOCK_FIXME
parser
.
request
.
associatePeer
(
peer
);
...
...
@@ -931,15 +932,13 @@ void Handler::onInput(const char *buffer, size_t len,
}
}
catch
(
const
HttpError
&
err
)
{
ResponseWriter
response
(
transport
(),
parser
.
request
,
this
);
response
.
associatePeer
(
peer
);
ResponseWriter
response
(
transport
(),
parser
.
request
,
this
,
peer
);
response
.
send
(
static_cast
<
Code
>
(
err
.
code
()),
err
.
reason
());
parser
.
reset
();
}
catch
(
const
std
::
exception
&
e
)
{
ResponseWriter
response
(
transport
(),
parser
.
request
,
this
);
response
.
associatePeer
(
peer
);
ResponseWriter
response
(
transport
(),
parser
.
request
,
this
,
peer
);
response
.
send
(
Code
::
Internal_Server_Error
,
e
.
what
());
parser
.
reset
();
}
...
...
@@ -961,8 +960,7 @@ void Timeout::onTimeout(uint64_t numWakeup) {
if
(
!
peer
.
lock
())
return
;
ResponseWriter
response
(
transport
,
request
,
handler
);
response
.
associatePeer
(
peer
);
ResponseWriter
response
(
transport
,
request
,
handler
,
peer
);
handler
->
onTimeout
(
request
,
std
::
move
(
response
));
}
...
...
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