diff options
| author | Beniamino Galvani <bgalvani@redhat.com> | 2016-08-17 14:25:27 +0200 |
|---|---|---|
| committer | Beniamino Galvani <bgalvani@redhat.com> | 2016-08-17 14:52:55 +0200 |
| commit | de2d781fe598ccd9331c20a32233a909d140f0bb (patch) | |
| tree | 8455a40fb1620843465fe2ca1fa853a53389240e | |
| parent | 6a38df023b2c4c4dbd853944b426281fda21f2f8 (diff) | |
| download | NetworkManager-bg/checkpoint-bgo757858-v2.tar.gz | |
fixup! checkpoint: add create, rollback and destroy D-Bus APIbg/checkpoint-bgo757858-v2
| -rw-r--r-- | introspection/nm-checkpoint.xml | 5 | ||||
| -rw-r--r-- | src/nm-checkpoint.c | 15 |
2 files changed, 10 insertions, 10 deletions
diff --git a/introspection/nm-checkpoint.xml b/introspection/nm-checkpoint.xml index 4bbc1617a8..d0fbda8dec 100644 --- a/introspection/nm-checkpoint.xml +++ b/introspection/nm-checkpoint.xml @@ -20,10 +20,9 @@ <!-- Created: - Timestamp of checkpoint creation expressed as the number of - seconds since the Unix Epoch. + The timestamp (in CLOCK_BOOTTIME milliseconds) of checkpoint creation. --> - <property name="Created" type="t" access="read"/> + <property name="Created" type="x" access="read"/> <!-- RollbackTimeout: diff --git a/src/nm-checkpoint.c b/src/nm-checkpoint.c index e1a7719b6a..cb1adc3973 100644 --- a/src/nm-checkpoint.c +++ b/src/nm-checkpoint.c @@ -61,7 +61,7 @@ typedef struct { typedef struct { /* properties */ GHashTable *devices; - guint64 created; + gint64 created; guint32 rollback_timeout; /* private members */ NMManager *manager; @@ -331,7 +331,8 @@ nm_checkpoint_new (NMManager *manager, GPtrArray *devices, guint32 rollback_time priv = NM_CHECKPOINT_GET_PRIVATE (self); priv->manager = manager; - priv->created = time (NULL); + priv->created = nm_utils_monotonic_timestamp_as_boottime (nm_utils_get_monotonic_timestamp_ms (), + NM_UTILS_NS_PER_MSEC); priv->rollback_timeout = rollback_timeout; priv->rollback_ts = rollback_timeout ? (nm_utils_get_monotonic_timestamp_ms () + ((gint64) rollback_timeout * 1000)) : @@ -379,7 +380,7 @@ get_property (GObject *object, guint prop_id, nm_utils_g_value_set_object_path_array (value, devices, NULL, NULL); break; case PROP_CREATED: - g_value_set_uint64 (value, priv->created); + g_value_set_int64 (value, priv->created); break; case PROP_ROLLBACK_TIMEOUT: g_value_set_uint (value, priv->rollback_timeout); @@ -413,10 +414,10 @@ nm_checkpoint_class_init (NMCheckpointClass *checkpoint_class) G_PARAM_STATIC_STRINGS); obj_properties[PROP_CREATED] = - g_param_spec_uint64 (NM_CHECKPOINT_CREATED, "", "", - 0, G_MAXUINT64, 0, - G_PARAM_READABLE | - G_PARAM_STATIC_STRINGS); + g_param_spec_int64 (NM_CHECKPOINT_CREATED, "", "", + G_MININT64, G_MAXINT64, 0, + G_PARAM_READABLE | + G_PARAM_STATIC_STRINGS); obj_properties[PROP_ROLLBACK_TIMEOUT] = g_param_spec_uint (NM_CHECKPOINT_ROLLBACK_TIMEOUT, "", "", |