开源软件构建与测试

_service:tar_scm:libgusb.spec Changed

_service Changed

_service:tar_scm:libgusb-0.3.8.tar.xz/.github/workflows/main.yml -> _service:tar_scm:libgusb-0.3.10.tar.xz/.github/workflows/main.yml Changed

_service:tar_scm:libgusb-0.3.8.tar.xz/NEWS -> _service:tar_scm:libgusb-0.3.10.tar.xz/NEWS Changed

_service:tar_scm:libgusb-0.3.8.tar.xz/RELEASE.md -> _service:tar_scm:libgusb-0.3.10.tar.xz/RELEASE.md Changed

@@ -3,10 +3,10 @@
 
 Write `NEWS` entries for GUsb in the same format as usual.
 
-    git shortlog 0.3.7.. | grep -i -v trivial | grep -v Merge > NEWS.new
+    git shortlog 0.3.9.. | grep -i -v trivial | grep -v Merge > NEWS.new
     =================================================
-    Version 0.3.8
-    ~~~~~~~~~~~~~
+    Version 0.3.10
+    ~~~~~~~~~~~~~~
     Released: 2021-xx-xx
 
     Notes:
@@ -19,7 +19,7 @@
 Update library version if new ABI or API in `meson.build`, commit, and build tarball:
 
     # MAKE SURE THIS IS CORRECT
-    export release_ver="0.3.8"
+    export release_ver="0.3.10"
 
     git commit -a -m "Release version ${release_ver}"
     git tag -s -f -m "Release ${release_ver}" "${release_ver}"
@@ -41,7 +41,7 @@
 Send an email to devkit-devel@lists.freedesktop.org
 
     =================================================
-    GUsb 0.3.8 released!
+    GUsb 0.3.10 released!
 
     GUsb is a GObject wrapper for libusb1 that makes it easy to do
     asynchronous control, bulk and interrupt transfers with proper

_service:tar_scm:libgusb-0.3.8.tar.xz/contrib/libgusb.spec.in -> _service:tar_scm:libgusb-0.3.10.tar.xz/contrib/libgusb.spec.in Changed

_service:tar_scm:libgusb-0.3.8.tar.xz/gusb/gusb-context.c -> _service:tar_scm:libgusb-0.3.10.tar.xz/gusb/gusb-context.c Changed

@@ -35,6 +35,8 @@
 	LAST_SIGNAL
 };
 
+#define G_USB_CONTEXT_HOTPLUG_POLL_INTERVAL_DEFAULT 1000 /* ms */
+
 /**
  * GUsbContextPrivate:
  *
@@ -50,6 +52,7 @@
 	gboolean			 done_enumerate;
 	volatile gint			 thread_event_run;
 	guint				 hotplug_poll_id;
+	guint				 hotplug_poll_interval;
 	int				 debug_level;
 	GUsbContextFlags		 flags;
 	libusb_context			*ctx;
@@ -282,10 +285,8 @@
 
 	if (priv->done_enumerate)
 		device = g_usb_context_find_by_bus_address (context, bus, address, NULL);
-	if (device != NULL) {
-		g_debug ("%i:%i already exists", bus, address);
+	if (device != NULL)
 		goto out;
-	}
 
 	/* add the device */
 	device = _g_usb_device_new (context, dev, &error);
@@ -407,7 +408,7 @@
 	GUsbContextIdleHelper *helper;
 
 	helper = g_new0 (GUsbContextIdleHelper, 1);
-	helper->context = context;
+	helper->context = g_object_ref (context);
 	helper->dev = libusb_ref_device (dev);
 	helper->event = event;
 
@@ -509,6 +510,70 @@
 	}
 }
 
+static void
+g_usb_context_ensure_rescan_timeout (GUsbContext *context)
+{
+	GUsbContextPrivate *priv = context->priv;
+
+	if (priv->hotplug_poll_id > 0) {
+		g_source_remove (priv->hotplug_poll_id);
+		priv->hotplug_poll_id = 0;
+	}
+	if (priv->hotplug_poll_interval > 0) {
+		priv->hotplug_poll_id = g_timeout_add (priv->hotplug_poll_interval,
+						       g_usb_context_rescan_cb,
+						       context);
+	}
+}
+
+/**
+ * g_usb_context_get_hotplug_poll_interval:
+ * @context: a #GUsbContext
+ *
+ * Gets the poll interval for platforms like Windows that do not support `LIBUSB_CAP_HAS_HOTPLUG`.
+ *
+ * Return value: (transfer none): the interval in ms
+ *
+ * Since: 0.3.10
+ **/
+guint
+g_usb_context_get_hotplug_poll_interval (GUsbContext *context)
+{
+	GUsbContextPrivate *priv = context->priv;
+	g_return_val_if_fail (G_USB_IS_CONTEXT (context), G_MAXUINT);
+	return priv->hotplug_poll_id;
+}
+
+/**
+ * g_usb_context_set_hotplug_poll_interval:
+ * @context: a #GUsbContext
+ * @hotplug_poll_interval: the interval in ms
+ *
+ * Sets the poll interval for platforms like Windows that do not support `LIBUSB_CAP_HAS_HOTPLUG`.
+ * This defaults to 1000ms and can be changed before or after g_usb_context_enumerate() has been
+ * called.
+ *
+ * Since: 0.3.10
+ **/
+void
+g_usb_context_set_hotplug_poll_interval (GUsbContext  *context,
+					 guint hotplug_poll_interval)
+{
+	GUsbContextPrivate *priv = context->priv;
+
+	g_return_if_fail (G_USB_IS_CONTEXT (context));
+
+	/* same */
+	if (priv->hotplug_poll_interval == hotplug_poll_interval)
+		return;
+
+	priv->hotplug_poll_interval = hotplug_poll_interval;
+
+	/* if already running then change the existing timeout */
+	if (priv->hotplug_poll_id > 0)
+		g_usb_context_ensure_rescan_timeout (context);
+}
+
 /**
  * g_usb_context_enumerate:
  * @context: a #GUsbContext
@@ -532,9 +597,7 @@
 	g_usb_context_rescan (context);
 	if (!libusb_has_capability (LIBUSB_CAP_HAS_HOTPLUG)) {
 		g_debug ("platform does not do hotplug, using polling");
-		priv->hotplug_poll_id = g_timeout_add_seconds (1,
-							       g_usb_context_rescan_cb,
-							       context);
+		g_usb_context_ensure_rescan_timeout (context);
 	}
 	priv->done_enumerate = TRUE;
 
@@ -601,6 +664,7 @@
 
 	priv = context->priv = g_usb_context_get_instance_private (context);
 	priv->flags = G_USB_CONTEXT_FLAGS_NONE;
+	priv->hotplug_poll_interval = G_USB_CONTEXT_HOTPLUG_POLL_INTERVAL_DEFAULT;
 	priv->devices = g_ptr_array_new_with_free_func ((GDestroyNotify) g_object_unref);
 	priv->dict_usb_ids = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, g_free);
 	priv->dict_replug = g_hash_table_new_full (g_str_hash, g_str_equal,

_service:tar_scm:libgusb-0.3.8.tar.xz/gusb/gusb-context.h -> _service:tar_scm:libgusb-0.3.10.tar.xz/gusb/gusb-context.h Changed

_service:tar_scm:libgusb-0.3.8.tar.xz/gusb/libgusb.ver -> _service:tar_scm:libgusb-0.3.10.tar.xz/gusb/libgusb.ver Changed

_service:tar_scm:libgusb-0.3.10.tar.xz/gusb/libgusb_meson.ver Added

_service:tar_scm:libgusb-0.3.8.tar.xz/gusb/meson.build -> _service:tar_scm:libgusb-0.3.10.tar.xz/gusb/meson.build Changed

_service:tar_scm:libgusb-0.3.8.tar.xz/meson.build -> _service:tar_scm:libgusb-0.3.10.tar.xz/meson.build Changed

Changes of Revision 2