Revision: 14681
Author: adrian.chadd
Date: Thu May 20 02:19:09 2010
Log: Use an explicit copy function for HierarchyLogEntry structs rather than
inline copying.
This may temporarily increase CPU usage under high request rates because
of the function call, but it should make assigning blame to the relevant
area easier when profiling.
http://code.google.com/p/lusca-cache/source/detail?r=14681
Modified:
/branches/LUSCA_HEAD/src/client_side.c
/branches/LUSCA_HEAD/src/client_side_async_refresh.c
=======================================
--- /branches/LUSCA_HEAD/src/client_side.c Mon May 10 19:56:12 2010
+++ /branches/LUSCA_HEAD/src/client_side.c Thu May 20 02:19:09 2010
@@ -36,6 +36,7 @@
#include "squid.h"
#include "client_db.h"
+#include "hierarchy_entry.h"
#include "client_side_conn.h"
#include "client_side_body.h"
@@ -298,7 +299,7 @@
}
urlMethodAssign(&http->al.http.method, request->method);
http->al.http.version = request->http_ver;
- http->al.hier = request->hier;
+ hierarchyLogEntryCopy(&http->al.hier, &request->hier);
if (request->auth_user_request) {
if (authenticateUserRequestUsername(request->auth_user_request))
http->al.cache.authuser =
xstrdup(authenticateUserRequestUsername(request->auth_user_request));
@@ -2195,7 +2196,7 @@
storeLockObject(http->entry);
if (http->entry->store_status == STORE_PENDING && http->entry->mem_obj)
{
if (http->entry->mem_obj->request)
- r->hier = http->entry->mem_obj->request->hier;
+ hierarchyLogEntryCopy(&r->hier,
&http->entry->mem_obj->request->hier);
}
storeCreateMemObject(http->entry, http->uri);
urlMethodAssign(&http->entry->mem_obj->method, r->method);
=======================================
--- /branches/LUSCA_HEAD/src/client_side_async_refresh.c Fri Apr 2
02:06:29 2010
+++ /branches/LUSCA_HEAD/src/client_side_async_refresh.c Thu May 20
02:19:09 2010
@@ -1,5 +1,7 @@
#include "squid.h"
+#include "hierarchy_entry.h"
+
#include "client_side_async_refresh.h"
/*
@@ -57,7 +59,7 @@
}
urlMethodAssign(&al.http.method, request->method);
al.http.version = request->http_ver;
- al.hier = request->hier;
+ hierarchyLogEntryCopy(&al.hier, &request->hier);
if (request->auth_user_request) {
if (authenticateUserRequestUsername(request->auth_user_request))
al.cache.authuser =
xstrdup(authenticateUserRequestUsername(request->auth_user_request));
--
You received this message because you are subscribed to the Google Groups
"lusca-commit" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to
[email protected].
For more options, visit this group at
http://groups.google.com/group/lusca-commit?hl=en.
