Add G_UNLIKELY in type registration.

Original commit message from CVS:
* gst/gsterror.c: (gst_g_error_get_type):
* gst/gstpadtemplate.c: (gst_pad_template_get_type),
(gst_static_pad_template_get_type):
* gst/gsttaglist.c: (gst_tag_list_get_type):
* gst/gsttagsetter.c: (gst_tag_setter_get_type):
* gst/gsttypefindfactory.c: (gst_type_find_factory_get_type):
* gst/gsturi.c: (gst_uri_handler_get_type):
* gst/gstvalue.c: (gst_date_get_type):
* gst/gstxml.c: (gst_xml_get_type):
* libs/gst/base/gstbasesink.c: (gst_base_sink_get_type),
(gst_base_sink_preroll_object), (gst_base_sink_get_position):
* libs/gst/base/gstbasesrc.c: (gst_base_src_get_type):
Add G_UNLIKELY in type registration.

diff --git a/ChangeLog b/ChangeLog
index 6582872747fe53e5e5b106e52d58174cea7ed336..02966a2a40e254e94a76b5a2f9efa3461d871ca0 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,19 @@
+2006-06-12  Wim Taymans  <wim@fluendo.com>
+
+       * gst/gsterror.c: (gst_g_error_get_type):
+       * gst/gstpadtemplate.c: (gst_pad_template_get_type),
+       (gst_static_pad_template_get_type):
+       * gst/gsttaglist.c: (gst_tag_list_get_type):
+       * gst/gsttagsetter.c: (gst_tag_setter_get_type):
+       * gst/gsttypefindfactory.c: (gst_type_find_factory_get_type):
+       * gst/gsturi.c: (gst_uri_handler_get_type):
+       * gst/gstvalue.c: (gst_date_get_type):
+       * gst/gstxml.c: (gst_xml_get_type):
+       * libs/gst/base/gstbasesink.c: (gst_base_sink_get_type),
+       (gst_base_sink_preroll_object), (gst_base_sink_get_position):
+       * libs/gst/base/gstbasesrc.c: (gst_base_src_get_type):
+       Add G_UNLIKELY in type registration.
+
 2006-06-12  Wim Taymans  <wim@fluendo.com>
 
        * tools/gst-inspect.c: (print_signal_info):

diff --git a/gst/gsterror.c b/gst/gsterror.c
index 3c0944603e07179e88cb276e358723119e5dabfb..a4f75a0470d118bb8b91f6ddf8798a8308c554df 100644 (file)
--- a/gst/gsterror.c
+++ b/gst/gsterror.c
@@ -111,7 +111,7 @@ gst_g_error_get_type (void)
 {
   static GType type = 0;
 
-  if (!type)
+  if (G_UNLIKELY (type == 0))
     type = g_boxed_type_register_static ("GstGError",
         (GBoxedCopyFunc) g_error_copy, (GBoxedFreeFunc) g_error_free);
   return type;

diff --git a/gst/gstpadtemplate.c b/gst/gstpadtemplate.c
index bff35fb060813ad326c7ed433967e5de3040f6b5..2f12f1c5d6fa560c8d9b27648f60356f8fa60e4e 100644 (file)
--- a/gst/gstpadtemplate.c
+++ b/gst/gstpadtemplate.c
@@ -128,7 +128,7 @@ gst_pad_template_get_type (void)
 {
   static GType padtemplate_type = 0;
 
-  if (!padtemplate_type) {
+  if (G_UNLIKELY (padtemplate_type == 0)) {
     static const GTypeInfo padtemplate_info = {
       sizeof (GstPadTemplateClass), NULL, NULL,
       (GClassInitFunc) gst_pad_template_class_init, NULL, NULL,
@@ -246,7 +246,7 @@ gst_static_pad_template_get_type (void)
 {
   static GType staticpadtemplate_type = 0;
 
-  if (!staticpadtemplate_type) {
+  if (G_UNLIKELY (staticpadtemplate_type == 0)) {
     staticpadtemplate_type =
         g_pointer_type_register_static ("GstStaticPadTemplate");
   }

diff --git a/gst/gsttaglist.c b/gst/gsttaglist.c
index 48246d91b1231893b01e94408104297ece279b7f..de69934c339f08fb25a8f24234e501d3bd56a4e1 100644 (file)
--- a/gst/gsttaglist.c
+++ b/gst/gsttaglist.c
@@ -67,9 +67,9 @@ static GHashTable *__tags;
 GType
 gst_tag_list_get_type (void)
 {
-  static GType _gst_tag_list_type;
+  static GType _gst_tag_list_type = 0;
 
-  if (_gst_tag_list_type == 0) {
+  if (G_UNLIKELY (_gst_tag_list_type == 0)) {
     _gst_tag_list_type = g_boxed_type_register_static ("GstTagList",
         (GBoxedCopyFunc) gst_tag_list_copy, (GBoxedFreeFunc) gst_tag_list_free);
 

diff --git a/gst/gsttagsetter.c b/gst/gsttagsetter.c
index 10301a432911a368df5dbe879f2e46abc2d65aee..afa5a9e0ba78267d64bd0c868b2daab0d2a3e35c 100644 (file)
--- a/gst/gsttagsetter.c
+++ b/gst/gsttagsetter.c
@@ -98,7 +98,7 @@ gst_tag_setter_get_type (void)
 {
   static GType tag_setter_type = 0;
 
-  if (!tag_setter_type) {
+  if (G_UNLIKELY (tag_setter_type == 0)) {
     static const GTypeInfo tag_setter_info = {
       sizeof (GstTagSetterIFace),       /* class_size */
       NULL,                     /* base_init */

diff --git a/gst/gsttypefindfactory.c b/gst/gsttypefindfactory.c
index b414ef23a03051f53f837b658ce21c29c985bf26..0a1cf1526688470910957a12d26ce335d1bcf0a4 100644 (file)
--- a/gst/gsttypefindfactory.c
+++ b/gst/gsttypefindfactory.c
@@ -102,7 +102,7 @@ gst_type_find_factory_get_type (void)
 {
   static GType typefind_type = 0;
 
-  if (!typefind_type) {
+  if (G_UNLIKELY (typefind_type == 0)) {
     static const GTypeInfo typefind_info = {
       sizeof (GstTypeFindFactoryClass),
       NULL,

diff --git a/gst/gsturi.c b/gst/gsturi.c
index 24eaa286bd92480995a31b8d860964d265681fc8..7092c8be07eabc3eb57dbbe5930f3aa7ea7a8cff 100644 (file)
--- a/gst/gsturi.c
+++ b/gst/gsturi.c
@@ -58,7 +58,7 @@ gst_uri_handler_get_type (void)
 {
   static GType urihandler_type = 0;
 
-  if (!urihandler_type) {
+  if (G_UNLIKELY (urihandler_type == 0)) {
     static const GTypeInfo urihandler_info = {
       sizeof (GstURIHandlerInterface),
       gst_uri_handler_base_init,

diff --git a/gst/gstvalue.c b/gst/gstvalue.c
index 0a06290f57acafe6f149e51443544f7233512f70..62b8c30f9fc9fff1e6d3cb432faaad060b943237 100644 (file)
--- a/gst/gstvalue.c
+++ b/gst/gstvalue.c
@@ -3802,7 +3802,7 @@ gst_date_get_type (void)
 {
   static GType gst_date_type = 0;
 
-  if (!gst_date_type) {
+  if (G_UNLIKELY (gst_date_type == 0)) {
     /* Not using G_TYPE_DATE here on purpose, even if we could
      * if GLIB_CHECK_VERSION(2,8,0) was true: we don't want the
      * serialised strings to have different type strings depending

diff --git a/gst/gstxml.c b/gst/gstxml.c
index ba1a0ef736da010dec6788e4a6dbbd2290c0f8c0..61ae6eeb2659d5f36e598cf2301f5b7cd6862b08 100644 (file)
--- a/gst/gstxml.c
+++ b/gst/gstxml.c
@@ -61,7 +61,7 @@ gst_xml_get_type (void)
 {
   static GType xml_type = 0;
 
-  if (!xml_type) {
+  if (G_UNLIKELY (xml_type == 0)) {
     static const GTypeInfo xml_info = {
       sizeof (GstXMLClass),
       NULL,

diff --git a/libs/gst/base/gstbasesink.c b/libs/gst/base/gstbasesink.c
index b109db2537f9b55acc54636bffbaad6f7d707379..db2c896071dfb905bb47c0815edbc6478ac75acc 100644 (file)
--- a/libs/gst/base/gstbasesink.c
+++ b/libs/gst/base/gstbasesink.c
@@ -237,7 +237,7 @@ gst_base_sink_get_type (void)
 {
   static GType base_sink_type = 0;
 
-  if (!base_sink_type) {
+  if (G_UNLIKELY (base_sink_type == 0)) {
     static const GTypeInfo base_sink_info = {
       sizeof (GstBaseSinkClass),
       (GBaseInitFunc) gst_base_sink_base_init,
@@ -1573,7 +1573,6 @@ gst_base_sink_preroll_object (GstBaseSink * basesink, GstPad * pad,
     if (bclass->preroll)
       if ((ret = bclass->preroll (basesink, buf)) != GST_FLOW_OK)
         goto preroll_failed;
-  } else {
   }
 
   /* commit state */

diff --git a/libs/gst/base/gstbasesrc.c b/libs/gst/base/gstbasesrc.c
index 004891c5214f6c16e543afb02dfe9e7c12a72336..7102cf5f6f51a6520845450bd32122cc9ca24850 100644 (file)
--- a/libs/gst/base/gstbasesrc.c
+++ b/libs/gst/base/gstbasesrc.c
@@ -237,7 +237,7 @@ gst_base_src_get_type (void)
 {
   static GType base_src_type = 0;
 
-  if (!base_src_type) {
+  if (G_UNLIKELY (base_src_type == 0)) {
     static const GTypeInfo base_src_info = {
       sizeof (GstBaseSrcClass),
       (GBaseInitFunc) gst_base_src_base_init,