Merge pull request #1063 from Qwinci/lfs64-additions

Lfs64 additions, hsearch family of functions and icmp6 define

abis/linux/fcntl.h

@@ -44,7 +44,9 @@
 
 #define F_GETLK 5
 #define F_SETLK 6
+#define F_SETLK64 F_SETLK
 #define F_SETLKW 7
+#define F_SETLKW64 F_SETLKW
 
 #define F_SETOWN_EX 15
 #define F_GETOWN_EX 16

abis/mlibc/fcntl.h

@@ -38,7 +38,9 @@
 #define F_SETFL 6
 #define F_GETLK 7
 #define F_SETLK 8
+#define F_SETLK64 F_SETLK
 #define F_SETLKW 9
+#define F_SETLKW64 F_SETLKW
 #define F_GETOWN 10
 #define F_SETOWN 11
 

meson.build

@@ -355,6 +355,7 @@ internal_sources = [
 	'options/internal/generic/strings.cpp',
 	'options/internal/generic/ubsan.cpp',
 	'options/internal/generic/threads.cpp',
+	'options/internal/generic/search.cpp',
 	'options/internal/gcc/stack_protector.cpp',
 	'options/internal/gcc/guard-abi.cpp',
 	'options/internal/gcc/initfini.cpp',
@@ -391,6 +392,7 @@ if not no_headers
 		'options/internal/include/bits/cpu_set.h',
 		'options/internal/include/bits/threads.h',
 		'options/internal/include/bits/winsize.h',
+		'options/internal/include/bits/search.h',
 		subdir: 'bits'
 	)
 endif

options/glibc/generic/search.cpp

@@ -0,0 +1,14 @@
+#include <bits/glibc/glibc_search.h>
+#include <mlibc/search.hpp>
+
+int hcreate_r(size_t num_entries, hsearch_data *htab) {
+	return mlibc::hcreate_r(num_entries, htab);
+}
+
+void hdestroy_r(hsearch_data *htab) {
+	mlibc::hdestroy_r(htab);
+}
+
+int hsearch_r(ENTRY item, ACTION action, ENTRY **ret, hsearch_data *htab) {
+	return mlibc::hsearch_r(item, action, ret, htab);
+}

options/glibc/include/bits/glibc/glibc_search.h

@@ -0,0 +1,22 @@
+#ifndef _GLIBC_SEARCH_H
+#define _GLIBC_SEARCH_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include <bits/search.h>
+
+#ifndef __MLIBC_ABI_ONLY
+
+int hcreate_r(size_t num_entries, struct hsearch_data *htab);
+void hdestroy_r(struct hsearch_data *htab);
+int hsearch_r(ENTRY item, ACTION action, ENTRY **ret, struct hsearch_data *htab);
+
+#endif
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* _GLIBC_SEARCH_H */

options/glibc/meson.build

@@ -19,6 +19,7 @@ libc_sources += files(
 	'generic/glibc-assert.cpp',
 	'generic/malloc.cpp',
 	'generic/sys-io.cpp',
+	'generic/search.cpp'
 )
 
 if not no_headers
@@ -84,6 +85,7 @@ if not no_headers
 		'include/bits/glibc/glibc_assert.h',
 		'include/bits/glibc/glibc_malloc.h',
 		'include/bits/glibc/glibc_icmp6.h',
+		'include/bits/glibc/glibc_search.h',
 		subdir: 'bits/glibc'
 	)
 endif

options/internal/generic/search.cpp

@@ -0,0 +1,98 @@
+#include <mlibc/search.hpp>
+#include <frg/string.hpp>
+#include <stdlib.h>
+#include <stdint.h>
+#include <errno.h>
+
+struct _ENTRY {
+	ENTRY entry;
+	bool used;
+};
+
+namespace mlibc {
+
+int hcreate_r(size_t num_entries, struct hsearch_data *htab) {
+	if(!htab) {
+		errno = EINVAL;
+		return 0;
+	}
+
+	htab->table = static_cast<_ENTRY*>(calloc(num_entries, sizeof(_ENTRY)));
+	if(!htab->table) {
+		errno = ENOMEM;
+		return 0;
+	}
+	htab->filled = 0;
+	htab->size = num_entries;
+	return 1;
+}
+
+void hdestroy_r(struct hsearch_data *htab) {
+	if(!htab) {
+		errno = EINVAL;
+		return;
+	}
+	free(htab->table);
+	htab->table = nullptr;
+	htab->size = 0;
+	htab->filled = 0;
+}
+
+
+int hsearch_r(ENTRY item, ACTION action, ENTRY **ret, struct hsearch_data *htab) {
+	auto key = frg::string_view{item.key};
+	auto hash = frg::hash<frg::string_view>{}(key);
+
+	size_t bucket_index = hash % htab->size;
+	size_t start = bucket_index;
+	while(true) {
+		auto &bucket = htab->table[bucket_index];
+
+		if(bucket.used) {
+			if(bucket.entry.key == key) {
+				*ret = &bucket.entry;
+				return 1;
+			}
+		} else if(action == FIND) {
+			errno = ESRCH;
+			*ret = nullptr;
+			return 0;
+		}
+
+		bucket_index = (bucket_index + 1) % htab->size;
+
+		if(bucket_index == start) {
+			if(action == FIND) {
+				errno = ESRCH;
+				*ret = nullptr;
+				return 0;
+			} else {
+				break;
+			}
+		}
+	}
+
+	// insert a new entry.
+	if(htab->size == htab->filled) {
+		errno = ENOMEM;
+		return 0;
+	}
+	++htab->filled;
+
+	bucket_index = start;
+	while(true) {
+		auto &bucket = htab->table[bucket_index];
+		if(!bucket.used) {
+			bucket.used = true;
+			bucket.entry = item;
+			*ret = &bucket.entry;
+			break;
+		}
+
+		bucket_index = (bucket_index + 1) % htab->size;
+	}
+
+	return 1;
+}
+
+} // namespace mlibc

options/internal/include/bits/search.h

@@ -0,0 +1,24 @@
+#ifndef _MLIBC_INTERNAL_SEARCH_H
+#define _MLIBC_INTERNAL_SEARCH_H
+
+#include <bits/size_t.h>
+
+typedef enum {
+	FIND,
+	ENTER
+} ACTION;
+
+typedef struct entry {
+	char *key;
+	void *data;
+} ENTRY;
+
+struct _ENTRY;
+
+struct hsearch_data {
+	struct _ENTRY *table;
+	unsigned int size;
+	unsigned int filled;
+};
+
+#endif /* _MLIBC_INTERNAL_SEARCH_H */

options/internal/include/mlibc/search.hpp

@@ -0,0 +1,14 @@
+#ifndef MLIBC_SEARCH
+#define MLIBC_SEARCH
+
+#include <bits/search.h>
+
+namespace mlibc {
+
+int hcreate_r(size_t num_entries, struct hsearch_data *htab);
+void hdestroy_r(struct hsearch_data *htab);
+int hsearch_r(ENTRY item, ACTION action, ENTRY **ret, struct hsearch_data *htab);
+
+} // namespace mlibc
+
+#endif // MLIBC_SEARCH

options/linux/generic/sys-statfs-stubs.cpp

@@ -24,3 +24,5 @@ int fstatfs(int fd, struct statfs *buf) {
 	return 0;
 }
 
+[[gnu::alias("fstatfs")]] int fstatfs64(int, struct statfs64 *);
+

options/linux/include/sys/statfs.h

@@ -11,6 +11,7 @@ extern "C" {
 
 int statfs(const char *, struct statfs *);
 int fstatfs(int, struct statfs *);
+int fstatfs64(int, struct statfs64 *);
 
 #endif /* !__MLIBC_ABI_ONLY */
 

options/posix/generic/search.cpp

@@ -4,6 +4,7 @@
 #include <stddef.h>
 #include <new>
 #include <mlibc/allocator.hpp>
+#include <mlibc/search.hpp>
 #include <frg/stack.hpp>
 #include <stdlib.h>
 
@@ -162,3 +163,23 @@ void *lfind(const void *key, const void *base, size_t *nelp,
 	__ensure(!"Not implemented");
 	__builtin_unreachable();
 }
+
+namespace {
+	hsearch_data globalTable {};
+}
+
+int hcreate(size_t num_entries) {
+	return mlibc::hcreate_r(num_entries, &globalTable);
+}
+
+void hdestroy(void) {
+	mlibc::hdestroy_r(&globalTable);
+}
+
+ENTRY *hsearch(ENTRY item, ACTION action) {
+	ENTRY *ret;
+	if(mlibc::hsearch_r(item, action, &ret, &globalTable) == 0) {
+		return nullptr;
+	}
+	return ret;
+}

options/posix/generic/sys-file-stubs.cpp

@@ -14,3 +14,5 @@ int flock(int fd, int opt) {
 	return 0;
 }
 
+[[gnu::alias("flock")]] int flock64(int fd, int opt);
+

options/posix/generic/sys-statvfs-stubs.cpp

@@ -13,7 +13,7 @@ int statvfs(const char *path, struct statvfs *out) {
 	return 0;
 }
 
-[[gnu::alias("statvfs")]] int statvfs64(const char *path, struct statvfs *out);
+[[gnu::alias("statvfs")]] int statvfs64(const char *path, struct statvfs64 *out);
 
 int fstatvfs(int fd, struct statvfs *out) {
 	MLIBC_CHECK_OR_ENOSYS(mlibc::sys_fstatvfs, -1);
@@ -24,3 +24,5 @@ int fstatvfs(int fd, struct statvfs *out) {
 	return 0;
 }
 
+[[gnu::alias("fstatvfs")]] int fstatvfs64(int, struct statvfs64 *);
+

options/posix/generic/unistd-stubs.cpp

@@ -538,6 +538,8 @@ ssize_t pread(int fd, void *buf, size_t n, off_t off) {
 	return num_read;
 }
 
+[[gnu::alias("pread")]] ssize_t pread64(int fd, void *buf, size_t n, off_t off);
+
 ssize_t pwrite(int fd, const void *buf, size_t n, off_t off) {
 	ssize_t num_written;
 
@@ -549,6 +551,8 @@ ssize_t pwrite(int fd, const void *buf, size_t n, off_t off) {
 	return num_written;
 }
 
+[[gnu::alias("pwrite")]] ssize_t pwrite64(int fd, const void *buf, size_t n, off_t off);
+
 ssize_t readlink(const char *__restrict path, char *__restrict buffer, size_t max_size) {
 	ssize_t length;
 	MLIBC_CHECK_OR_ENOSYS(mlibc::sys_readlink, -1);

options/posix/include/fcntl.h

@@ -17,6 +17,8 @@ extern "C" {
 
 #define O_NDELAY O_NONBLOCK
 
+/* WARNING: keep `flock` and `flock64` in sync or bad things will happen! */
+
 struct flock {
 	short l_type;
 	short l_whence;
@@ -25,12 +27,21 @@ struct flock {
 	pid_t l_pid;
 };
 
+struct flock64 {
+	short l_type;
+	short l_whence;
+	off_t l_start;
+	off_t l_len;
+	pid_t l_pid;
+};
+
 #ifndef __MLIBC_ABI_ONLY
 
 int creat(const char *, mode_t);
 int fallocate(int fd, int mode, off_t offset, off_t len);
 int fcntl(int fd, int command, ...);
 int open(const char *path, int flags, ...);
+int open64(const char *path, int flags, ...);
 int openat(int, const char *, int, ...);
 int posix_fadvise(int, off_t, off_t, int);
 int posix_fallocate(int, off_t, off_t);

options/posix/include/netinet/icmp6.h

@@ -20,6 +20,7 @@ extern "C" {
 #define ICMP6_FILTER_BLOCKOTHERS 3
 #define ICMP6_FILTER_PASSONLY 4
 #define ICMP6_ECHO_REQUEST 128
+#define ICMP6_ECHO_REPLY 129
 
 struct icmp6_filter {
 	uint32_t icmp6_filt[8];

options/posix/include/search.h

@@ -3,6 +3,8 @@
 #define _SEARCH_H
 
 #include <stddef.h>
+#include <bits/search.h>
+#include <mlibc-config.h>
 
 #ifdef __cplusplus
 extern "C" {
@@ -15,6 +17,10 @@ typedef enum {
   leaf
 } VISIT;
 
+#if __MLIBC_GLIBC_OPTION && defined(_GNU_SOURCE)
+#include <bits/glibc/glibc_search.h>
+#endif
+
 #ifndef __MLIBC_ABI_ONLY
 
 void *tsearch(const void *, void **, int(*compar)(const void *, const void *));
@@ -28,6 +34,10 @@ void *lsearch(const void *key, void *base, size_t *nelp, size_t width,
 void *lfind(const void *key, const void *base, size_t *nelp,
 		size_t width, int (*compar)(const void *, const void *));
 
+int hcreate(size_t num_entries);
+void hdestroy(void);
+ENTRY *hsearch(ENTRY item, ACTION action);
+
 #endif /* !__MLIBC_ABI_ONLY */
 
 #ifdef __cplusplus

options/posix/include/sys/file.h

@@ -14,6 +14,7 @@ extern "C" {
 #ifndef __MLIBC_ABI_ONLY
 
 int flock(int, int);
+int flock64(int, int);
 
 #endif /* !__MLIBC_ABI_ONLY */