Attachment 124262 Details for Bug 167774 – xcache-2.0.0_1.patch

[patch] xcache-2.0.0_1.patch

xcache-2.0.0_1.patch (text/plain), 2.50 KB, created by Martin Matuska on 2012-05-10 16:10:11 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Martin Matuska

Created: 2012-05-10 16:10:11 UTC

Size: 2.50 KB

patch

obsolete

>Index: Makefile
>===================================================================
>RCS file: /home/pcvs/ports/www/xcache/Makefile,v
>retrieving revision 1.16
>diff -u -r1.16 Makefile
>--- Makefile	2 May 2012 09:52:47 -0000	1.16
>+++ Makefile	10 May 2012 14:58:37 -0000
>@@ -7,6 +7,7 @@
> 
> PORTNAME=	xcache
> DISTVERSION=	2.0.0
>+PORTREVISION=	1
> CATEGORIES=	www
> MASTER_SITES=	http://xcache.lighttpd.net/pub/Releases/${DISTVERSION}/
> 
>Index: files/patch-r900
>===================================================================
>RCS file: files/patch-r900
>diff -N files/patch-r900
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ files/patch-r900	10 May 2012 14:58:37 -0000
>@@ -0,0 +1,48 @@
>+Index: xcache.c
>+===================================================================
>+--- xcache.c	(revision 899)
>++++ xcache.c	(revision 900)
>+@@ -839,7 +839,7 @@
>+ 				while (xc_stack_count(s)) {
>+ 					entry_php = (xc_entry_php_t *) xc_stack_pop(s);
>+ 					TRACE("unhold %d:%s", entry_php->file_inode, entry_php->entry.name.str.val);
>+-					entry_php->refcount ++;
>++					--entry_php->refcount;
>+ 					assert(entry_php->refcount >= 0);
>+ 				}
>+ 			} LEAVE_LOCK(cache);
>+@@ -1939,11 +1939,16 @@
>+ 
>+ 		if (stored_php) {
>+ 			compiler->new_entry.php = stored_php;
>+-			xc_php_addref_unlocked(stored_php);
>+ 			xc_entry_php_init(&compiler->new_entry, compiler->opened_path TSRMLS_CC);
>+ 			stored_entry = xc_entry_php_store_unlocked(cache, compiler->entry_hash.entryslotid, &compiler->new_entry TSRMLS_CC);
>+-			TRACE(" cached %d:%s, holding", compiler->new_entry.file_inode, stored_entry->entry.name.str.val);
>+-			xc_entry_hold_php_unlocked(cache, stored_entry TSRMLS_CC);
>++			if (stored_entry) {
>++				xc_php_addref_unlocked(stored_php);
>++				TRACE(" cached %d:%s, holding", compiler->new_entry.file_inode, stored_entry->entry.name.str.val);
>++				xc_entry_hold_php_unlocked(cache, stored_entry TSRMLS_CC);
>++			}
>++			else {
>++				gaveup = 1;
>++			}
>+ 			break;
>+ 		}
>+ 
>+@@ -2021,10 +2026,11 @@
>+ 		}
>+ 		/* entry_store */
>+ 		compiler->new_entry.php = stored_php;
>+-		xc_php_addref_unlocked(stored_php);
>+ 		stored_entry = xc_entry_php_store_unlocked(cache, compiler->entry_hash.entryslotid, &compiler->new_entry TSRMLS_CC);
>+-		if (!stored_entry) {
>+-			xc_php_release_unlocked(cache, stored_php);
>++		if (stored_entry) {
>++			xc_php_addref_unlocked(stored_php);
>++			TRACE(" cached %d:%s, holding", compiler->new_entry.file_inode, stored_entry->entry.name.str.val);
>++			xc_entry_hold_php_unlocked(cache, stored_entry TSRMLS_CC);
>+ 		}
>+ 	} LEAVE_LOCK_EX(cache);
>+ 	/* }}} */

Actions: View | Diff

Attachments on bug 167774: 124262