ANDROID: Add syncfs API in liblibc #3060

shikhapanwar · 2023-01-09T09:15:48Z

This is required to sync everything in a single filesystem. Other solutions like sync() flushes all filesystems which is unnecessary, it is also impractical to call fsync on all files of the filesystem.

rustbot · 2023-01-09T09:15:52Z

Thanks for the pull request, and welcome! The Rust team is excited to review your changes, and you should hear from @JohnTitor (or someone else) soon.

Please see the contribution instructions for more information.

src/unix/linux_like/android/mod.rs

JohnTitor · 2023-01-11T08:06:57Z

Thanks! @bors r+

bors · 2023-01-11T08:07:01Z

📌 Commit c049385 has been approved by JohnTitor

It is now in the queue for this repository.

qwandor · 2023-01-17T14:41:12Z

Hi, what are the next steps to get this merged and released? It looks like it's been in the queue for a while now with no change.

JohnTitor · 2023-01-17T14:51:26Z

Seems bors didn't anything to merge, @bors retry

JohnTitor · 2023-01-17T14:51:53Z

@bors r+

bors · 2023-01-17T14:51:55Z

📌 Commit c049385 has been approved by JohnTitor

It is now in the queue for this repository.

bors · 2023-01-17T14:52:05Z

⌛ Testing commit c049385 with merge 1ac1829...

ANDROID: Add syncfs API in liblibc This is required to sync everything in a single filesystem. Other solutions like sync() flushes all filesystems which is unnecessary, it is also impractical to call fsync on all files of the filesystem.

bors · 2023-01-17T15:07:34Z

💔 Test failed - checks-actions

shikhapanwar · 2023-01-17T15:20:26Z

The test Docker Linux Tier2 (arm-linux-androideabi) fails with error:
CANNOT LINK EXECUTABLE "/data/local/tmp/main-d701c417e8b08db6": cannot locate symbol "syncfs" referenced by "/data/local/tmp/main-d701c417e8b08db6"...
Any ideas where else I need to add the symbol or what tests to modify?

JohnTitor · 2023-01-17T22:56:06Z

syncfs is added in API 28 but our ARM targets on CI use API 24:

libc/ci/android-install-sdk.sh

Lines 18 to 24 in 216a428

    
           arm | armv7) 
        
             api=24 
        
             image="system-images;android-${api};default;armeabi-v7a" 
        
             ;; 
        
           aarch64) 
        
             api=24 
        
             image="system-images;android-${api};google_apis;arm64-v8a"

Let's ignore on ARM by

adding an arm var like let arm = target.contains("arm") || target.contains("aarch64");:

libc/libc-test/build.rs

Line 1510 in 216a428

let x86 = target.contains("i686") || target.contains("x86_64");

adding a new arm like the below here:

libc/libc-test/build.rs

Lines 1779 to 1815 in 216a428

    
           cfg.skip_fn(move |name| { 
        
               // skip those that are manually verified 
        
               match name { 
        
                   // FIXME: https://github.com/rust-lang/libc/issues/1272 
        
                   "execv" | "execve" | "execvp" | "execvpe" | "fexecve" => true, 
        
                   // There are two versions of the sterror_r function, see 
        
                   // 
        
                   // https://linux.die.net/man/3/strerror_r 
        
                   // 
        
                   // An XSI-compliant version provided if: 
        
                   // 
        
                   // (_POSIX_C_SOURCE >= 200112L || _XOPEN_SOURCE >= 600) && ! _GNU_SOURCE 
        
                   // 
        
                   // and a GNU specific version provided if _GNU_SOURCE is defined. 
        
                   // 
        
                   // libc provides bindings for the XSI-compliant version, which is 
        
                   // preferred for portable applications. 
        
                   // 
        
                   // We skip the test here since here _GNU_SOURCE is defined, and 
        
                   // test the XSI version below. 
        
                   "strerror_r" => true, 
        
                   "reallocarray" => true, 
        
                   "__system_property_wait" => true, 
        
                   // Added in API level 30, but tests use level 28. 
        
                   "mlock2" => true, 
        
                   // Added in glibc 2.25. 
        
                   "getentropy" => true, 
        
                   // Added in API level 28, but some tests use level 24. 
        
                   "getrandom" => true, 
        
                   _ => false, 
        
               } 
        
           });

// Added in API level 28:
"syncfs" if arm => true

shikhapanwar · 2023-01-19T18:02:04Z

Thanks @JohnTitor ! I made the changes and all checks now pass (:
Now, presumably, another @bors r+ would be required.

bors · 2023-01-19T18:02:06Z

@shikhapanwar: 🔑 Insufficient privileges: Not in reviewers

JohnTitor · 2023-01-20T12:06:09Z

Thanks! Let's check again, @bors r+

bors · 2023-01-20T12:06:10Z

📌 Commit fde1ddf has been approved by JohnTitor

It is now in the queue for this repository.

bors · 2023-01-20T12:06:20Z

⌛ Testing commit fde1ddf with merge ad91645...

ANDROID: Add syncfs API in liblibc This is required to sync everything in a single filesystem. Other solutions like sync() flushes all filesystems which is unnecessary, it is also impractical to call fsync on all files of the filesystem.

bors · 2023-01-20T12:26:05Z

💔 Test failed - checks-actions

JohnTitor · 2023-01-28T02:44:17Z

 CANNOT LINK EXECUTABLE "/checkout/target/x86_64-linux-android/debug/deps/main-d677790ea659c418": cannot locate symbol "syncfs" referenced by "/checkout/target/x86_64-linux-android/debug/deps/main-d677790ea659c418"...
libc: CANNOT LINK EXECUTABLE "/checkout/target/x86_64-linux-android/debug/deps/main-d677790ea659c418": cannot locate symbol "syncfs" referenced by "/checkout/target/x86_64-linux-android/debug/deps/main-d677790ea659c418"...

Uhm, it's unexpected but something on x86_64 emulator is old, I guess. Let's ignore the test unconditionally.

shikhapanwar · 2023-01-30T13:22:55Z

Done. Thanks. Will require attempt at @bors r+ I presume

bors · 2023-01-30T13:22:57Z

@shikhapanwar: 🔑 Insufficient privileges: Not in reviewers

This is required to sync everything in a single filesystem. Other solutions like sync() flushes all filesystems which is unnecessary, it is also impractical to call fsync on all files of the filesystem. This patch also excludes syncfs for arm from CI.

JohnTitor · 2023-01-30T15:11:37Z

@bors r+

bors · 2023-01-30T15:11:39Z

📌 Commit ca8f072 has been approved by JohnTitor

It is now in the queue for this repository.

bors · 2023-01-30T15:11:53Z

⌛ Testing commit ca8f072 with merge af6e852...

ANDROID: Add syncfs API in liblibc This is required to sync everything in a single filesystem. Other solutions like sync() flushes all filesystems which is unnecessary, it is also impractical to call fsync on all files of the filesystem.

bors · 2023-01-30T15:13:46Z

💔 Test failed - checks-cirrus-freebsd-14

shikhapanwar · 2023-01-30T15:23:15Z

I cannot possibly explain where ld-elf.so.1: /usr/local/lib/libcurl.so.4: Undefined symbol "nghttp2_option_set_no_rfc9113_leading_and_trailing_ws_validation" is coming from for nightly x86_64-unknown-freebsd-14. Have you seen it before?

JohnTitor · 2023-01-31T08:19:10Z

That's unrelated to this PR and I've fixed the issue on master, let's retry
@bors retry

bors · 2023-01-31T08:19:21Z

⌛ Testing commit ca8f072 with merge 106b57a...

bors · 2023-01-31T09:18:54Z

☀️ Test successful - checks-actions, checks-cirrus-freebsd-12, checks-cirrus-freebsd-13, checks-cirrus-freebsd-14
Approved by: JohnTitor
Pushing 106b57a to master...

rustbot assigned JohnTitor Jan 9, 2023

rustbot added the S-waiting-on-review label Jan 9, 2023

qwandor approved these changes Jan 9, 2023

View reviewed changes

JohnTitor reviewed Jan 10, 2023

View reviewed changes

src/unix/linux_like/android/mod.rs Show resolved Hide resolved

shikhapanwar force-pushed the sycfs_for_android branch from 1aa87e6 to c049385 Compare January 11, 2023 06:05

JohnTitor approved these changes Jan 11, 2023

View reviewed changes

bors added S-waiting-on-bors and removed S-waiting-on-review labels Jan 11, 2023

bors added S-waiting-on-review and removed S-waiting-on-bors labels Jan 17, 2023

JohnTitor added S-waiting-on-author and removed S-waiting-on-review labels Jan 18, 2023

shikhapanwar force-pushed the sycfs_for_android branch from c049385 to fde1ddf Compare January 19, 2023 14:32

bors removed the S-waiting-on-author label Jan 20, 2023

bors added the S-waiting-on-bors label Jan 20, 2023

bors added S-waiting-on-review and removed S-waiting-on-bors labels Jan 20, 2023

JohnTitor added S-waiting-on-author and removed S-waiting-on-review labels Jan 28, 2023

shikhapanwar force-pushed the sycfs_for_android branch from fde1ddf to 015cb23 Compare January 30, 2023 13:22

ANDROID: Add syncfs API in liblibc

ca8f072

This is required to sync everything in a single filesystem. Other solutions like sync() flushes all filesystems which is unnecessary, it is also impractical to call fsync on all files of the filesystem. This patch also excludes syncfs for arm from CI.

shikhapanwar force-pushed the sycfs_for_android branch from 015cb23 to ca8f072 Compare January 30, 2023 13:29

bors added S-waiting-on-bors and removed S-waiting-on-author labels Jan 30, 2023

bors added S-waiting-on-review and removed S-waiting-on-bors labels Jan 30, 2023

bors added S-waiting-on-bors and removed S-waiting-on-review labels Jan 31, 2023

bors merged commit 106b57a into rust-lang:master Jan 31, 2023

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

ANDROID: Add syncfs API in liblibc #3060

ANDROID: Add syncfs API in liblibc #3060

shikhapanwar commented Jan 9, 2023 •

edited

Loading

rustbot commented Jan 9, 2023

JohnTitor commented Jan 11, 2023

bors commented Jan 11, 2023

qwandor commented Jan 17, 2023

JohnTitor commented Jan 17, 2023

JohnTitor commented Jan 17, 2023

bors commented Jan 17, 2023

bors commented Jan 17, 2023

bors commented Jan 17, 2023

shikhapanwar commented Jan 17, 2023

JohnTitor commented Jan 17, 2023

shikhapanwar commented Jan 19, 2023

bors commented Jan 19, 2023

JohnTitor commented Jan 20, 2023

bors commented Jan 20, 2023

bors commented Jan 20, 2023

bors commented Jan 20, 2023

JohnTitor commented Jan 28, 2023

shikhapanwar commented Jan 30, 2023

bors commented Jan 30, 2023

JohnTitor commented Jan 30, 2023

bors commented Jan 30, 2023

bors commented Jan 30, 2023

bors commented Jan 30, 2023

shikhapanwar commented Jan 30, 2023

JohnTitor commented Jan 31, 2023

bors commented Jan 31, 2023

bors commented Jan 31, 2023

ANDROID: Add syncfs API in liblibc #3060

ANDROID: Add syncfs API in liblibc #3060

Conversation

shikhapanwar commented Jan 9, 2023 • edited Loading

rustbot commented Jan 9, 2023

JohnTitor commented Jan 11, 2023

bors commented Jan 11, 2023

qwandor commented Jan 17, 2023

JohnTitor commented Jan 17, 2023

JohnTitor commented Jan 17, 2023

bors commented Jan 17, 2023

bors commented Jan 17, 2023

bors commented Jan 17, 2023

shikhapanwar commented Jan 17, 2023

JohnTitor commented Jan 17, 2023

shikhapanwar commented Jan 19, 2023

bors commented Jan 19, 2023

JohnTitor commented Jan 20, 2023

bors commented Jan 20, 2023

bors commented Jan 20, 2023

bors commented Jan 20, 2023

JohnTitor commented Jan 28, 2023

shikhapanwar commented Jan 30, 2023

bors commented Jan 30, 2023

JohnTitor commented Jan 30, 2023

bors commented Jan 30, 2023

bors commented Jan 30, 2023

bors commented Jan 30, 2023

shikhapanwar commented Jan 30, 2023

JohnTitor commented Jan 31, 2023

bors commented Jan 31, 2023

bors commented Jan 31, 2023

shikhapanwar commented Jan 9, 2023 •

edited

Loading