kc3-lang/angle/src/libANGLE/LoggingAnnotator.cpp

• Show log

  Commit

• Hash : 38e28257
  Author :
  Date : 2019-03-13T16:11:15
  

  Fix ASSERT macro not printing message
  
  ANGLE's ASSERT macro was often not printing the error message before
  crashing. The printing happens in the destructor of a temporary object,
  but the temporary object is not guaranteed to be destroyed before ASSERT
  calls __builtin_trap(). This change fixes it by introducing a new FATAL
  log severity that moves the __builtin_trap() call into the destructor
  after the message is printed.
  
  Bug: 780507, angleproject:2215
  Change-Id: Ica91e00d67cc95d7b59c3d59e6925ac3a93c19c5
  Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/1521839
  Commit-Queue: James Darpinian <jdarpinian@chromium.org>
  Reviewed-by: Jamie Madill <jmadill@chromium.org>
  Reviewed-by: Geoff Lang <geofflang@chromium.org>
  

Download

• src/libANGLE/LoggingAnnotator.cpp

• //
  // Copyright 2017 The ANGLE Project Authors. All rights reserved.
  // Use of this source code is governed by a BSD-style license that can be
  // found in the LICENSE file.
  //
  // LoggingAnnotator.cpp: DebugAnnotator implementing logging
  //
  
  #include "libANGLE/LoggingAnnotator.h"
  
  #include <platform/Platform.h>
  #include "third_party/trace_event/trace_event.h"
  
  namespace angle
  {
  
  bool LoggingAnnotator::getStatus()
  {
      return false;
  }
  
  void LoggingAnnotator::beginEvent(const char *eventName, const char *eventMessage)
  {
      TRACE_EVENT_BEGIN0("gpu.angle", eventName);
  }
  
  void LoggingAnnotator::endEvent(const char *eventName)
  {
      TRACE_EVENT_END0("gpu.angle", eventName);
  }
  
  void LoggingAnnotator::setMarker(const char *markerName)
  {
      TRACE_EVENT_INSTANT0("gpu.angle", markerName);
  }
  
  void LoggingAnnotator::logMessage(const gl::LogMessage &msg) const
  {
      auto *plat = ANGLEPlatformCurrent();
      if (plat != nullptr)
      {
          switch (msg.getSeverity())
          {
              case gl::LOG_FATAL:
              case gl::LOG_ERR:
                  plat->logError(plat, msg.getMessage().c_str());
                  break;
              case gl::LOG_WARN:
                  plat->logWarning(plat, msg.getMessage().c_str());
                  break;
              default:
                  UNREACHABLE();
          }
      }
      else
      {
          gl::Trace(msg.getSeverity(), msg.getMessage().c_str());
      }
  }
  
  }  // namespace angle
  

Download