Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
M
mpd
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Иван Мажукин
mpd
Commits
6b555b70
Commit
6b555b70
authored
Jan 21, 2021
by
Max Kellermann
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
util/PeakBuffer: use std::size_t
parent
dafba203
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
11 additions
and
11 deletions
+11
-11
PeakBuffer.cxx
src/util/PeakBuffer.cxx
+7
-7
PeakBuffer.hxx
src/util/PeakBuffer.hxx
+4
-4
No files found.
src/util/PeakBuffer.cxx
View file @
6b555b70
...
...
@@ -57,7 +57,7 @@ PeakBuffer::Read() const noexcept
}
void
PeakBuffer
::
Consume
(
size_t
length
)
noexcept
PeakBuffer
::
Consume
(
s
td
::
s
ize_t
length
)
noexcept
{
if
(
normal_buffer
!=
nullptr
&&
!
normal_buffer
->
empty
())
{
normal_buffer
->
Consume
(
length
);
...
...
@@ -75,21 +75,21 @@ PeakBuffer::Consume(size_t length) noexcept
}
}
static
size_t
static
s
td
::
s
ize_t
AppendTo
(
DynamicFifoBuffer
<
uint8_t
>
&
buffer
,
const
void
*
data
,
size_t
length
)
noexcept
{
assert
(
data
!=
nullptr
);
assert
(
length
>
0
);
size_t
total
=
0
;
s
td
::
s
ize_t
total
=
0
;
do
{
const
auto
p
=
buffer
.
Write
();
if
(
p
.
empty
())
break
;
const
size_t
nbytes
=
std
::
min
(
length
,
p
.
size
);
const
s
td
::
s
ize_t
nbytes
=
std
::
min
(
length
,
p
.
size
);
memcpy
(
p
.
data
,
data
,
nbytes
);
buffer
.
Append
(
nbytes
);
...
...
@@ -102,20 +102,20 @@ AppendTo(DynamicFifoBuffer<uint8_t> &buffer,
}
bool
PeakBuffer
::
Append
(
const
void
*
data
,
size_t
length
)
PeakBuffer
::
Append
(
const
void
*
data
,
s
td
::
s
ize_t
length
)
{
if
(
length
==
0
)
return
true
;
if
(
peak_buffer
!=
nullptr
&&
!
peak_buffer
->
empty
())
{
size_t
nbytes
=
AppendTo
(
*
peak_buffer
,
data
,
length
);
s
td
::
s
ize_t
nbytes
=
AppendTo
(
*
peak_buffer
,
data
,
length
);
return
nbytes
==
length
;
}
if
(
normal_buffer
==
nullptr
)
normal_buffer
=
new
DynamicFifoBuffer
<
uint8_t
>
(
normal_size
);
size_t
nbytes
=
AppendTo
(
*
normal_buffer
,
data
,
length
);
s
td
::
s
ize_t
nbytes
=
AppendTo
(
*
normal_buffer
,
data
,
length
);
if
(
nbytes
>
0
)
{
data
=
(
const
uint8_t
*
)
data
+
nbytes
;
length
-=
nbytes
;
...
...
src/util/PeakBuffer.hxx
View file @
6b555b70
...
...
@@ -34,12 +34,12 @@ template<typename T> class DynamicFifoBuffer;
* kernel when it has been consumed.
*/
class
PeakBuffer
{
size_t
normal_size
,
peak_size
;
s
td
::
s
ize_t
normal_size
,
peak_size
;
DynamicFifoBuffer
<
uint8_t
>
*
normal_buffer
,
*
peak_buffer
;
public
:
PeakBuffer
(
s
ize_t
_normal_size
,
size_t
_peak_size
)
PeakBuffer
(
s
td
::
size_t
_normal_size
,
std
::
size_t
_peak_size
)
:
normal_size
(
_normal_size
),
peak_size
(
_peak_size
),
normal_buffer
(
nullptr
),
peak_buffer
(
nullptr
)
{}
...
...
@@ -62,9 +62,9 @@ public:
gcc_pure
WritableBuffer
<
void
>
Read
()
const
noexcept
;
void
Consume
(
size_t
length
)
noexcept
;
void
Consume
(
s
td
::
s
ize_t
length
)
noexcept
;
bool
Append
(
const
void
*
data
,
size_t
length
);
bool
Append
(
const
void
*
data
,
s
td
::
s
ize_t
length
);
};
#endif
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