housework [ci skip]

Author: krakjoe

php_pthreads.c

@@ -130,52 +130,6 @@ void pthreads_throw_exception_hook(zval *ex TSRMLS_DC) {
 	}
 }
 
-static inline int pthreads_threaded_serialize(zval *object, unsigned char **buffer, size_t *buflen, zend_serialize_data *data) {
-	pthreads_object_t *address = PTHREADS_FETCH_FROM(Z_OBJ_P(object));
-
-	(*buflen) = snprintf(NULL, 0, ":%lu:", (long unsigned int) address);
-	(*buffer) = emalloc((*buflen) + 1);
-	sprintf(
-		(*buffer), ":%lu:", (long unsigned int) address);
-	(*buffer)[(*buflen)] = 0;
-
-	return SUCCESS;
-}
-
-static inline int pthreads_threaded_unserialize(zval *object, zend_class_entry *ce, const unsigned char *buffer, size_t buflen, zend_unserialize_data *data) {
-	pthreads_object_t *address = NULL;	
-
-	if (!sscanf((const char*) buffer, ":%lu:", (long unsigned int*)&address)) {
-		zend_throw_exception_ex(spl_ce_RuntimeException, 0,
-			"pthreads detected an attempt to connect to a corrupted object");
-		return FAILURE;
-	}
-
-	if (!address) {
-		zend_throw_exception_ex(spl_ce_RuntimeException, 0, 
-			"pthreads detected an attempt to connect to an invalid object");
-		return FAILURE;	
-	}
-	
-	if (!pthreads_globals_object_validate((zend_ulong) address)) {
-		zend_throw_exception_ex(spl_ce_RuntimeException, 0, 
-			"pthreads detected an attempt to connect to an object which has already been destroyed");
-		return FAILURE;
-	}
-
-	if (PTHREADS_IN_CREATOR(address)) {
-		ZVAL_OBJ(object, &address->std);
-		Z_ADDREF_P(object);
-	} else {
-		object_init_ex(object, ce);
-		pthreads_connect(
-			address,
-			PTHREADS_FETCH_FROM(Z_OBJ_P(object)));
-	}
-
-	return SUCCESS;
-}
-
 PHP_MINIT_FUNCTION(pthreads)
 {
 	zend_class_entry ce;

src/object.c

@@ -145,6 +145,54 @@ zend_object* pthreads_threaded_ctor(zend_class_entry *entry) {
 	return &threaded->std;
 } /* }}} */
 
+/* {{{ */
+int pthreads_threaded_serialize(zval *object, unsigned char **buffer, size_t *buflen, zend_serialize_data *data) {
+	pthreads_object_t *address = PTHREADS_FETCH_FROM(Z_OBJ_P(object));
+
+	(*buflen) = snprintf(NULL, 0, ":%lu:", (long unsigned int) address);
+	(*buffer) = emalloc((*buflen) + 1);
+	sprintf(
+		(*buffer), ":%lu:", (long unsigned int) address);
+	(*buffer)[(*buflen)] = 0;
+
+	return SUCCESS;
+} /* }}} */
+
+/* {{{ */
+int pthreads_threaded_unserialize(zval *object, zend_class_entry *ce, const unsigned char *buffer, size_t buflen, zend_unserialize_data *data) {
+	pthreads_object_t *address = NULL;	
+
+	if (!sscanf((const char*) buffer, ":%lu:", (long unsigned int*)&address)) {
+		zend_throw_exception_ex(spl_ce_RuntimeException, 0,
+			"pthreads detected an attempt to connect to a corrupted object");
+		return FAILURE;
+	}
+
+	if (!address) {
+		zend_throw_exception_ex(spl_ce_RuntimeException, 0, 
+			"pthreads detected an attempt to connect to an invalid object");
+		return FAILURE;	
+	}
+	
+	if (!pthreads_globals_object_validate((zend_ulong) address)) {
+		zend_throw_exception_ex(spl_ce_RuntimeException, 0, 
+			"pthreads detected an attempt to connect to an object which has already been destroyed");
+		return FAILURE;
+	}
+
+	if (PTHREADS_IN_CREATOR(address)) {
+		ZVAL_OBJ(object, &address->std);
+		Z_ADDREF_P(object);
+	} else {
+		object_init_ex(object, ce);
+		pthreads_connect(
+			address,
+			PTHREADS_FETCH_FROM(Z_OBJ_P(object)));
+	}
+
+	return SUCCESS;
+} /* }}} */
+
 /* {{{ */
 void pthreads_current_thread(zval *return_value) {
 	if (Z_TYPE(PTHREADS_ZG(this)) != IS_UNDEF) {

src/object.h

@@ -32,6 +32,10 @@ zend_object* pthreads_worker_ctor(zend_class_entry *entry);
 zend_object* pthreads_thread_ctor(zend_class_entry *entry);
 void        pthreads_base_free(zend_object *object); /* }}} */
 
+/* {{{ */
+int pthreads_threaded_unserialize(zval *object, zend_class_entry *ce, const unsigned char *buffer, size_t buflen, zend_unserialize_data *data);
+int pthreads_threaded_serialize(zval *object, unsigned char **buffer, size_t *buflen, zend_serialize_data *data); /* }}} */
+
 /* {{{ */
 void pthreads_current_thread(zval *return_value); /* }}} */