GNOME.org
 

[tracker-miners/sam/debug: 2/4] Remove obsolete sched-idle config option

commit fe020f8c8ac340b283266ea8a4b33e94f9704344
Author: Sam Thursfield <sam afuera me uk>
Date:   Mon Apr 20 02:14:21 2020 +0200

    Remove obsolete sched-idle config option
    
    We already don't honour this option, we always request SCHED_IDLE
    priority regardless.

 data/org.freedesktop.Tracker.Extract.gschema.xml   |  10 -
 ...org.freedesktop.Tracker.Miner.Files.gschema.xml |  10 -
 src/libtracker-miner/tracker-decorator.c           |   2 +-
 src/libtracker-miners-common/meson.build           |   1 -
 src/libtracker-miners-common/tracker-enums.h       |  13 -
 src/libtracker-miners-common/tracker-log.c         | 307 ---------------------
 src/libtracker-miners-common/tracker-log.h         |  37 ---
 src/miners/fs/tracker-config.c                     |  22 --
 src/miners/fs/tracker-config.h                     |   1 -
 src/miners/fs/tracker-main.c                       |  10 -
 src/tracker-extract/tracker-config.c               |  24 --
 src/tracker-extract/tracker-config.h               |   1 -
 src/tracker-extract/tracker-main.c                 |   2 -
 13 files changed, 1 insertion(+), 439 deletions(-)
---
diff --git a/data/org.freedesktop.Tracker.Extract.gschema.xml 
b/data/org.freedesktop.Tracker.Extract.gschema.xml
index 2bd525db4..1b3fba290 100644
--- a/data/org.freedesktop.Tracker.Extract.gschema.xml
+++ b/data/org.freedesktop.Tracker.Extract.gschema.xml
@@ -25,16 +25,6 @@ Boston, MA  02110-1301, USA.
       <description>Log verbosity.</description>
     </key>
 
-    <key name="sched-idle" enum="org.freedesktop.TrackerMiners3.TrackerSchedIdle">
-      <default>'first-index'</default>
-      <summary>Scheduler priority when idle</summary>
-      <description>
-       The scheduler is the kernel component that decides which
-       runnable application will be executed by the CPU next. Each
-       application has an associated scheduling policy and priority.
-      </description>
-    </key>
-
     <key name="max-bytes" type="i">
       <summary>Max bytes to extract</summary>
       <description>Maximum number of UTF-8 bytes to extract.</description>
diff --git a/data/org.freedesktop.Tracker.Miner.Files.gschema.xml 
b/data/org.freedesktop.Tracker.Miner.Files.gschema.xml
index 1e7a1ac25..d3ab5c4d0 100644
--- a/data/org.freedesktop.Tracker.Miner.Files.gschema.xml
+++ b/data/org.freedesktop.Tracker.Miner.Files.gschema.xml
@@ -32,16 +32,6 @@ Boston, MA  02110-1301, USA.
       <default>15</default>
     </key>
 
-    <key name="sched-idle" enum="org.freedesktop.TrackerMiners3.TrackerSchedIdle">
-      <default>'first-index'</default>
-      <summary>Scheduler priority when idle</summary>
-      <description>
-       The scheduler is the kernel component that decides which
-       runnable application will be executed by the CPU next. Each
-       application has an associated scheduling policy and priority.
-      </description>
-    </key>
-
     <key name="throttle" type="i">
       <summary>Throttle</summary>
       <description>Indexing speed, the higher the slower.</description>
diff --git a/src/libtracker-miner/tracker-decorator.c b/src/libtracker-miner/tracker-decorator.c
index eecfd2a17..b51aaca71 100644
--- a/src/libtracker-miner/tracker-decorator.c
+++ b/src/libtracker-miner/tracker-decorator.c
@@ -320,7 +320,7 @@ item_warn (TrackerSparqlConnection *conn,
 
        g_warning ("If the error above is recurrent for the same item/ID, "
                   "consider running \"%s\" in the terminal with the "
-                  "TRACKER_VERBOSITY=3 environment variable, and filing a "
+                  "G_MESSAGES_DEBUG=Tracker environment variable, and filing a "
                   "bug with the additional information", g_get_prgname ());
 
        g_debug ("Sparql was:\n%s", sparql);
diff --git a/src/libtracker-miners-common/meson.build b/src/libtracker-miners-common/meson.build
index ee0674262..2b6590b70 100644
--- a/src/libtracker-miners-common/meson.build
+++ b/src/libtracker-miners-common/meson.build
@@ -15,7 +15,6 @@ tracker_miners_common_sources = [
   'tracker-fts-config.c',
   'tracker-ioprio.c',
   'tracker-language.c',
-  'tracker-log.c',
   'tracker-sched.c',
   'tracker-type-utils.c',
   'tracker-utils.c',
diff --git a/src/libtracker-miners-common/tracker-enums.h b/src/libtracker-miners-common/tracker-enums.h
index f3e2bbd53..d54b97b90 100644
--- a/src/libtracker-miners-common/tracker-enums.h
+++ b/src/libtracker-miners-common/tracker-enums.h
@@ -22,19 +22,6 @@
 
 G_BEGIN_DECLS
 
-typedef enum {
-       TRACKER_VERBOSITY_ERRORS,
-       TRACKER_VERBOSITY_MINIMAL,
-       TRACKER_VERBOSITY_DETAILED,
-       TRACKER_VERBOSITY_DEBUG,
-} TrackerVerbosity;
-
-typedef enum {
-       TRACKER_SCHED_IDLE_ALWAYS,
-       TRACKER_SCHED_IDLE_FIRST_INDEX,
-       TRACKER_SCHED_IDLE_NEVER,
-} TrackerSchedIdle;
-
 typedef enum {
        TRACKER_SERIALIZATION_FORMAT_SPARQL,
        TRACKER_SERIALIZATION_FORMAT_TURTLE,
diff --git a/src/miners/fs/tracker-config.c b/src/miners/fs/tracker-config.c
index 9b8f002a8..328dffeaf 100644
--- a/src/miners/fs/tracker-config.c
+++ b/src/miners/fs/tracker-config.c
@@ -38,7 +38,6 @@
 
 /* Default values */
 #define DEFAULT_VERBOSITY                        0
-#define DEFAULT_SCHED_IDLE                       1
 #define DEFAULT_INITIAL_SLEEP                    15       /* 0->1000 */
 #define DEFAULT_ENABLE_MONITORS                  TRUE
 #define DEFAULT_THROTTLE                         0        /* 0->20 */
@@ -101,7 +100,6 @@ enum {
 
        /* General */
        PROP_VERBOSITY,
-       PROP_SCHED_IDLE,
        PROP_INITIAL_SLEEP,
 
        /* Monitors */
@@ -148,14 +146,6 @@ tracker_config_class_init (TrackerConfigClass *klass)
                                                            TRACKER_TYPE_VERBOSITY,
                                                            DEFAULT_VERBOSITY,
                                                            G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
-       g_object_class_install_property (object_class,
-                                        PROP_SCHED_IDLE,
-                                        g_param_spec_enum ("sched-idle",
-                                                           "Scheduler priority when idle",
-                                                           "Scheduler priority when idle (0=always, 
1=first-index, 2=never)",
-                                                           TRACKER_TYPE_SCHED_IDLE,
-                                                           DEFAULT_SCHED_IDLE,
-                                                           G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
        g_object_class_install_property (object_class,
                                         PROP_INITIAL_SLEEP,
                                         g_param_spec_int ("initial-sleep",
@@ -406,9 +396,6 @@ config_get_property (GObject    *object,
        case PROP_VERBOSITY:
                g_value_set_enum (value, tracker_config_get_verbosity (config));
                break;
-       case PROP_SCHED_IDLE:
-               g_value_set_enum (value, tracker_config_get_sched_idle (config));
-               break;
        case PROP_INITIAL_SLEEP:
                g_value_set_int (value, tracker_config_get_initial_sleep (config));
                break;
@@ -677,7 +664,6 @@ config_constructed (GObject *object)
         * config is different to the default.
         */
        g_settings_bind (settings, "verbosity", object, "verbosity", G_SETTINGS_BIND_GET | 
G_SETTINGS_BIND_GET_NO_CHANGES);
-       g_settings_bind (settings, "sched-idle", object, "sched-idle", G_SETTINGS_BIND_GET);
        g_settings_bind (settings, "initial-sleep", object, "initial-sleep", G_SETTINGS_BIND_GET | 
G_SETTINGS_BIND_GET_NO_CHANGES);
        g_settings_bind (settings, "throttle", object, "throttle", G_SETTINGS_BIND_GET);
        g_settings_bind (settings, "low-disk-space-limit", object, "low-disk-space-limit", 
G_SETTINGS_BIND_GET);
@@ -750,14 +736,6 @@ tracker_config_get_verbosity (TrackerConfig *config)
        return g_settings_get_enum (G_SETTINGS (config), "verbosity");
 }
 
-gint
-tracker_config_get_sched_idle (TrackerConfig *config)
-{
-       g_return_val_if_fail (TRACKER_IS_CONFIG (config), DEFAULT_SCHED_IDLE);
-
-       return g_settings_get_enum (G_SETTINGS (config), "sched-idle");
-}
-
 gint
 tracker_config_get_initial_sleep (TrackerConfig *config)
 {
diff --git a/src/miners/fs/tracker-config.h b/src/miners/fs/tracker-config.h
index 78b9adab5..9d70fbc74 100644
--- a/src/miners/fs/tracker-config.h
+++ b/src/miners/fs/tracker-config.h
@@ -47,7 +47,6 @@ GType          tracker_config_get_type                             (void) G_GNUC
 TrackerConfig *tracker_config_new                                  (void);
 
 gint           tracker_config_get_verbosity                        (TrackerConfig *config);
-gint           tracker_config_get_sched_idle                       (TrackerConfig *config);
 gint           tracker_config_get_initial_sleep                    (TrackerConfig *config);
 gboolean       tracker_config_get_enable_monitors                  (TrackerConfig *config);
 gint           tracker_config_get_throttle                         (TrackerConfig *config);
diff --git a/src/miners/fs/tracker-main.c b/src/miners/fs/tracker-main.c
index 28f4cb88a..a47862de4 100644
--- a/src/miners/fs/tracker-main.c
+++ b/src/miners/fs/tracker-main.c
@@ -58,7 +58,6 @@
 
 static GMainLoop *main_loop;
 
-static gint verbosity = -1;
 static gint initial_sleep = -1;
 static gboolean no_daemon;
 static gchar *eligible;
@@ -68,11 +67,6 @@ static gboolean do_crawling = FALSE;
 static gchar *domain_ontology_name = NULL;
 
 static GOptionEntry entries[] = {
-       { "verbosity", 'v', 0,
-         G_OPTION_ARG_INT, &verbosity,
-         N_("Logging, 0 = errors only, "
-            "1 = minimal, 2 = detailed and 3 = debug (default=0)"),
-         NULL },
        { "initial-sleep", 's', 0,
          G_OPTION_ARG_INT, &initial_sleep,
          N_("Initial sleep time in seconds, "
@@ -101,10 +95,6 @@ static void
 sanity_check_option_values (TrackerConfig *config)
 {
        g_message ("General options:");
-       g_message ("  Verbosity  ............................  %d",
-                  tracker_config_get_verbosity (config));
-       g_message ("  Sched Idle  ...........................  %d",
-                  tracker_config_get_sched_idle (config));
        g_message ("  Initial Sleep  ........................  %d",
                   tracker_config_get_initial_sleep (config));
        g_message ("  Writeback  ............................  %s",
diff --git a/src/tracker-extract/tracker-config.c b/src/tracker-extract/tracker-config.c
index ec24471fc..ef33a380e 100644
--- a/src/tracker-extract/tracker-config.c
+++ b/src/tracker-extract/tracker-config.c
@@ -44,7 +44,6 @@ static void     config_constructed          (GObject       *object);
 enum {
        PROP_0,
        PROP_VERBOSITY,
-       PROP_SCHED_IDLE,
        PROP_MAX_BYTES,
        PROP_MAX_MEDIA_ART_WIDTH,
        PROP_WAIT_FOR_MINER_FS,
@@ -71,14 +70,6 @@ tracker_config_class_init (TrackerConfigClass *klass)
                                                            TRACKER_TYPE_VERBOSITY,
                                                            TRACKER_VERBOSITY_ERRORS,
                                                            G_PARAM_READWRITE));
-       g_object_class_install_property (object_class,
-                                        PROP_SCHED_IDLE,
-                                        g_param_spec_enum ("sched-idle",
-                                                           "Scheduler priority when idle",
-                                                           "Scheduler priority when idle (0=always, 
1=first-index, 2=never)",
-                                                           TRACKER_TYPE_SCHED_IDLE,
-                                                           TRACKER_SCHED_IDLE_FIRST_INDEX,
-                                                           G_PARAM_READWRITE));
 
        g_object_class_install_property (object_class,
                                         PROP_MAX_BYTES,
@@ -121,7 +112,6 @@ config_set_property (GObject      *object,
                break;
 
        /* We don't care about the others... we don't save anyway. */
-       case PROP_SCHED_IDLE:
        case PROP_MAX_BYTES:
        case PROP_MAX_MEDIA_ART_WIDTH:
        case PROP_WAIT_FOR_MINER_FS:
@@ -147,11 +137,6 @@ config_get_property (GObject    *object,
                                  tracker_config_get_verbosity (config));
                break;
 
-       case PROP_SCHED_IDLE:
-               g_value_set_enum (value,
-                                 tracker_config_get_sched_idle (config));
-               break;
-
        case PROP_MAX_BYTES:
                g_value_set_int (value,
                                 tracker_config_get_max_bytes (config));
@@ -210,7 +195,6 @@ config_constructed (GObject *object)
         * config is different to the default.
         */
        g_settings_bind (settings, "verbosity", object, "verbosity", G_SETTINGS_BIND_GET | 
G_SETTINGS_BIND_GET_NO_CHANGES);
-       g_settings_bind (settings, "sched-idle", object, "sched-idle", G_SETTINGS_BIND_GET);
        g_settings_bind (settings, "wait-for-miner-fs", object, "wait-for-miner-fs", G_SETTINGS_BIND_GET);
 
        /* Cache settings accessed from extractor modules, we don't want
@@ -279,14 +263,6 @@ tracker_config_set_verbosity (TrackerConfig *config,
        g_settings_set_enum (G_SETTINGS (config), "verbosity", value);
 }
 
-gint
-tracker_config_get_sched_idle (TrackerConfig *config)
-{
-       g_return_val_if_fail (TRACKER_IS_CONFIG (config), TRACKER_SCHED_IDLE_FIRST_INDEX);
-
-       return g_settings_get_enum (G_SETTINGS (config), "sched-idle");
-}
-
 gint
 tracker_config_get_max_bytes (TrackerConfig *config)
 {
diff --git a/src/tracker-extract/tracker-config.h b/src/tracker-extract/tracker-config.h
index 66cdef890..4996fe1fb 100644
--- a/src/tracker-extract/tracker-config.h
+++ b/src/tracker-extract/tracker-config.h
@@ -47,7 +47,6 @@ GType          tracker_config_get_type                (void) G_GNUC_CONST;
 
 TrackerConfig *tracker_config_new                     (void);
 gint           tracker_config_get_verbosity           (TrackerConfig *config);
-gint           tracker_config_get_sched_idle          (TrackerConfig *config);
 gint           tracker_config_get_max_bytes           (TrackerConfig *config);
 gboolean       tracker_config_get_wait_for_miner_fs   (TrackerConfig *config);
 
diff --git a/src/tracker-extract/tracker-main.c b/src/tracker-extract/tracker-main.c
index 6839cde24..1c022a60c 100644
--- a/src/tracker-extract/tracker-main.c
+++ b/src/tracker-extract/tracker-main.c
@@ -180,8 +180,6 @@ sanity_check_option_values (TrackerConfig *config)
        g_message ("General options:");
        g_message ("  Verbosity  ............................  %d",
                   tracker_config_get_verbosity (config));
-       g_message ("  Sched Idle  ...........................  %d",
-                  tracker_config_get_sched_idle (config));
        g_message ("  Max bytes (per file)  .................  %d",
                   tracker_config_get_max_bytes (config));
 }
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]