Merge pull request #338 from automaticp/no_allocation_in_log_callback

Remove memory allocation from logging callback invocation

source/glbinding-aux/include/glbinding-aux/logging.h

@@ -98,7 +98,7 @@ GLBINDING_AUX_API void resume();
 *  @remark
 *    This function is intended to get used by glbinding and not by a user of glbinding
 */
-GLBINDING_AUX_API void log(LogEntry call);
+GLBINDING_AUX_API void log(FunctionCall && call);
 
 
 } } // namespace glbinding::aux

source/glbinding-aux/source/logging.cpp

@@ -6,6 +6,7 @@
 #include <chrono>
 #include <fstream>
 #include <sstream>
+#include <utility>
 
 #ifdef GLBINDING_USE_BOOST_THREAD
 #include <boost/chrono.hpp>
@@ -148,7 +149,7 @@ void resume()
     glbinding::addCallbackMask(CallbackMask::Timestamp | CallbackMask::Logging);
 }
 
-void log(LogEntry call)
+void log(FunctionCall && call)
 {
     auto available = false;
     auto next = g_buffer.nextHead(available);
@@ -162,7 +163,7 @@ void log(LogEntry call)
     assert(!g_buffer.isFull());
 
     delete next;
-    g_buffer.push(call);
+    g_buffer.push(new FunctionCall(std::move(call)));
 }
 
 void startWriter(const std::string & filepath)

source/glbinding/include/glbinding/Binding.h

@@ -60,7 +60,7 @@ class GLBINDING_API Binding
     *  @brief
     *    The callback type of a function log callback with parameters and return value
     */
-    using FunctionLogCallback = std::function<void(FunctionCall *)>;
+    using FunctionLogCallback = std::function<void(FunctionCall &&)>;
 
     using ContextSwitchCallback = std::function<void(ContextHandle)>;   ///< The signature of the context switch callback
 

source/glbinding/include/glbinding/glbinding.h

@@ -25,7 +25,7 @@ class FunctionCall;
 
 using SimpleFunctionCallback = std::function<void(const AbstractFunction &)>; ///< The signature of the unresolved callback
 using FunctionCallback = std::function<void(const FunctionCall &)>;           ///< The signature of the before and after callbacks
-using FunctionLogCallback = std::function<void(FunctionCall *)>;              ///< The signature of the log callback
+using FunctionLogCallback = std::function<void(FunctionCall &&)>;             ///< The signature of the log callback
 using ContextSwitchCallback = std::function<void(ContextHandle)>;             ///< The signature of the context switch callback
 
 /**

source/glbinding/source/Binding.cpp

@@ -138,7 +138,7 @@ void Binding::log(FunctionCall && call)
 {
     if (s_logCallback())
     {
-        s_logCallback()(new FunctionCall(std::move(call)));
+        s_logCallback()(std::move(call));
     }
 }