moduos: Move times==None handling to filesystems code.

glenn20 · glenn20 · commit efb6cd7c74c4 · 2022-10-17T19:11:24.000+11:00
Because qemu-arm port does not support mp_hal_time_ns().
diff --git a/extmod/vfs.c b/extmod/vfs.c
@@ -531,11 +531,6 @@ MP_DEFINE_CONST_FUN_OBJ_1(mp_vfs_statvfs_obj, mp_vfs_statvfs);
 mp_obj_t mp_vfs_utime(size_t n_args, const mp_obj_t *args) {
     mp_obj_t path_in = args[0];
     mp_obj_t times_in = (n_args > 1) ? args[1] : mp_const_none;
-    if (times_in == mp_const_none) {
-        // If times not supplied or set to None, use current time
-        mp_obj_t t = mp_obj_new_int_from_ull(mp_hal_time_ns() / 1000000000ULL);
-        times_in = mp_obj_new_tuple(2, (mp_obj_t[2]) {t, t});
-    }
     mp_obj_t args_out[2] = {MP_OBJ_NULL, times_in};
     mp_vfs_mount_t *vfs = lookup_path(path_in, &args_out[0]);
     return mp_vfs_proxy_call(vfs, MP_QSTR_utime, 2, args_out);
diff --git a/extmod/vfs_fat.c b/extmod/vfs_fat.c
@@ -382,6 +382,11 @@ STATIC mp_obj_t fat_vfs_utime(mp_obj_t vfs_in, mp_obj_t path_in, mp_obj_t times_
     if (path[0] == 0 || (path[0] == '/' && path[1] == 0)) {
         mp_raise_OSError(MP_EPERM);
     }
+    if (times_in == mp_const_none) {
+        // If times not supplied or set to None, use current time
+        mp_obj_t t = mp_obj_new_int_from_ull(mp_hal_time_ns() / 1000000000ULL);
+        times_in = mp_obj_new_tuple(2, (mp_obj_t[2]) {t, t});
+    }
     // times_in = (atime, mtime). Ignore atime and just set mtime
     mp_obj_tuple_t *tuple = MP_OBJ_TO_PTR(times_in);
     if (!mp_obj_is_type(times_in, &mp_type_tuple) || tuple->len != 2) {
diff --git a/extmod/vfs_lfsx.c b/extmod/vfs_lfsx.c
@@ -448,6 +448,11 @@ STATIC mp_obj_t MP_VFS_LFSx(utime)(mp_obj_t self_in, mp_obj_t path_in, mp_obj_t
     const char *path = MP_VFS_LFSx(make_path)(self, path_in);
 
     if (self->enable_mtime) {
+        if (times_in == mp_const_none) {
+            // If times not supplied or set to None, use current time
+            mp_obj_t t = mp_obj_new_int_from_ull(mp_hal_time_ns() / 1000000000ULL);
+            times_in = mp_obj_new_tuple(2, (mp_obj_t[2]) {t, t});
+        }
         mp_obj_tuple_t *tuple = MP_OBJ_TO_PTR(times_in);
         if (!mp_obj_is_type(times_in, &mp_type_tuple) || tuple->len != 2) {
             mp_raise_OSError(MP_EINVAL);
diff --git a/extmod/vfs_posix.c b/extmod/vfs_posix.c
@@ -336,22 +336,31 @@ STATIC mp_obj_t vfs_posix_utime(mp_obj_t self_in, mp_obj_t path_in, mp_obj_t tim
     mp_obj_vfs_posix_t *self = MP_OBJ_TO_PTR(self_in);
     const char *path = vfs_posix_get_path_str(self, path_in);
     // times_in = (atime, mtime).
+    if (times_in == mp_const_none) {
+        // If times not supplied or set to None, use current time
+        mp_obj_t t = mp_obj_new_int_from_ull(mp_hal_time_ns() / 1000000000ULL);
+        times_in = mp_obj_new_tuple(2, (mp_obj_t[2]) {t, t});
+    }
     mp_obj_tuple_t *tuple = MP_OBJ_TO_PTR(times_in);
     if (!mp_obj_is_type(times_in, &mp_type_tuple) || tuple->len != 2) {
         mp_raise_OSError(MP_EINVAL);
     }
     #if 0
+    // utime() is obsoleted for utimes() in posix.1-2008, but not supported on windows port.
     struct timeval times[2] = {
         {mp_obj_get_int(tuple->items[0]), 0},
         {mp_obj_get_int(tuple->items[1]), 0},
     };
+    int ret;
+    MP_HAL_RETRY_SYSCALL(ret, utimes(path, &times[0]), mp_raise_OSError(err));
     #else
-    struct utimbuf times[1] = {
-        { mp_obj_get_int(tuple->items[0]), mp_obj_get_int(tuple->items[1]) }
+    struct utimbuf times = {
+        mp_obj_get_int(tuple->items[0]),
+        mp_obj_get_int(tuple->items[1])
     };
-    #endif
     int ret;
-    MP_HAL_RETRY_SYSCALL(ret, utime(path, &times[0]), mp_raise_OSError(err));
+    MP_HAL_RETRY_SYSCALL(ret, utime(path, &times), mp_raise_OSError(err));
+    #endif
     return mp_const_none;
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_3(vfs_posix_utime_obj, vfs_posix_utime);
