Re: cvs: ZendEngine2 / zend_list.c

Hi Marcus,

I'm not sure. I didn't remove the code, because I don't know why it was 
there. It is invalid for current shutdown order, but may be it was 
necessary some time ago, and would need to be restored if shutdown order 
changed again.

#if 0
#ifdef DMITRY_0
#ifndef DMITRY_1
...

I think comments are more clear.

Anyway, thank you for reviewing it. I'll change it into #ifdef DMITRY_0 
tomorrow, or may be remove it completely.

Thanks. Dmitry.




Marcus Boerger wrote:
> Hello Dmitry,
> 
> Thursday, August 21, 2008, 6:21:27 PM, you wrote:
> 
>> dmitry          Thu Aug 21 16:21:27 2008 UTC
> 
>>   Modified files:              
>>     /ZendEngine2        zend_list.c 
>>   Log:
>>   Fixed destruction of dl() loaded extensions
>>   
>>   
>> http://cvs.php.net/viewvc.cgi/ZendEngine2/zend_list.c?r1=1.74&r2=1.75&diff_format=u
>> Index: ZendEngine2/zend_list.c
>> diff -u ZendEngine2/zend_list.c:1.74 ZendEngine2/zend_list.c:1.75
>> --- ZendEngine2/zend_list.c:1.74        Mon Dec 31 07:12:07 2007
>> +++ ZendEngine2/zend_list.c     Thu Aug 21 16:21:27 2008
>> @@ -17,7 +17,7 @@
>>    
>> +----------------------------------------------------------------------+
>>  */
>>  
>> -/* $Id: zend_list.c,v 1.74 2007/12/31 07:12:07 sebastian Exp $ */
>> +/* $Id: zend_list.c,v 1.75 2008/08/21 16:21:27 dmitry Exp $ */
>>  
>>  /* resource lists */
>>  
>> @@ -255,7 +255,10 @@
>>  static int zend_clean_module_rsrc_dtors_cb(zend_rsrc_list_dtors_entry
>> *ld, int *module_number TSRMLS_DC) /* {{{ */
>>  {
>>         if (ld->module_number == *module_number) {
>> +#if 0
> According to our coding style you should use #if DMITRY_0
> 
>> +               /* EG(resource_list) is already destroied in this point */
>>                 zend_hash_apply_with_argument(&EG(regular_list),
>> (apply_func_arg_t) clean_module_resource, (void *) &(ld->resource_id) TSRMLS_CC);
>> +#endif
>>                 zend_hash_apply_with_argument(&EG(persistent_list),
>> (apply_func_arg_t) clean_module_resource, (void *) &(ld->resource_id) TSRMLS_CC);
>>                 return 1;
>>         } else {
> 
> 
> 
> 
> 
> 
> Best regards,
>  Marcus
> 

-- 
Zend Engine CVS Mailing List (http://cvs.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php