qml 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c3e17be31c7cb2d6c9530581484a9146c71718e1
-  data.tar.gz: 0fa4538a3960c37c4afe368986e0d1565ce401c5
+  metadata.gz: ab6994a5395ab183bdec0c003033822ea4b2ef99
+  data.tar.gz: dbd518f8f5dc09bd4441b82e518c8e086c89e7d3
 SHA512:
-  metadata.gz: 643d0c001ba1f018b5784ab472cd789278be85721678c5b4c5dbd1edd9e89beb46b585fa273b12da771594b7d3f6ac147b28ea4e7f72ec4835babe125e08e836
-  data.tar.gz: 3fdc78678a5790c2123869b66905b40bc24613a6d47cfecbdf322be58ac403d3f60007e9d4856a44b15d64698639d4b6d95b6cc61844fa66610f2322e7fdcf16
+  metadata.gz: dbaf73bddc72313761f9b2520edc82e2a309cb8e75fc12d8504d396460045773448cd81e060107d3c8935b566996eb6aff1a8a27cf2352fad71e6aac75e12dad
+  data.tar.gz: c36f4bb9facdfa0b85998d12983314d0ab37acfd2a7a4f36b763d45eccdfc44d4a0b9802d5b6e318bacc0037d5daca6070655abe8a2260a5c242292ce1295e57

data/changes.md

@@ -1,3 +1,7 @@
+## 1.0.1 (2015-06-20)
+
+* Fixes 100% CPU usage (#21)
+
 ## 1.0.0 (2015-06-16)
 
 * A lot of changes (see examples and docs)

data/ext/qml/interface.c

@@ -5,7 +5,7 @@
 
 VALUE rbqml_mInterface;
 static qmlbind_interface interface;
-static VALUE referenced_objects;
+VALUE rbqml_referenced_objects;
 
 qmlbind_interface rbqml_get_interface(void) {
     return interface;
@@ -24,7 +24,7 @@ static void *new_object_impl(void *p) {
     VALUE emitterValue = rbqml_signal_emitter_new(data->emitter);
     rb_funcall(obj, rb_intern("set_signal_emitter"), 1, emitterValue);
 
-    rb_hash_aset(referenced_objects, obj, Qnil);
+    rb_hash_aset(rbqml_referenced_objects, obj, Qnil);
     return (void *)obj;
 }
 
@@ -37,7 +37,7 @@ static qmlbind_backref new_object(qmlbind_backref class_handle, qmlbind_signal_e
 }
 
 static void *delete_object_impl(void *data) {
-    rb_hash_delete(referenced_objects, (VALUE)data);
+    rb_hash_delete(rbqml_referenced_objects, (VALUE)data);
     return NULL;
 }
 
@@ -151,6 +151,6 @@ void rbqml_init_interface(void) {
     rb_require("qml/interface");
     rbqml_mInterface = rb_path2class("QML::Interface");
     interface = qmlbind_interface_new(handlers);
-    referenced_objects = rb_hash_new();
-    rb_gc_register_address(&referenced_objects);
+    rbqml_referenced_objects = rb_hash_new();
+    rb_gc_register_address(&rbqml_referenced_objects);
 }

data/ext/qml/interface.h

@@ -4,6 +4,7 @@
 #include "qml.h"
 
 extern VALUE rbqml_mInterface;
+extern VALUE rbqml_referenced_objects;
 qmlbind_interface rbqml_get_interface(void);
 
 void rbqml_init_interface(void);

data/ext/qml/lib/libqmlbind/qmlbind/include/qmlbind/application.h

@@ -11,7 +11,8 @@ QMLBIND_API void qmlbind_application_release(qmlbind_application app);
 QMLBIND_API int qmlbind_application_exec(qmlbind_application app);
 
 QMLBIND_API void qmlbind_process_events();
-QMLBIND_API void qmlbind_set_tick_callback(void (*func)());
+
+QMLBIND_API void qmlbind_next_tick(void (*callback)(void *), void *data);
 
 #ifdef __cplusplus
 }

data/ext/qml/lib/libqmlbind/qmlbind/include/qmlbind/qmlbind_global.h

@@ -49,21 +49,21 @@ typedef QmlBind::SignalEmitter *qmlbind_signal_emitter;
 
 #else
 
-typedef struct {} *qmlbind_application;
+typedef struct qmlbind_application_s {} *qmlbind_application;
 
-typedef struct {} *qmlbind_engine;
-typedef struct {} *qmlbind_component;
-typedef struct {} *qmlbind_plugin;
+typedef struct qmlbind_engine_s {} *qmlbind_engine;
+typedef struct qmlbind_component_s {} *qmlbind_component;
+typedef struct qmlbind_plugin_s {} *qmlbind_plugin;
 
-typedef struct {} *qmlbind_value;
-typedef struct {} *qmlbind_iterator;
-typedef struct {} *qmlbind_string;
+typedef struct qmlbind_value_s {} *qmlbind_value;
+typedef struct qmlbind_iterator_s {} *qmlbind_iterator;
+typedef struct qmlbind_string_s {} *qmlbind_string;
 
-typedef struct {} *qmlbind_interface;
-typedef struct {} *qmlbind_metaobject;
-typedef struct {} *qmlbind_exporter;
+typedef struct qmlbind_interface_s {} *qmlbind_interface;
+typedef struct qmlbind_metaobject_s {} *qmlbind_metaobject;
+typedef struct qmlbind_exporter_s {} *qmlbind_exporter;
 
-typedef struct {} *qmlbind_signal_emitter;
+typedef struct qmlbind_signal_emitter_s {} *qmlbind_signal_emitter;
 
 #endif
 

data/ext/qml/lib/libqmlbind/qmlbind/qmlbind.pro

@@ -2,16 +2,12 @@ QT += widgets qml quick core-private
 
 TARGET = qmlbind
 TEMPLATE = lib
+CONFIG += c++11
 
 DEFINES += QMLBIND_LIBRARY
 
 INCLUDEPATH += $$PWD/include
 
-unix {
-    target.path = /usr/lib
-    INSTALLS += target
-}
-
 SOURCES += \
     src/api_application.cpp \
     src/api_engine.cpp \
@@ -32,31 +28,45 @@ SOURCES += \
     src/signalemitter.cpp \
     src/api_signal_emitter.cpp \
     src/engine.cpp \
-    src/api_plugin.cpp \
-    src/ticktimer.cpp
+    src/api_plugin.cpp
 
-HEADERS += \
+PUBLIC_HEADERS += \
     include/qmlbind/application.h \
     include/qmlbind/engine.h \
     include/qmlbind/iterator.h \
     include/qmlbind/qmlbind_global.h \
     include/qmlbind/value.h \
-    src/metaobject.h \
     include/qmlbind/metaobject.h \
-    src/wrapper.h \
     include/qmlbind/string.h \
     include/qmlbind/component.h \
     include/qmlbind.h \
-    src/typeregisterer.h \
     include/qmlbind/register.h \
-    src/util.h \
-    src/exporter.h \
     include/qmlbind/exporter.h \
     include/qmlbind/interface.h \
+    include/qmlbind/signal_emitter.h \
+    include/qmlbind/plugin.h \
+
+PRIVATE_HEADERS += \
+    src/metaobject.h \
+    src/wrapper.h \
+    src/typeregisterer.h \
+    src/util.h \
+    src/exporter.h \
     src/interface.h \
     src/backref.h \
     src/signalemitter.h \
-    include/qmlbind/signal_emitter.h \
-    src/engine.h \
-    include/qmlbind/plugin.h \
-    src/ticktimer.h
+    src/engine.h
+
+HEADERS = $$PUBLIC_HEADERS $$PRIVATE_HEADERS
+
+unix {
+    for(header, PUBLIC_HEADERS) {
+       path = $${INSTALL_PREFIX}/usr/$${dirname(header)}
+       eval(headers_$${path}.files += $$header)
+       eval(headers_$${path}.path = $$path)
+       eval(INSTALLS *= headers_$${path})
+    }
+
+    target.path = /usr/lib
+    INSTALLS += target
+}

data/ext/qml/lib/libqmlbind/qmlbind/src/api_application.cpp

@@ -1,6 +1,5 @@
 #include "qmlbind/application.h"
 #include "util.h"
-#include "ticktimer.h"
 #include "backref.h"
 #include <QApplication>
 #include <QSharedPointer>
@@ -11,22 +10,6 @@ using namespace QmlBind;
 
 namespace QmlBind {
 
-class NextTickFunc
-{
-public:
-    NextTickFunc(void (*func)(qmlbind_backref), const Backref &data) : mFunc(func), mData(data)
-    {}
-
-    void operator()()
-    {
-        mFunc(mData.backref());
-    }
-
-private:
-    void (*mFunc)(qmlbind_backref);
-    Backref mData;
-};
-
 class AppArgs
 {
 public:
@@ -59,8 +42,6 @@ private:
 
 }
 
-static void (*tickCallback)();
-
 extern "C" {
 
 qmlbind_application qmlbind_application_new(int argc, char **argv)
@@ -68,9 +49,6 @@ qmlbind_application qmlbind_application_new(int argc, char **argv)
     AppArgs *args = new AppArgs(argc, argv);
     QApplication *app = new QApplication(args->argc(), args->argv());
 
-    TickTimer *timer = new TickTimer(&tickCallback, app);
-    timer->start();
-
     return app;
 }
 
@@ -90,14 +68,11 @@ void qmlbind_process_events()
     QCoreApplication::sendPostedEvents(0, QEvent::DeferredDelete);
 }
 
-void qmlbind_set_tick_callback(void (*func)())
-{
-    tickCallback = func;
-}
-
-void qmlbind_next_tick(qmlbind_interface interface, void (*func)(qmlbind_backref), qmlbind_backref data)
+void qmlbind_next_tick(void (*callback)(void *), void *data)
 {
-    QTimer::singleShot(0, NextTickFunc(func, Backref(data, *interface)));
+    QTimer::singleShot(0, QCoreApplication::instance(), [=] {
+        callback(data);
+    });
 }
 
 }

data/ext/qml/lib/libqmlbind/test/application_test.cpp

@@ -2,14 +2,14 @@
 #include "fixtures/emptyhandlers.h"
 #include <qmlbind.h>
 
-TEST_CASE("set_tick_callback")
+TEST_CASE("next_tick")
 {
     static bool called;
     called = false;
 
-    qmlbind_set_tick_callback([] {
-        called = true;
-    });
+    qmlbind_next_tick([] (void *data) {
+        *((bool *)data) = true;
+    }, &called);
     qmlbind_process_events();
 
     REQUIRE(called);

data/ext/qml/qml.c

@@ -10,7 +10,6 @@
 #include "js_wrapper.h"
 #include "signal_emitter.h"
 #include "plugin_loader.h"
-#include "dispatcher.h"
 #include "meta_object.h"
 
 VALUE rbqml_mQML;
@@ -67,7 +66,22 @@ static VALUE qml_engine(VALUE module) {
         rb_raise(rb_eRuntimeError, "QML not yet initialized");
     }
     return rbqml_engine;
+}
+
+static void nextTickCallback(void *data)
+{
+    VALUE block = (VALUE)data;
+    rb_proc_call(block, rb_ary_new());
+    rb_hash_delete(rbqml_referenced_objects, block);
+}
+
+static VALUE qml_next_tick(int argc, VALUE *argv, VALUE module) {
+    VALUE block;
+    rb_scan_args(argc, argv, "&", &block);
+    rb_hash_aset(rbqml_referenced_objects, block, Qnil);
 
+    qmlbind_next_tick(nextTickCallback, (void *)block);
+    return block;
 }
 
 void Init_qml(void)
@@ -85,11 +99,11 @@ void Init_qml(void)
     rbqml_init_js_wrapper();
     rbqml_init_signal_emitter();
     rbqml_init_plugin_loader();
-    rbqml_init_dispatcher();
     rbqml_init_meta_object();
 
     rb_define_module_function(rbqml_mQML, "initialized?", qml_initialized_p, 0);
     rb_define_module_function(rbqml_mQML, "init_impl", qml_init, 1);
     rb_define_module_function(rbqml_mQML, "application", qml_application, 0);
     rb_define_module_function(rbqml_mQML, "engine", qml_engine, 0);
+    rb_define_module_function(rbqml_mQML, "next_tick", qml_next_tick, -1);
 }

data/lib/qml.rb

@@ -9,7 +9,6 @@ require 'qml/plugins'
 require 'qml/component'
 require 'qml/engine'
 require 'qml/application'
-require 'qml/dispatcher'
 require 'qml/signal'
 require 'qml/reactive'
 require 'qml/access'

data/lib/qml/version.rb

@@ -1,3 +1,3 @@
 module QML
-  VERSION = '1.0.0'
+  VERSION = '1.0.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: qml
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Ryohei Ikegami
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-16 00:00:00.000000000 Z
+date: 2015-06-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -146,8 +146,6 @@ files:
 - ext/qml/component.h
 - ext/qml/conversion.c
 - ext/qml/conversion.h
-- ext/qml/dispatcher.c
-- ext/qml/dispatcher.h
 - ext/qml/engine.c
 - ext/qml/engine.h
 - ext/qml/exporter.c
@@ -207,8 +205,6 @@ files:
 - ext/qml/lib/libqmlbind/qmlbind/src/metaobject.h
 - ext/qml/lib/libqmlbind/qmlbind/src/signalemitter.cpp
 - ext/qml/lib/libqmlbind/qmlbind/src/signalemitter.h
-- ext/qml/lib/libqmlbind/qmlbind/src/ticktimer.cpp
-- ext/qml/lib/libqmlbind/qmlbind/src/ticktimer.h
 - ext/qml/lib/libqmlbind/qmlbind/src/typeregisterer.cpp
 - ext/qml/lib/libqmlbind/qmlbind/src/typeregisterer.h
 - ext/qml/lib/libqmlbind/qmlbind/src/util.h
@@ -259,7 +255,6 @@ files:
 - lib/qml/data/list_model.rb
 - lib/qml/data/list_model_access.rb
 - lib/qml/data/query_model.rb
-- lib/qml/dispatcher.rb
 - lib/qml/engine.rb
 - lib/qml/errors.rb
 - lib/qml/interface.rb

data/ext/qml/dispatcher.c

@@ -1,31 +0,0 @@
-#include "dispatcher.h"
-
-VALUE rbqml_cDispatcher;
-int callback_enabled = 1;
-
-static void tick_callback_impl() {
-    VALUE dispatcher = rb_funcall(rbqml_cDispatcher, rb_intern("instance"), 0);
-    rb_funcall(dispatcher, rb_intern("run_tasks"), 0);
-}
-
-static void tick_callback() {
-    if (__sync_fetch_and_add(&callback_enabled, 0)) {
-        rb_thread_call_with_gvl((void *(*)(void *))&tick_callback_impl, NULL);
-    }
-}
-
-static VALUE dispatcher_callback_enabled_set(VALUE self, VALUE enabled) {
-    if (RTEST(enabled)) {
-        __sync_fetch_and_or(&callback_enabled, 1);
-    } else {
-        __sync_fetch_and_and(&callback_enabled, 0);
-    }
-    return enabled;
-}
-
-void rbqml_init_dispatcher(void) {
-    rbqml_cDispatcher = rb_define_class_under(rb_path2class("QML"), "Dispatcher", rb_cObject);
-    rb_define_private_method(rbqml_cDispatcher, "callback_enabled=", &dispatcher_callback_enabled_set, 1);
-
-    qmlbind_set_tick_callback(&tick_callback);
-}

data/ext/qml/dispatcher.h

@@ -1,7 +0,0 @@
-#pragma once
-
-#include "qml.h"
-
-extern VALUE rbqml_cDispatcher;
-
-void rbqml_init_dispatcher(void);

data/ext/qml/lib/libqmlbind/qmlbind/src/ticktimer.cpp

@@ -1,15 +0,0 @@
-#include "ticktimer.h"
-
-TickTimer::TickTimer(Callback *whereCallback, QObject *parent) : QTimer(parent), mWhereCallback(whereCallback)
-{
-    setInterval(0);
-    setSingleShot(false);
-    connect(this, SIGNAL(timeout()), this, SLOT(onTimeout()));
-}
-
-void TickTimer::onTimeout()
-{
-    if (*mWhereCallback) {
-        (*mWhereCallback)();
-    }
-}

data/ext/qml/lib/libqmlbind/qmlbind/src/ticktimer.h

@@ -1,19 +0,0 @@
-#pragma once
-
-#include <QTimer>
-
-class TickTimer : public QTimer
-{
-    Q_OBJECT
-public:
-    typedef void (*Callback)();
-
-    explicit TickTimer(Callback *whereCallback, QObject *parent = 0);
-
-private slots:
-    void onTimeout();
-
-private:
-    Callback *mWhereCallback;
-};
-

data/lib/qml/dispatcher.rb

@@ -1,61 +0,0 @@
-require 'singleton'
-require 'monitor'
-
-module QML
-
-  class Dispatcher
-    include Singleton
-    include MonitorMixin
-
-    MAX_DURATION = 1/10.to_r
-
-    def initialize
-      super
-      @tasks = []
-    end
-
-    def add_task(&task)
-      synchronize do
-        callback_enabled = true if @tasks.empty?
-        @tasks << task
-      end
-    end
-
-    def empty?
-      synchronize do
-        @tasks.empty?
-      end
-    end
-
-    def run_tasks
-      synchronize do
-        start_time = Time.now
-        loop do
-          break if @tasks.empty?
-          break if start_time.to_r - Time.now.to_r > MAX_DURATION
-          task = @tasks.shift
-          task.call
-        end
-        callback_enabled = false if @tasks.empty?
-      end
-    end
-  end
-
-  # Runs a block asynchronously within the event loop.
-  #
-  # QML UI is not thread-safe and can only be accessed from the main thread.
-  # Use this method to set results of asynchronous tasks to UI.
-  # @example
-  #   def on_button_clicked
-  #     Thread.new do
-  #       result = do_task
-  #       QML.next_tick do
-  #         set_result_to_ui(result)
-  #       end
-  #     end
-  #   end
-  def next_tick(&block)
-    Dispatcher.instance.add_task(&block)
-  end
-  module_function :next_tick
-end