Add some libc function #34

coolyjg · 2023-04-28T06:57:26Z

Finish some libc implementations.

stdlib.h

calloc: ax_malloc + memset
realloc declaration: Previous code lacks of declaration
strtol, atoll, strtoll, strtoul, strtoull: Some type conversion functions
exit: call ax_exit
abs, llabs: Get absolution value

stdio.h

Change stdin, stdout, stderr definition to FILE*. Accordingly change corresponding print-like functions using stdout->fd rather than number 1.
fopen: Since libc are responsible for allocating FILE* structure in fopen, this function acquires both "fs" and "alloc" feature.
fflush: Change input variable type.
vsnprintf, snprintf, vsprintf, vfprintf, sprintf: Some print-like implementation inspired by previous fprintf implementation.

time.h

clock_gettime, gmtime, time, local_time, gettimeofday: Some time implementation based on ulib/libax/src/time.rs
nanosleep: Call sleep API in task. TODO: task can be early woken up by some signal and return remained time.

unistd.h

usleep, sleep: Call sleep API in task
getpid: Call current() if "multitask" feature is on, or return 2 ("main" task Id)

Add some cbindings syscall implementation

ax_exit
ax_clock_gettime
ax_nanosleep

ulib/libax/src/time.rs

ulib/libax/src/cbindings/time.rs

ulib/libax/src/cbindings/ctask.rs

ulib/c_libax/include/limits.h

ulib/c_libax/include/stdio.h

ulib/c_libax/src/stdio.c

ulib/libax/src/cbindings/fs.rs

coolyjg · 2023-04-28T17:43:53Z

Fixed problems mentioned above
- remove non-std-like Instant function
- check time related variables validation
- merge ctask.rs and thread.rstothread.rs`
- remove ax_time, only reserve ax_clock_gettime
- call axhal::time::current_time() in ax_clock_gettime
- remove ax_sleep, ax_usleep, reserver ax_nanosleep
- merge stdin.c, stdout.c, stderr.c into stdio.c
- remove ax_fopen, and re-implemente fopen with ax_open
Add strtoll, strtoul, strtoull implementation inspired by unikraft.
getchar() remains unsolved.

equation314 · 2023-04-30T06:12:14Z

ulib/c_libax/include/ctype.h

Use #define for simple functions?

#define isalpha(a) (((unsigned)(a)|32)-'a') < 26) // ...

equation314 · 2023-04-30T06:15:35Z

ulib/c_libax/src/stdio.c

+    f = (FILE *)malloc(sizeof(FILE));
+
+    flags = __fmodeflags(mode);
+    int fd = ax_open(filename, flags, mode);


mode type in ax_open is not char *

equation314 · 2023-04-30T06:31:05Z

ulib/c_libax/include/time.h

+#define CLOCK_MONOTONIC 1
+#define CLOCKS_PER_SEC  1000000L
+
+#define ax_time_usec_to_nsec(usec) ((usec)*1000UL)


This definition is useless, use (usec)*1000 in code directly.

equation314 · 2023-04-30T06:36:32Z

ulib/libax/src/cbindings/thread.rs

+pub unsafe extern "C" fn ax_getpid() -> c_int {
+    ax_call_body!(ax_getpid, {
+        let pid = current().id().as_u64() as c_int;
+        debug!("getpid return {}", pid);


This debug info is already printed in ax_call_body

equation314 · 2023-04-30T06:37:20Z

ulib/libax/src/cbindings/thread.rs

+
+use crate::debug;
+use crate::task::exit;
+use axerrno::{LinuxError, LinuxResult};


Remove unused imports

equation314 · 2023-04-30T06:40:49Z

ulib/libax/src/cbindings/time.rs

+        unsafe {
+            *ts = ret;
+        }
+        debug!("ax_clock_gettime: {}s, {}ns", now.as_secs(), now.as_nanos());


debug!("ax_clock_gettime: {}.{:09}s", ret.tv_sec, ret.tv_nsec);

equation314 · 2023-04-30T06:43:53Z

ulib/libax/src/cbindings/time.rs

+            return Err(LinuxError::EINVAL);
+        }
+
+        let total_nano = (*req).tv_sec as u64 * NANOS_PER_SEC + (*req).tv_nsec as u64;


Add debug info for arguments:

debug!("ax_nanosleep <= {}.{:09}s", (*req).tv_sec, (*req).tv_nsec);

chyyuu · 2023-05-04T07:53:43Z

@coolyjg Very good! try to make your work better.

coolyjg · 2023-05-04T17:24:20Z

This PR will be clearer in #38

syscall: fix fd leak in epoll

* [feat] update allocator version to support alloc_pages_at * [feat] set phys-virt-offset as 0xffff_8000_0000_0000 for x86_64 qemu

coolyjg force-pushed the libc-dev branch 2 times, most recently from a678417 to a857300 Compare April 28, 2023 07:52

equation314 reviewed Apr 28, 2023

View reviewed changes

coolyjg force-pushed the libc-dev branch from a857300 to f152cfe Compare April 28, 2023 17:37

complete some libc function

69419b8

coolyjg force-pushed the libc-dev branch from 0fea8aa to 69419b8 Compare April 29, 2023 06:51

equation314 reviewed Apr 30, 2023

View reviewed changes

githubmomoko and others added 12 commits May 5, 2023 01:03

apply cfs.patch

a8fe8f1

Fix CI

6a3fe3c

x86: start to port to x86_64

cba3011

x86: add exception handling

b286d4f

x86: enable LAPIC timer interrupts

f052264

x86: add support of multicore

6cf28d8

Update README

9eb0a00

Publish crate_interface to crates.io

737c349

Rename: doc/arceos-arch.md -> doc/README.md

771615d

update build&run C apps info in README.md

fcd6eab

CI: increase app test timeout to 60s

4737680

merge main and optimize code

bb5f055

coolyjg closed this May 4, 2023

coolyjg deleted the libc-dev branch May 7, 2023 05:19

hbuxiaofei pushed a commit to hbuxiaofei/arceos that referenced this pull request Apr 29, 2024

Merge pull request arceos-org#34 from hbuxiaofei/Starry

8a515b8

syscall: fix fd leak in epoll

hky1999 added a commit that referenced this pull request Jan 1, 2025

[feat] update allocator version to support alloc_pages_at (#34)

46c3a88

* [feat] update allocator version to support alloc_pages_at * [feat] set phys-virt-offset as 0xffff_8000_0000_0000 for x86_64 qemu

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add some libc function #34

Add some libc function #34

coolyjg commented Apr 28, 2023 •

edited

Loading

coolyjg commented Apr 28, 2023 •

edited

Loading

equation314 Apr 30, 2023 •

edited

Loading

equation314 Apr 30, 2023

equation314 Apr 30, 2023

equation314 Apr 30, 2023

equation314 Apr 30, 2023 •

edited

Loading

equation314 Apr 30, 2023

equation314 Apr 30, 2023 •

edited

Loading

chyyuu commented May 4, 2023

coolyjg commented May 4, 2023 •

edited

Loading

Add some libc function #34

Add some libc function #34

Conversation

coolyjg commented Apr 28, 2023 • edited Loading

stdlib.h

stdio.h

time.h

unistd.h

coolyjg commented Apr 28, 2023 • edited Loading

equation314 Apr 30, 2023 • edited Loading

Choose a reason for hiding this comment

equation314 Apr 30, 2023

Choose a reason for hiding this comment

equation314 Apr 30, 2023

Choose a reason for hiding this comment

equation314 Apr 30, 2023

Choose a reason for hiding this comment

equation314 Apr 30, 2023 • edited Loading

Choose a reason for hiding this comment

equation314 Apr 30, 2023

Choose a reason for hiding this comment

equation314 Apr 30, 2023 • edited Loading

Choose a reason for hiding this comment

chyyuu commented May 4, 2023

coolyjg commented May 4, 2023 • edited Loading

coolyjg commented Apr 28, 2023 •

edited

Loading

coolyjg commented Apr 28, 2023 •

edited

Loading

equation314 Apr 30, 2023 •

edited

Loading

equation314 Apr 30, 2023 •

edited

Loading

equation314 Apr 30, 2023 •

edited

Loading

coolyjg commented May 4, 2023 •

edited

Loading