X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=http_request_datashare_api.c;h=1f48b7c0196c1e1fe9b35b8832820650494eab30;hp=6c70f3f7f88fe8f47f288f239cbbfcf2f9d9df6f;hb=ad5f896b03adaa073134a00108a9cdf00720673a;hpb=302498d96ed22a09da4375bd955d07f04b6b36c4

diff --git a/http_request_datashare_api.c b/http_request_datashare_api.c
index 6c70f3f..1f48b7c 100644
--- a/http_request_datashare_api.c
+++ b/http_request_datashare_api.c
@@ -6,7 +6,7 @@
     | modification, are permitted provided that the conditions mentioned |
     | in the accompanying LICENSE file are met.                          |
     +--------------------------------------------------------------------+
-    | Copyright (c) 2004-2006, Michael Wallner <mike@php.net>            |
+    | Copyright (c) 2004-2010, Michael Wallner <mike@php.net>            |
     +--------------------------------------------------------------------+
 */
 
@@ -18,26 +18,18 @@
 #if defined(ZEND_ENGINE_2) && defined(HTTP_HAVE_CURL)
 
 #include "php_http_api.h"
+#include "php_http_persistent_handle_api.h"
 #include "php_http_request_datashare_api.h"
 #include "php_http_request_api.h"
 #include "php_http_request_object.h"
-#ifdef HTTP_HAVE_PERSISTENT_HANDLES
-#	include "php_http_persistent_handle_api.h"
-#endif
-
-#ifdef HTTP_HAVE_PERSISTENT_HANDLES
-#	define HTTP_CURL_SHARE_CTOR(ch) (SUCCESS == http_persistent_handle_acquire("http_request_datashare", &(ch)))
-#	define HTTP_CURL_SHARE_DTOR(chp) http_persistent_handle_release("http_request_datashare", (chp))
-#else
-#	define HTTP_CURL_SHARE_CTOR(ch) ((ch) = curl_share_init())
-#	define HTTP_CURL_SHARE_DTOR(chp) curl_share_cleanup(*(chp)); *(chp) = NULL
-#endif
 
 static HashTable http_request_datashare_options;
 static http_request_datashare http_request_datashare_global;
 static int http_request_datashare_compare_handles(void *h1, void *h2);
 static void http_request_datashare_destroy_handles(void *el);
 #ifdef ZTS
+static void *http_request_datashare_locks_init(void);
+static void http_request_datashare_locks_dtor(void *l);
 static void http_request_datashare_lock_func(CURL *handle, curl_lock_data data, curl_lock_access locktype, void *userptr);
 static void http_request_datashare_unlock_func(CURL *handle, curl_lock_data data, void *userptr);
 #endif
@@ -51,8 +43,11 @@ PHP_MINIT_FUNCTION(http_request_datashare)
 {
 	curl_lock_data val;
 	
-#ifdef HTTP_HAVE_PERSISTENT_HANDLES
-	if (SUCCESS != http_persistent_handle_provide("http_request_datashare", curl_share_init, (http_persistent_handle_dtor) curl_share_cleanup)) {
+	if (SUCCESS != http_persistent_handle_provide("http_request_datashare", curl_share_init, (http_persistent_handle_dtor) curl_share_cleanup, NULL)) {
+		return FAILURE;
+	}
+#ifdef ZTS
+	if (SUCCESS != http_persistent_handle_provide("http_request_datashare_lock", http_request_datashare_locks_init, http_request_datashare_locks_dtor, NULL)) {
 		return FAILURE;
 	}
 #endif
@@ -104,7 +99,7 @@ PHP_HTTP_API http_request_datashare *_http_request_datashare_init_ex(http_reques
 	}
 	memset(share, 0, sizeof(http_request_datashare));
 	
-	if (!HTTP_CURL_SHARE_CTOR(share->ch)) {
+	if (SUCCESS != http_persistent_handle_acquire("http_request_datashare", &share->ch)) {
 		if (free_share) {
 			pefree(share, persistent);
 		}
@@ -112,19 +107,15 @@ PHP_HTTP_API http_request_datashare *_http_request_datashare_init_ex(http_reques
 	}
 	
 	if (!(share->persistent = persistent)) {
-		share->handles = emalloc(sizeof(zend_llist));
-		zend_llist_init(share->handles, sizeof(zval *), ZVAL_PTR_DTOR, 0);
+		share->handle.list = emalloc(sizeof(zend_llist));
+		zend_llist_init(share->handle.list, sizeof(zval *), ZVAL_PTR_DTOR, 0);
 #ifdef ZTS
 	} else {
-		int i;
-		
-		share->locks = pecalloc(CURL_LOCK_DATA_LAST, sizeof(http_request_datashare_lock), 1);
-		for (i = 0; i < CURL_LOCK_DATA_LAST; ++i) {
-			share->locks[i].mx = tsrm_mutex_alloc();
+		if (SUCCESS == http_persistent_handle_acquire("http_request_datashare_lock", (void *) &share->handle.locks)) {
+			curl_share_setopt(share->ch, CURLSHOPT_LOCKFUNC, http_request_datashare_lock_func);
+			curl_share_setopt(share->ch, CURLSHOPT_UNLOCKFUNC, http_request_datashare_unlock_func);
+			curl_share_setopt(share->ch, CURLSHOPT_USERDATA, share->handle.locks);
 		}
-		curl_share_setopt(share->ch, CURLSHOPT_LOCKFUNC, http_request_datashare_lock_func);
-		curl_share_setopt(share->ch, CURLSHOPT_UNLOCKFUNC, http_request_datashare_unlock_func);
-		curl_share_setopt(share->ch, CURLSHOPT_USERDATA, share);
 #endif
 	}
 	
@@ -188,18 +179,13 @@ PHP_HTTP_API void _http_request_datashare_detach_all(http_request_datashare *sha
 PHP_HTTP_API void _http_request_datashare_dtor(http_request_datashare *share TSRMLS_DC)
 {
 	if (!share->persistent) {
-		zend_llist_destroy(share->handles);
-		efree(share->handles);
+		zend_llist_destroy(share->handle.list);
+		efree(share->handle.list);
 	}
-	HTTP_CURL_SHARE_DTOR(&share->ch);
+	http_persistent_handle_release("http_request_datashare", &share->ch);
 #ifdef ZTS
 	if (share->persistent) {
-		int i;
-	
-		for (i = 0; i < CURL_LOCK_DATA_LAST; ++i) {
-			tsrm_mutex_free(share->locks[i].mx);
-		}
-		pefree(share->locks, 1);
+		http_persistent_handle_release("http_request_datashare_lock", (void *) &share->handle.locks);
 	}
 #endif
 }
@@ -244,21 +230,46 @@ static void http_request_datashare_destroy_handles(void *el)
 }
 
 #ifdef ZTS
+static void *http_request_datashare_locks_init(void)
+{
+	int i;
+	http_request_datashare_lock *locks = pecalloc(CURL_LOCK_DATA_LAST, sizeof(http_request_datashare_lock), 1);
+	
+	if (locks) {
+		for (i = 0; i < CURL_LOCK_DATA_LAST; ++i) {
+			locks[i].mx = tsrm_mutex_alloc();
+		}
+	}
+	
+	return locks;
+}
+
+static void http_request_datashare_locks_dtor(void *l)
+{
+	int i;
+	http_request_datashare_lock *locks = (http_request_datashare_lock *) l;
+	
+	for (i = 0; i < CURL_LOCK_DATA_LAST; ++i) {
+		tsrm_mutex_free(locks[i].mx);
+	}
+	pefree(locks, 1);
+}
+
 static void http_request_datashare_lock_func(CURL *handle, curl_lock_data data, curl_lock_access locktype, void *userptr)
 {
-	http_request_datashare *share = (http_request_datashare *) userptr;
+	http_request_datashare_lock *locks = (http_request_datashare_lock *) userptr;
 	
 	/* TSRM can't distinguish shared/exclusive locks */
-	tsrm_mutex_lock(share->locks[data].mx);
-	share->locks[data].ch = handle;
+	tsrm_mutex_lock(locks[data].mx);
+	locks[data].ch = handle;
 }
 
 static void http_request_datashare_unlock_func(CURL *handle, curl_lock_data data, void *userptr)
 {
-	http_request_datashare *share = (http_request_datashare *) userptr;
+	http_request_datashare_lock *locks = (http_request_datashare_lock *) userptr;
 	
-	if (share->locks[data].ch == handle) {
-		tsrm_mutex_unlock(share->locks[data].mx);
+	if (locks[data].ch == handle) {
+		tsrm_mutex_unlock(locks[data].mx);
 	}
 }
 #endif