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
6f2cb3fc
Commit
6f2cb3fc
authored
Feb 06, 2019
by
knowledge4igor
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Use std::string instead of std::shared_ptr<char>
parent
fdeea6b7
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
12 additions
and
13 deletions
+12
-13
include/pistache/stream.h
include/pistache/stream.h
+2
-2
src/common/stream.cc
src/common/stream.cc
+9
-10
src/common/transport.cc
src/common/transport.cc
+1
-1
No files found.
include/pistache/stream.h
View file @
6f2cb3fc
...
@@ -124,12 +124,12 @@ size_t ArrayStreamBuf<CharT>::maxSize = Const::DefaultMaxPayload;
...
@@ -124,12 +124,12 @@ size_t ArrayStreamBuf<CharT>::maxSize = Const::DefaultMaxPayload;
struct
Buffer
struct
Buffer
{
{
Buffer
();
Buffer
();
Buffer
(
std
::
s
hared_ptr
<
char
>
_data
,
int
_length
,
bool
_isDetached
=
false
);
Buffer
(
std
::
s
tring
_data
,
int
_length
,
bool
_isDetached
=
false
);
Buffer
(
const
char
*
_data
,
int
_length
,
bool
_isDetached
=
false
);
Buffer
(
const
char
*
_data
,
int
_length
,
bool
_isDetached
=
false
);
Buffer
detach
(
size_t
fromIndex
);
Buffer
detach
(
size_t
fromIndex
);
std
::
s
hared_ptr
<
char
>
data
;
std
::
s
tring
data
;
size_t
length
;
size_t
length
;
int
isDetached
;
int
isDetached
;
};
};
...
...
src/common/stream.cc
View file @
6f2cb3fc
...
@@ -17,39 +17,38 @@
...
@@ -17,39 +17,38 @@
namespace
Pistache
{
namespace
Pistache
{
Buffer
::
Buffer
()
Buffer
::
Buffer
()
:
data
(
nullptr
)
:
data
()
,
length
(
0
)
,
length
(
0
)
,
isDetached
(
false
)
,
isDetached
(
false
)
{
}
{
}
Buffer
::
Buffer
(
std
::
s
hared_ptr
<
char
>
_data
,
int
_length
,
bool
_isDetached
)
Buffer
::
Buffer
(
std
::
s
tring
_data
,
int
_length
,
bool
_isDetached
)
:
data
(
_data
)
:
data
(
std
::
move
(
_data
)
)
,
length
(
_length
)
,
length
(
_length
)
,
isDetached
(
_isDetached
)
,
isDetached
(
_isDetached
)
{
}
{
}
Buffer
::
Buffer
(
const
char
*
_data
,
int
_length
,
bool
_isDetached
)
Buffer
::
Buffer
(
const
char
*
_data
,
int
_length
,
bool
_isDetached
)
:
data
(
nullptr
)
:
data
()
,
length
(
_length
)
,
length
(
_length
)
,
isDetached
(
_isDetached
)
,
isDetached
(
_isDetached
)
{
{
data
=
std
::
shared_ptr
<
char
>
(
new
char
[
_length
+
1
](),
std
::
default_delete
<
char
[]
>
()
);
data
.
resize
(
_length
+
1
);
std
::
copy
(
_data
,
_data
+
_length
+
1
,
data
.
get
()
);
data
.
assign
(
_data
,
_length
+
1
);
}
}
Buffer
Buffer
::
detach
(
size_t
fromIndex
)
Buffer
Buffer
::
detach
(
size_t
fromIndex
)
{
{
if
(
!
data
)
if
(
data
.
empty
()
)
return
Buffer
();
return
Buffer
();
if
(
length
<
fromIndex
)
if
(
length
<
fromIndex
)
throw
std
::
range_error
(
"Trying to detach buffer from an index bigger than lengthght."
);
throw
std
::
range_error
(
"Trying to detach buffer from an index bigger than lengthght."
);
auto
newDatalength
=
length
-
fromIndex
;
auto
newDatalength
=
length
-
fromIndex
;
auto
newData
=
std
::
shared_ptr
<
char
>
(
new
char
[
newDatalength
+
1
](),
std
::
default_delete
<
char
[]
>
());
std
::
string
newData
=
data
.
substr
(
fromIndex
,
newDatalength
);
std
::
copy
(
data
.
get
()
+
fromIndex
,
data
.
get
()
+
length
,
newData
.
get
());
return
Buffer
(
newData
,
newDatalength
,
true
);
return
Buffer
(
std
::
move
(
newData
)
,
newDatalength
,
true
);
}
}
FileBuffer
::
FileBuffer
(
const
std
::
string
&
fileName
)
FileBuffer
::
FileBuffer
(
const
std
::
string
&
fileName
)
...
...
src/common/transport.cc
View file @
6f2cb3fc
...
@@ -237,7 +237,7 @@ Transport::asyncWriteImpl(Fd fd)
...
@@ -237,7 +237,7 @@ Transport::asyncWriteImpl(Fd fd)
if
(
buffer
.
isRaw
())
{
if
(
buffer
.
isRaw
())
{
auto
raw
=
buffer
.
raw
();
auto
raw
=
buffer
.
raw
();
auto
ptr
=
raw
.
data
.
get
()
+
totalWritten
;
auto
ptr
=
raw
.
data
.
c_str
()
+
totalWritten
;
#ifdef PISTACHE_USE_SSL
#ifdef PISTACHE_USE_SSL
auto
it
=
peers
.
find
(
fd
);
auto
it
=
peers
.
find
(
fd
);
...
...
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