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
7f017ebe
Commit
7f017ebe
authored
Sep 06, 2013
by
Poul-Henning Kamp
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Atomically grab the busyobj, if there is one.
parent
d2ed41c6
Changes
5
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
40 additions
and
6 deletions
+40
-6
cache.h
bin/varnishd/cache/cache.h
+1
-1
cache_hash.c
bin/varnishd/cache/cache_hash.c
+23
-0
cache_http1_deliver.c
bin/varnishd/cache/cache_http1_deliver.c
+1
-1
cache_obj.c
bin/varnishd/cache/cache_obj.c
+14
-4
hash_slinger.h
bin/varnishd/hash/hash_slinger.h
+1
-0
No files found.
bin/varnishd/cache/cache.h
View file @
7f017ebe
...
@@ -1060,7 +1060,7 @@ void *MPL_Get(struct mempool *mpl, unsigned *size);
...
@@ -1060,7 +1060,7 @@ void *MPL_Get(struct mempool *mpl, unsigned *size);
void
MPL_Free
(
struct
mempool
*
mpl
,
void
*
item
);
void
MPL_Free
(
struct
mempool
*
mpl
,
void
*
item
);
/* cache_obj.c */
/* cache_obj.c */
struct
objiter
*
ObjIterBegin
(
struct
object
*
);
struct
objiter
*
ObjIterBegin
(
struct
worker
*
,
struct
object
*
);
int
ObjIter
(
struct
objiter
*
,
void
**
,
ssize_t
*
);
int
ObjIter
(
struct
objiter
*
,
void
**
,
ssize_t
*
);
void
ObjIterEnd
(
struct
objiter
**
);
void
ObjIterEnd
(
struct
objiter
**
);
...
...
bin/varnishd/cache/cache_hash.c
View file @
7f017ebe
...
@@ -712,6 +712,29 @@ HSH_Ref(struct objcore *oc)
...
@@ -712,6 +712,29 @@ HSH_Ref(struct objcore *oc)
Lck_Unlock
(
&
oh
->
mtx
);
Lck_Unlock
(
&
oh
->
mtx
);
}
}
/*---------------------------------------------------------------------
* Gain a reference on the busyobj, if the objcore has one
*/
struct
busyobj
*
HSH_RefBusy
(
const
struct
objcore
*
oc
)
{
struct
objhead
*
oh
;
struct
busyobj
*
bo
;
CHECK_OBJ_NOTNULL
(
oc
,
OBJCORE_MAGIC
);
oh
=
oc
->
objhead
;
CHECK_OBJ_NOTNULL
(
oh
,
OBJHEAD_MAGIC
);
Lck_Lock
(
&
oh
->
mtx
);
assert
(
oc
->
refcnt
>
0
);
bo
=
oc
->
busyobj
;
CHECK_OBJ_ORNULL
(
bo
,
BUSYOBJ_MAGIC
);
if
(
bo
!=
NULL
)
bo
->
refcount
++
;
Lck_Unlock
(
&
oh
->
mtx
);
return
(
bo
);
}
/*--------------------------------------------------------------------
/*--------------------------------------------------------------------
* Dereference objcore and or object
* Dereference objcore and or object
*
*
...
...
bin/varnishd/cache/cache_http1_deliver.c
View file @
7f017ebe
...
@@ -164,7 +164,7 @@ v1d_WriteDirObj(struct req *req)
...
@@ -164,7 +164,7 @@ v1d_WriteDirObj(struct req *req)
CHECK_OBJ_NOTNULL
(
req
,
REQ_MAGIC
);
CHECK_OBJ_NOTNULL
(
req
,
REQ_MAGIC
);
oi
=
ObjIterBegin
(
req
->
obj
);
oi
=
ObjIterBegin
(
req
->
wrk
,
req
->
obj
);
XXXAN
(
oi
);
XXXAN
(
oi
);
while
(
ObjIter
(
oi
,
&
ptr
,
&
len
))
{
while
(
ObjIter
(
oi
,
&
ptr
,
&
len
))
{
...
...
bin/varnishd/cache/cache_obj.c
View file @
7f017ebe
...
@@ -31,25 +31,31 @@
...
@@ -31,25 +31,31 @@
#include <stdlib.h>
#include <stdlib.h>
#include "cache.h"
#include "cache.h"
#include "hash/hash_slinger.h"
struct
objiter
{
struct
objiter
{
unsigned
magic
;
unsigned
magic
;
#define OBJITER_MAGIC 0x745fb151
#define OBJITER_MAGIC 0x745fb151
struct
busyobj
*
bo
;
struct
object
*
obj
;
struct
object
*
obj
;
struct
storage
*
st
;
struct
storage
*
st
;
struct
worker
*
wrk
;
};
};
struct
objiter
*
struct
objiter
*
ObjIterBegin
(
struct
object
*
obj
)
ObjIterBegin
(
struct
worker
*
wrk
,
struct
object
*
obj
)
{
{
struct
objiter
*
oi
;
struct
objiter
*
oi
;
CHECK_OBJ_NOTNULL
(
obj
,
OBJECT_MAGIC
);
CHECK_OBJ_NOTNULL
(
obj
,
OBJECT_MAGIC
);
ALLOC_OBJ
(
oi
,
OBJITER_MAGIC
);
ALLOC_OBJ
(
oi
,
OBJITER_MAGIC
);
while
(
obj
->
objcore
->
busyobj
!=
NULL
)
if
(
oi
==
NULL
)
usleep
(
10000
);
return
(
oi
);
if
(
oi
!=
NULL
)
oi
->
obj
=
obj
;
oi
->
obj
=
obj
;
oi
->
wrk
=
wrk
;
oi
->
bo
=
HSH_RefBusy
(
obj
->
objcore
);
while
(
obj
->
objcore
->
busyobj
!=
NULL
)
(
void
)
usleep
(
10000
);
return
(
oi
);
return
(
oi
);
}
}
...
@@ -77,6 +83,10 @@ void
...
@@ -77,6 +83,10 @@ void
ObjIterEnd
(
struct
objiter
**
oi
)
ObjIterEnd
(
struct
objiter
**
oi
)
{
{
AN
(
oi
);
CHECK_OBJ_NOTNULL
((
*
oi
),
OBJITER_MAGIC
);
CHECK_OBJ_NOTNULL
((
*
oi
),
OBJITER_MAGIC
);
if
((
*
oi
)
->
bo
!=
NULL
)
VBO_DerefBusyObj
((
*
oi
)
->
wrk
,
&
(
*
oi
)
->
bo
);
FREE_OBJ
((
*
oi
));
FREE_OBJ
((
*
oi
));
*
oi
=
NULL
;
}
}
bin/varnishd/hash/hash_slinger.h
View file @
7f017ebe
...
@@ -73,6 +73,7 @@ void HSH_AddString(const struct req *, const char *str);
...
@@ -73,6 +73,7 @@ void HSH_AddString(const struct req *, const char *str);
void
HSH_Insert
(
struct
worker
*
,
const
void
*
hash
,
struct
objcore
*
);
void
HSH_Insert
(
struct
worker
*
,
const
void
*
hash
,
struct
objcore
*
);
void
HSH_Purge
(
struct
worker
*
,
struct
objhead
*
,
double
ttl
,
double
grace
);
void
HSH_Purge
(
struct
worker
*
,
struct
objhead
*
,
double
ttl
,
double
grace
);
void
HSH_config
(
const
char
*
h_arg
);
void
HSH_config
(
const
char
*
h_arg
);
struct
busyobj
*
HSH_RefBusy
(
const
struct
objcore
*
oc
);
struct
objcore
*
HSH_Private
(
struct
worker
*
wrk
);
struct
objcore
*
HSH_Private
(
struct
worker
*
wrk
);
struct
objcore
*
HSH_NewObjCore
(
struct
worker
*
wrk
);
struct
objcore
*
HSH_NewObjCore
(
struct
worker
*
wrk
);
...
...
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