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
fdeea6b7
Commit
fdeea6b7
authored
Feb 06, 2019
by
knowledge4igor
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
First step of server buffer refactoring
parent
2fdbe570
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
46 additions
and
26 deletions
+46
-26
include/pistache/stream.h
include/pistache/stream.h
+9
-25
src/common/stream.cc
src/common/stream.cc
+35
-0
tests/CMakeLists.txt
tests/CMakeLists.txt
+1
-0
tests/streaming_test.cc
tests/streaming_test.cc
+1
-1
No files found.
include/pistache/stream.h
View file @
fdeea6b7
...
...
@@ -121,33 +121,17 @@ private:
template
<
typename
CharT
>
size_t
ArrayStreamBuf
<
CharT
>::
maxSize
=
Const
::
DefaultMaxPayload
;
struct
Buffer
{
struct
Buffer
{
Buffer
();
Buffer
(
std
::
shared_ptr
<
char
>
_data
,
int
_length
,
bool
_isDetached
=
false
);
Buffer
(
const
char
*
_data
,
int
_length
,
bool
_isDetached
=
false
);
Buffer
()
:
data
(
nullptr
),
length
(
0
),
isDetached
(
false
)
{}
Buffer
(
std
::
shared_ptr
<
char
>
_data
,
int
_length
,
bool
_isDetached
=
false
)
:
data
(
_data
),
length
(
_length
),
isDetached
(
_isDetached
)
{}
Buffer
(
const
char
*
_data
,
int
_length
,
bool
_isDetached
=
false
)
:
data
(
nullptr
),
length
(
_length
),
isDetached
(
_isDetached
)
{
data
=
std
::
shared_ptr
<
char
>
(
new
char
[
_length
+
1
](),
std
::
default_delete
<
char
[]
>
());
std
::
copy
(
_data
,
_data
+
_length
+
1
,
data
.
get
());
}
Buffer
detach
(
int
fromIndex
){
if
(
!
data
)
Buffer
();
if
(
length
<
fromIndex
)
throw
std
::
range_error
(
"Trying to detach buffer from an index bigger than lengthght."
);
auto
newDatalength
=
length
-
fromIndex
;
auto
newData
=
std
::
shared_ptr
<
char
>
(
new
char
[
newDatalength
+
1
](),
std
::
default_delete
<
char
[]
>
());
std
::
copy
(
data
.
get
()
+
fromIndex
,
data
.
get
()
+
length
,
newData
.
get
());
return
Buffer
(
newData
,
newDatalength
,
true
);
}
Buffer
detach
(
size_t
fromIndex
);
std
::
shared_ptr
<
char
>
data
;
in
t
length
;
size_
t
length
;
int
isDetached
;
};
struct
FileBuffer
{
...
...
src/common/stream.cc
View file @
fdeea6b7
...
...
@@ -16,6 +16,41 @@
namespace
Pistache
{
Buffer
::
Buffer
()
:
data
(
nullptr
)
,
length
(
0
)
,
isDetached
(
false
)
{
}
Buffer
::
Buffer
(
std
::
shared_ptr
<
char
>
_data
,
int
_length
,
bool
_isDetached
)
:
data
(
_data
)
,
length
(
_length
)
,
isDetached
(
_isDetached
)
{
}
Buffer
::
Buffer
(
const
char
*
_data
,
int
_length
,
bool
_isDetached
)
:
data
(
nullptr
)
,
length
(
_length
)
,
isDetached
(
_isDetached
)
{
data
=
std
::
shared_ptr
<
char
>
(
new
char
[
_length
+
1
](),
std
::
default_delete
<
char
[]
>
());
std
::
copy
(
_data
,
_data
+
_length
+
1
,
data
.
get
());
}
Buffer
Buffer
::
detach
(
size_t
fromIndex
)
{
if
(
!
data
)
return
Buffer
();
if
(
length
<
fromIndex
)
throw
std
::
range_error
(
"Trying to detach buffer from an index bigger than lengthght."
);
auto
newDatalength
=
length
-
fromIndex
;
auto
newData
=
std
::
shared_ptr
<
char
>
(
new
char
[
newDatalength
+
1
](),
std
::
default_delete
<
char
[]
>
());
std
::
copy
(
data
.
get
()
+
fromIndex
,
data
.
get
()
+
length
,
newData
.
get
());
return
Buffer
(
newData
,
newDatalength
,
true
);
}
FileBuffer
::
FileBuffer
(
const
std
::
string
&
fileName
)
:
fileName_
(
fileName
)
...
...
tests/CMakeLists.txt
View file @
fdeea6b7
...
...
@@ -28,6 +28,7 @@ pistache_test(streaming_test)
pistache_test
(
rest_server_test
)
pistache_test
(
string_view_test
)
pistache_test
(
mailbox_test
)
pistache_test
(
stream_test
)
if
(
PISTACHE_SSL
)
...
...
tests/streaming_test.cc
View file @
fdeea6b7
...
...
@@ -46,7 +46,7 @@ void dumpData(const Rest::Request&req, Http::ResponseWriter response) {
stream
.
ends
();
}
TEST
(
stream
,
from_description
)
TEST
(
stream
ing
,
from_description
)
{
Address
addr
(
Ipv4
::
any
(),
Port
(
0
));
const
size_t
threads
=
20
;
...
...
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