Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
S
slash
Project
Project
Details
Activity
Releases
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
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
uplex-varnish
slash
Commits
b5dc2588
Unverified
Commit
b5dc2588
authored
Jan 15, 2024
by
Nils Goroll
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fellow_logcache: remove useless size argument
the logcache should know the best size
parent
b4d13d1f
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
7 deletions
+6
-7
fellow_log.c
src/fellow_log.c
+6
-7
No files found.
src/fellow_log.c
View file @
b5dc2588
...
@@ -1162,12 +1162,12 @@ fellow_logcache_fini(struct fellow_logcache *flc)
...
@@ -1162,12 +1162,12 @@ fellow_logcache_fini(struct fellow_logcache *flc)
static
void
static
void
fellow_logcache_init
(
struct
fellow_logcache
*
flc
,
struct
fellow_fd
*
ffd
,
fellow_logcache_init
(
struct
fellow_logcache
*
flc
,
struct
fellow_fd
*
ffd
,
uint8_t
id
,
const
struct
buddy_off_extent
*
region
,
unsigned
n
)
uint8_t
id
,
const
struct
buddy_off_extent
*
region
)
{
{
struct
fellow_logcache_entry
*
fle
;
struct
fellow_logcache_entry
*
fle
;
struct
buddy_reqs
*
reqs
;
struct
buddy_reqs
*
reqs
;
size_t
sz
;
size_t
sz
;
unsigned
u
;
unsigned
n
,
u
;
AN
(
ffd
);
AN
(
ffd
);
AN
(
flc
);
AN
(
flc
);
...
@@ -1175,11 +1175,10 @@ fellow_logcache_init(struct fellow_logcache *flc, struct fellow_fd *ffd,
...
@@ -1175,11 +1175,10 @@ fellow_logcache_init(struct fellow_logcache *flc, struct fellow_fd *ffd,
// sane upper limit to not eat up all of the membuddy
// sane upper limit to not eat up all of the membuddy
sz
=
buddy_size
(
ffd
->
membuddy
)
/
8
;
sz
=
buddy_size
(
ffd
->
membuddy
)
/
8
;
sz
>>=
MIN_FELLOW_BITS
;
sz
>>=
MIN_FELLOW_BITS
;
if
(
n
>
sz
)
n
=
(
typeof
(
n
))
sz
;
n
=
(
typeof
(
n
))
sz
;
if
(
n
>
BUDDY_REQS_MAX
)
if
(
n
>
BUDDY_REQS_MAX
)
n
=
BUDDY_REQS_MAX
;
n
=
BUDDY_REQS_MAX
;
if
(
n
<
2
)
else
if
(
n
<
2
)
n
=
2
;
// fellow_logcache_(take|steal) assume 2 entries min
n
=
2
;
// fellow_logcache_(take|steal) assume 2 entries min
INIT_OBJ
(
flc
,
FELLOW_LOGCACHE_MAGIC
);
INIT_OBJ
(
flc
,
FELLOW_LOGCACHE_MAGIC
);
...
@@ -3515,7 +3514,7 @@ logbuffer_append(struct fellow_fd *ffd,
...
@@ -3515,7 +3514,7 @@ logbuffer_append(struct fellow_fd *ffd,
*/
*/
dsk_init:
dsk_init:
AN
(
from
->
id
);
AN
(
from
->
id
);
fellow_logcache_init
(
flc
,
ffd
,
from
->
id
,
from
->
logreg
->
region
,
255
);
fellow_logcache_init
(
flc
,
ffd
,
from
->
id
,
from
->
logreg
->
region
);
AZ
(
locked
);
AZ
(
locked
);
dsk:
dsk:
where
=
NULL
;
where
=
NULL
;
...
@@ -5127,7 +5126,7 @@ fellow_logs_iter(const struct flics *flics, struct flivs *flivs,
...
@@ -5127,7 +5126,7 @@ fellow_logs_iter(const struct flics *flics, struct flivs *flivs,
CHECK_OBJ_NOTNULL
(
flics
,
FLICS_MAGIC
);
CHECK_OBJ_NOTNULL
(
flics
,
FLICS_MAGIC
);
CHECK_OBJ_NOTNULL
(
flivs
,
FLIVS_MAGIC
);
CHECK_OBJ_NOTNULL
(
flivs
,
FLIVS_MAGIC
);
fellow_logcache_init
(
flc
,
flics
->
ffd
,
0
,
active_logregion
,
255
);
fellow_logcache_init
(
flc
,
flics
->
ffd
,
0
,
active_logregion
);
assert
(
flics
->
ffd
->
phase
>
FP_INVAL
);
assert
(
flics
->
ffd
->
phase
>
FP_INVAL
);
assert
(
flics
->
ffd
->
phase
<
FP_LIM
);
assert
(
flics
->
ffd
->
phase
<
FP_LIM
);
...
...
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