Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
varnish-cache
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Commits
Open sidebar
varnishcache
varnish-cache
Commits
46561a19
Commit
46561a19
authored
Jan 18, 2018
by
Nils Goroll
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
NOP: pull out the actual mmap code from VSM_Map()
parent
9e0543c8
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
51 additions
and
36 deletions
+51
-36
vsm.c
lib/libvarnishapi/vsm.c
+51
-36
No files found.
lib/libvarnishapi/vsm.c
View file @
46561a19
...
@@ -148,6 +148,53 @@ vsm_diag(struct vsm *vd, const char *fmt, ...)
...
@@ -148,6 +148,53 @@ vsm_diag(struct vsm *vd, const char *fmt, ...)
/*--------------------------------------------------------------------*/
/*--------------------------------------------------------------------*/
static
int
vsm_mapseg
(
struct
vsm
*
vd
,
struct
vsm_seg
*
vg
)
{
size_t
of
,
off
,
sz
,
ps
,
len
;
struct
vsb
*
vsb
;
int
fd
;
CHECK_OBJ_NOTNULL
(
vg
,
VSM_SEG_MAGIC
);
ps
=
getpagesize
();
of
=
strtoul
(
vg
->
av
[
2
],
NULL
,
10
);
off
=
RDN2
(
of
,
ps
);
sz
=
strtoul
(
vg
->
av
[
3
],
NULL
,
10
);
assert
(
sz
>
0
);
assert
(
of
>=
off
);
len
=
RUP2
(
of
-
off
+
sz
,
ps
);
vsb
=
VSB_new_auto
();
AN
(
vsb
);
VSB_printf
(
vsb
,
"%s/%s/%s"
,
vd
->
dname
,
vg
->
set
->
dname
,
vg
->
av
[
1
]);
AZ
(
VSB_finish
(
vsb
));
fd
=
open
(
VSB_data
(
vsb
),
O_RDONLY
);
// XXX: openat
if
(
fd
<
0
)
{
VSB_destroy
(
&
vsb
);
return
(
vsm_diag
(
vd
,
"Could not open segment"
));
}
vg
->
s
=
(
void
*
)
mmap
(
NULL
,
len
,
PROT_READ
,
MAP_HASSEMAPHORE
|
MAP_NOSYNC
|
MAP_SHARED
,
fd
,
(
off_t
)
off
);
VSB_destroy
(
&
vsb
);
closefd
(
&
fd
);
if
(
vg
->
s
==
MAP_FAILED
)
return
(
vsm_diag
(
vd
,
"Could not mmap segment"
));
vg
->
b
=
(
char
*
)(
vg
->
s
)
+
of
-
off
;
vg
->
e
=
(
char
*
)
vg
->
b
+
sz
;
vg
->
sz
=
len
;
return
(
0
);
}
static
void
static
void
vsm_unmapseg
(
struct
vsm_seg
*
vg
)
vsm_unmapseg
(
struct
vsm_seg
*
vg
)
{
{
...
@@ -690,9 +737,7 @@ int
...
@@ -690,9 +737,7 @@ int
VSM_Map
(
struct
vsm
*
vd
,
struct
vsm_fantom
*
vf
)
VSM_Map
(
struct
vsm
*
vd
,
struct
vsm_fantom
*
vf
)
{
{
struct
vsm_seg
*
vg
;
struct
vsm_seg
*
vg
;
size_t
of
,
off
,
sz
,
ps
,
len
;
int
r
;
struct
vsb
*
vsb
;
int
fd
;
CHECK_OBJ_NOTNULL
(
vd
,
VSM_MAGIC
);
CHECK_OBJ_NOTNULL
(
vd
,
VSM_MAGIC
);
AN
(
vd
->
attached
);
AN
(
vd
->
attached
);
...
@@ -714,40 +759,10 @@ VSM_Map(struct vsm *vd, struct vsm_fantom *vf)
...
@@ -714,40 +759,10 @@ VSM_Map(struct vsm *vd, struct vsm_fantom *vf)
return
(
0
);
return
(
0
);
}
}
ps
=
getpagesize
();
r
=
vsm_mapseg
(
vd
,
vg
);
of
=
strtoul
(
vg
->
av
[
2
],
NULL
,
10
);
off
=
RDN2
(
of
,
ps
);
sz
=
strtoul
(
vg
->
av
[
3
],
NULL
,
10
);
assert
(
sz
>
0
);
assert
(
of
>=
off
);
len
=
RUP2
(
of
-
off
+
sz
,
ps
);
vsb
=
VSB_new_auto
();
AN
(
vsb
);
VSB_printf
(
vsb
,
"%s/%s/%s"
,
vd
->
dname
,
vg
->
set
->
dname
,
vg
->
av
[
1
]);
AZ
(
VSB_finish
(
vsb
));
fd
=
open
(
VSB_data
(
vsb
),
O_RDONLY
);
// XXX: openat
if
(
r
)
if
(
fd
<
0
)
{
return
(
r
);
VSB_destroy
(
&
vsb
);
return
(
vsm_diag
(
vd
,
"Could not open segment"
));
}
vg
->
s
=
(
void
*
)
mmap
(
NULL
,
len
,
PROT_READ
,
MAP_HASSEMAPHORE
|
MAP_NOSYNC
|
MAP_SHARED
,
fd
,
(
off_t
)
off
);
VSB_destroy
(
&
vsb
);
closefd
(
&
fd
);
if
(
vg
->
s
==
MAP_FAILED
)
return
(
vsm_diag
(
vd
,
"Could not mmap segment"
));
vg
->
b
=
(
char
*
)(
vg
->
s
)
+
of
-
off
;
vg
->
e
=
(
char
*
)
vg
->
b
+
sz
;
vg
->
sz
=
len
;
vf
->
b
=
vg
->
b
;
vf
->
b
=
vg
->
b
;
vf
->
e
=
vg
->
e
;
vf
->
e
=
vg
->
e
;
...
...
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