Prevent Client::Tick() from causing reentrancy in the plugin on Mac OS X....

core/cross/client.cc

 /*
  * Copyright 2009, Google Inc.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
@@ skipping 64 matching lines @@
       counter_manager_(service_locator),
       transformation_context_(service_locator),
       semantic_manager_(service_locator),
       profiler_(service_locator),
       renderer_(service_locator),
       evaluation_counter_(service_locator),
       render_tree_called_(false),
       render_mode_(RENDERMODE_CONTINUOUS),
       texture_on_hold_(false),
       event_manager_(),
+      is_ticking_(false),
       last_tick_time_(0),
       root_(NULL),
 #ifdef OS_WIN
       calls_(0),
 #endif
       rendergraph_root_(NULL),
       id_(IdManager::CreateId()) {
   // Create and initialize the message queue to allow external code to
   // communicate with the Client via RPC calls.
   message_queue_.reset(new MessageQueue(service_locator_));
@@ skipping 73 matching lines @@
 void Client::SetTickCallback(
     TickCallback* tick_callback) {
   tick_callback_manager_.Set(tick_callback);
 }
 
 void Client::ClearTickCallback() {
   tick_callback_manager_.Clear();
 }
 
 bool Client::Tick() {
+  is_ticking_ = true;
   ElapsedTimeTimer timer;
   float seconds_elapsed = tick_elapsed_time_timer_.GetElapsedTimeAndReset();
   tick_event_.set_elapsed_time(seconds_elapsed);
   profiler_->ProfileStart("Tick callback");
   tick_callback_manager_.Run(tick_event_);
   profiler_->ProfileStop("Tick callback");
 
   evaluation_counter_->InvalidateAllParameters();
 
   counter_manager_.AdvanceCounters(1.0f, seconds_elapsed);
@@ skipping 21 matching lines @@
     int max_fps = renderer_->max_fps();
     if (max_fps > 0 &&
         render_mode() == RENDERMODE_ON_DEMAND &&
         render_elapsed_time_timer_.GetElapsedTimeWithoutClearing()
         > 1.0/max_fps) {
       renderer_->set_need_to_render(true);
       texture_on_hold_ = false;
     }
   }
 
+  is_ticking_ = false;
   return message_check_ok;
 }
 
 // Render Methods --------------------------------------------------------------
 
 void Client::SetLostResourcesCallback(LostResourcesCallback* callback) {
   if (!renderer_.IsAvailable()) {
     O3D_ERROR(service_locator_) << "No Renderer";
   } else {
     renderer_->SetLostResourcesCallback(callback);
@@ skipping 348 matching lines @@
 }
 
 String Client::ProfileToString() {
   StringWriter string_writer(StringWriter::LF);
   JsonWriter json_writer(&string_writer, 2);
   profiler_->Write(&json_writer);
   json_writer.Close();
   return string_writer.ToString();
 }
 }  // namespace o3d