Roxen.git/ server/ etc/ modules/ RXML.pmod/ module.pmod

2002-10-07

2002-10-07 17:56:53 by Martin Stjernholm <mast@lysator.liu.se>

• f2fbc351abac900846b6f3bedd22a49275032286 (48 lines) (+32/-16) ^{[ Show | Annotate ]}
  Branch: 5.2

Fixed the second issue in [bug 3235 (#3235)], where the compilation object
wasn't propagated properly when a RenewablePCode was renewed. Also
fixed a potential concurrency bug which could possibly give the same
effect. Fixed some debug messages.

Rev: server/etc/modules/RXML.pmod/module.pmod:1.295

2:   //   // Created 1999-07-30 by Martin Stjernholm.   // - // $Id: module.pmod,v 1.294 2002/10/07 13:35:40 mast Exp $ + // $Id: module.pmod,v 1.295 2002/10/07 17:56:53 mast Exp $      // Kludge: Must use "RXML.refs" somewhere for the whole module to be   // loaded correctly.
3978:    if (evaler->is_RXML_PCode) {    if (!(comp = evaler->p_code_comp)) {    comp = evaler->p_code_comp = PikeCompile(); -  THIS_TAG_TOP_DEBUG ("Evaluating and compiling unparsed" -  DO_IF_DEBUG (" (with new %O in %O)\n", -  comp, evaler)); +  THIS_TAG_TOP_DEBUG ( +  "%s", "Evaluating and compiling unparsed" +  DO_IF_DEBUG (+ sprintf (" (with new %O in %O)\n", +  comp, evaler)));    }    else -  THIS_TAG_TOP_DEBUG ("Evaluating and compiling unparsed" -  DO_IF_DEBUG (" (with old %O in %O)\n", -  comp, evaler)); +  THIS_TAG_TOP_DEBUG ( +  "%s", "Evaluating and compiling unparsed" +  DO_IF_DEBUG (+ sprintf (" (with old %O in %O)\n", +  comp, evaler)));    }       else {
4001:    else    if (!(comp = evaler->p_code->p_code_comp)) {    comp = evaler->p_code->p_code_comp = PikeCompile(); -  THIS_TAG_TOP_DEBUG ("Evaluating and compiling unparsed" -  DO_IF_DEBUG (" (with new %O in %O in %O)\n", -  comp, evaler->p_code, evaler)); +  THIS_TAG_TOP_DEBUG ( +  "%s", "Evaluating and compiling unparsed" +  DO_IF_DEBUG (+ sprintf (" (with new %O in %O in %O)\n", +  comp, evaler->p_code, evaler)));    }    else -  THIS_TAG_TOP_DEBUG ("Evaluating and compiling unparsed" -  DO_IF_DEBUG (" (with old %O in %O in %O)\n", -  comp, evaler->p_code, evaler)); +  THIS_TAG_TOP_DEBUG ( +  "%s", "Evaluating and compiling unparsed" +  DO_IF_DEBUG (+ sprintf (" (with old %O in %O in %O)\n", +  comp, evaler->p_code, evaler)));    }       in_args = _prepare (ctx, type, args && args + ([]), comp);
7089:    mixed resolved;    if (zero_type (resolved = bindings[what[index]])) {    delayed_resolve_places[what] = index; -  COMP_MSG ("%O delayed_resolve %O\n", this_object(), what[index]); +  COMP_MSG ("%O delayed_resolve %O in %O[%O]\n", +  this_object(), what[index], format_short (what), index);    }    else {    what[index] = resolved; -  COMP_MSG ("%O delayed_resolve immediately %O\n", this_object(), what[index]); +  COMP_MSG ("%O delayed_resolve immediately %O in %O[%O]\n", +  this_object(), what[index], format_short (what), index);    }    }   
7703:       else {    if (ctx->state_updated > update_count) { -  exec[pos + 2] = frame->_save(); +  array frame_state = frame->_save(); +  if (stringp (frame_state[0])) +  // Must resolve before updating the exec array +  // since it might be evaluated concurrently in +  // other threads, and the check on p_code_comp +  // is only done at the start. +  frame_state[0] = frame->args = +  p_code_comp->resolve (frame_state[0]); +  exec[pos + 2] = frame_state;    flags |= UPDATED;    update_count = ctx->state_updated;    }
7861:    flags = other->flags;    generation = other->generation;    protocol_cache_time = other->protocol_cache_time; +  p_code_comp = other->p_code_comp;    }       //! @ignore