pike.git/ src/ builtin.cmod

2008-06-23

2008-06-23 16:49:40 by Martin Stjernholm <mast@lysator.liu.se>

• 45e13ddad90d6589f52faf790d44c75e4f89e83b (40 lines) (+18/-22) ^{[ Show | Annotate ]}
  Branch: 7.9

Improved support for Pike.count_memory.

Rev: src/builtin.cmod:1.210

2:   || This file is part of Pike. For copyright information see COPYRIGHT.   || Pike is distributed under GPL, LGPL and MPL. See the file COPYING   || for more information. - || $Id: builtin.cmod,v 1.209 2008/06/23 16:03:23 mast Exp $ + || $Id: builtin.cmod,v 1.210 2008/06/23 16:49:40 mast Exp $   */      #include "global.h"
2169:    if( str->str.s )    free_string_builder( &str->str );    } +  +  GC_RECURSE +  { +  if (mc_count_bytes (Pike_fp->current_object) && THIS->str.s) +  mc_counted_bytes += THIS->str.malloced;    } -  + }      /*! @endclass    */
2345:   PIKECLASS single_string_replace   {    CVAR SearchMojt mojt; -  CVAR struct pike_string *del; -  CVAR struct pike_string *to; +  PIKEVAR string del flags ID_STATIC|ID_PRIVATE; +  PIKEVAR string to flags ID_STATIC|ID_PRIVATE;       EXTRA    {
2356:    T_OBJECT);    }    -  INIT +  /*! @decl void create(string|void from, string|void to) +  *! +  *! @note +  *! May be called with either zero or two arguments. +  */ +  PIKEFUN void create(string|void del, string|void to)    { -  THIS->del = NULL; -  THIS->to = NULL; -  } -  -  EXIT -  gc_trivial; -  { +     if (THIS->del) {    free_string(THIS->del);    THIS->del = NULL;
2373:    free_string(THIS->to);    THIS->to = NULL;    } -  } +     -  /*! @decl void create(string|void from, string|void to) -  *! -  *! @note -  *! May be called with either zero or two arguments. -  */ -  PIKEFUN void create(string|void del, string|void to) -  { -  /* Clean up... */ -  exit_single_string_replace_struct(); -  +     if (!del) return;       if (!to) {
3251:    * o _sizeof()?, _indices()??    * o Support for reverse(), filter() and map().    * o Initialization from array. +  * o Support for Pike.count_memory.    */       INIT
3322:    gc_recurse_svalues(&node->val, 1);    node = next;    } +  /* FIXME: mc_count_bytes */    }       /*! @decl int(0..1) is_empty()