Differential D28478 Diff 79411 src/ioslaves/file/file_unix.cpp

Changeset View

Standalone View

View Options

src/ioslaves/file/file_unix.cpp

Show First 20 Lines • Show All 47 Lines • ▼ Show 20 Line(s)
48#include <KAuth> 48​#include <KAuth>
49#include <KRandom> 49​#include <KRandom>
50 50​
51#include "fdreceiver.h" 51​#include "fdreceiver.h"
52#include "statjob.h" 52​#include "statjob.h"
53 53​
54#if HAVE_STATX 54​#if HAVE_STATX
55#include <sys/stat.h> 55​#include <sys/stat.h>
56​#include <sys/sysmacros.h> // for makedev()
56#endif 57​#endif
57 58​
58//sendfile has different semantics in different platforms 59​//sendfile has different semantics in different platforms
59#if HAVE_SENDFILE && defined Q_OS_LINUX 60​#if HAVE_SENDFILE && defined Q_OS_LINUX
60#define USE_SENDFILE 1 61​#define USE_SENDFILE 1
61#include <sys/sendfile.h> 62​#include <sys/sendfile.h>
62#endif 63​#endif
63 64​
▲ Show 20 Lines • Show All 212 Lines • ▼ Show 20 Line(s)267inline int STAT(const char* path, struct statx * buff, KIO::StatDetails details) {
276 if (details & KIO::StatTime) { 277​ if (details & KIO::StatTime) {
277 // atime, mtime, btime 278​ // atime, mtime, btime
278 mask |= STATX_ATIME | STATX_MTIME | STATX_BTIME; 279​ mask |= STATX_ATIME | STATX_MTIME | STATX_BTIME;
279 } 280​ }
280 // KIO::Inode is ignored as when STAT is called, the entry inode field has already been filled 281​ // KIO::Inode is ignored as when STAT is called, the entry inode field has already been filled
281 return statx(AT_FDCWD, path, AT_STATX_SYNC_AS_STAT, mask, buff); 282​ return statx(AT_FDCWD, path, AT_STATX_SYNC_AS_STAT, mask, buff);
282} 283​}
283inline static uint16_t stat_mode(struct statx &buf) { return buf.stx_mode; } 284​inline static uint16_t stat_mode(struct statx &buf) { return buf.stx_mode; }
284inline static uint32_t stat_dev(struct statx &buf) { return buf.stx_dev_major; } 285​inline static dev_t stat_dev(struct statx &buf) { return makedev(buf.stx_dev_major, buf.stx_dev_minor); }
mevenUnsubmitted
Done

We should probably use makedev http://man7.org/linux/man-pages/man3/makedev.3.html in fact to ensure to match original stat behavior.

meven: We should probably use `makedev` http://man7.org/linux/man-pages/man3/makedev.3.html in fact to…
ahmadsamirAuthorUnsubmitted
Not Done

I am not an expert on stat low-level system calls; but if the goal is to have a unique UDS_DEVICE_ID, we could leave it as uint32 which is what statx returns by default, it's system specific anyway, and a system will have statx or not...

ahmadsamir: I am not an expert on stat low-level system calls; but if the goal is to have a unique…
brunsUnsubmitted
Done

* 100 is definitely wrong - maybe * 0x100, but ...

TLDR: use makedev, and change the return type to dev_t.

dev_t is defined as a 64bit type atleast on Linux, which matches the 32bit major/minor parts of buf.stx_dev_*. Traditionally, major/minor are used as low/high bytes of a 16 bit type, but these can easily exhausted on a larger system. So this is was makedev does:

#define __SYSMACROS_DEFINE_MAKEDEV(DECL_TEMPL)                  \
  __SYSMACROS_DECLARE_MAKEDEV (DECL_TEMPL)                      \
  {                                                             \
    __dev_t __dev;                                              \
    __dev  = (((__dev_t) (__major & 0x00000fffu)) <<  8);       \
    __dev |= (((__dev_t) (__major & 0xfffff000u)) << 32);       \
    __dev |= (((__dev_t) (__minor & 0x000000ffu)) <<  0);       \
    __dev |= (((__dev_t) (__minor & 0xffffff00u)) << 12);       \
    return __dev;                                               \
  }
bruns: ` * 100` is definitely wrong - maybe `* 0x100`, but ... TLDR: use `makedev`, and change the…
285inline static uint64_t stat_ino(struct statx &buf) { return buf.stx_ino; } 286​inline static uint64_t stat_ino(struct statx &buf) { return buf.stx_ino; }
286inline static uint64_t stat_size(struct statx &buf) { return buf.stx_size; } 287​inline static uint64_t stat_size(struct statx &buf) { return buf.stx_size; }
287inline static uint32_t stat_uid(struct statx &buf) { return buf.stx_uid; } 288​inline static uint32_t stat_uid(struct statx &buf) { return buf.stx_uid; }
288inline static uint32_t stat_gid(struct statx &buf) { return buf.stx_gid; } 289​inline static uint32_t stat_gid(struct statx &buf) { return buf.stx_gid; }
289inline static int64_t stat_atime(struct statx &buf) { return buf.stx_atime.tv_sec; } 290​inline static int64_t stat_atime(struct statx &buf) { return buf.stx_atime.tv_sec; }
290inline static int64_t stat_mtime(struct statx &buf) { return buf.stx_mtime.tv_sec; } 291​inline static int64_t stat_mtime(struct statx &buf) { return buf.stx_mtime.tv_sec; }
291#else 292​#else
292// regular stat struct 293​// regular stat struct
293inline int LSTAT(const char* path, QT_STATBUF * buff, KIO::StatDetails details) { 294​inline int LSTAT(const char* path, QT_STATBUF * buff, KIO::StatDetails details) {
294 Q_UNUSED(details) 295​ Q_UNUSED(details)
295 return QT_LSTAT(path, buff); 296​ return QT_LSTAT(path, buff);
296} 297​}
297inline int STAT(const char* path, QT_STATBUF * buff, KIO::StatDetails details) { 298​inline int STAT(const char* path, QT_STATBUF * buff, KIO::StatDetails details) {
298 Q_UNUSED(details) 299​ Q_UNUSED(details)
299 return QT_STAT(path, buff); 300​ return QT_STAT(path, buff);
300} 301​}
301inline static mode_t stat_mode(QT_STATBUF &buf) { return buf.st_mode; } 302​inline static mode_t stat_mode(QT_STATBUF &buf) { return buf.st_mode; }
302inline static dev_t stat_dev(QT_STATBUF &buf) { return buf.st_dev; } 303​inline static dev_t stat_dev(QT_STATBUF &buf) { return buf.st_dev; }
mevenUnsubmitted
Not Done

Did you compare with the no-statx case ?
We should try to have the same output.

meven: Did you compare with the no-statx case ? We should try to have the same output.
ahmadsamirAuthorUnsubmitted
Done

This buf.st_dev is the decimal part in:
$ stat /usr/bin/file | grep Device
Device: 804h/2052d Inode: 9168 Links: 1
that would be "2052"

whereas with statx it returns buf.stx_dev_major which is an uint32_t.

ahmadsamir: This buf.st_dev is the decimal part in: $ stat /usr/bin/file | grep Device Device: 804h/2052d…
ahmadsamirAuthorUnsubmitted
Not Done

With makedev() now I get the same numbers.

ahmadsamir: With makedev() now I get the same numbers.
303inline static ino_t stat_ino(QT_STATBUF &buf) { return buf.st_ino; } 304​inline static ino_t stat_ino(QT_STATBUF &buf) { return buf.st_ino; }
304inline static off_t stat_size(QT_STATBUF &buf) { return buf.st_size; } 305​inline static off_t stat_size(QT_STATBUF &buf) { return buf.st_size; }
305inline static uid_t stat_uid(QT_STATBUF &buf) { return buf.st_uid; } 306​inline static uid_t stat_uid(QT_STATBUF &buf) { return buf.st_uid; }
306inline static gid_t stat_gid(QT_STATBUF &buf) { return buf.st_gid; } 307​inline static gid_t stat_gid(QT_STATBUF &buf) { return buf.st_gid; }
307inline static time_t stat_atime(QT_STATBUF &buf) { return buf.st_atime; } 308​inline static time_t stat_atime(QT_STATBUF &buf) { return buf.st_atime; }
308inline static time_t stat_mtime(QT_STATBUF &buf) { return buf.st_mtime; } 309​inline static time_t stat_mtime(QT_STATBUF &buf) { return buf.st_mtime; }
309#endif 310​#endif
310 311​
▲ Show 20 Lines • Show All 1078 Lines • Show Last 20 Lines