c684613e19
Specifically these functions are now supported:
signalfd4(), eventfd(), timerfd_create(),
pipe(), and inotify_init1()
Modified syscall_portable() to call signalfd4_portable(),
eventfd_portable(), eventfd2_portable(), and timerfd_create().
These system calls enable the read system calls to access
kernel data structures.
The signalfd4() enables read to return a signalfd_siginfo structure
which have the signal number and errno mapped until an execve().
This is similar to the maintaining a table of signal handlers to
map the signal numbers done earlier. This mapping is extended to
the process after an execve() by passing the final set of mapped
file descriptors via a pair of environment variables.
Disabling signal and file descriptor read mapping in parent
if the child would break the mapping algorithms.
This code passes at least all of the non-POSIX LTP tests,
including an updated LTP signalfd4 test that posts SIGNALS
and uses this read() mechanism to get signal info.
inotify_init1 is similar to signalfd(), timerfd() and other
filefd functions which map read() calls. Unlike signalfd(), and
similar to timerfd(), the reads don't appear to need to be mapped.
The members of the inotify_event structure appear to be generic.
The mask bits like IN_MOVE_FROM and IN_MOVE_TO are defined in
generic files. The LTP test in testcases/kernel/syscalls/inotify
test for the inotify_event structure being inotify_event structure
being read and does seem to check it contents being correct.
Change-Id: I3f2dcd4e33437ac953cd9f67f56dccc6ec6e5e6f
Signed-off-by: Pete Delaney <piet.delaney@imgtec.com>
Signed-off-by: Chris Dearman <chris.dearman@imgtec.com>
Signed-off-by: Paul Lind <paul.lind@imgtec.com>
85 lines
2.0 KiB
C
85 lines
2.0 KiB
C
/*
|
|
* Copyright 2012, The Android Open Source Project
|
|
*
|
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
|
* you may not use this file except in compliance with the License.
|
|
* You may obtain a copy of the License at
|
|
*
|
|
* http://www.apache.org/licenses/LICENSE-2.0
|
|
*
|
|
* Unless required by applicable law or agreed to in writing, software
|
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
* See the License for the specific language governing permissions and
|
|
* limitations under the License.
|
|
*/
|
|
|
|
#include <unistd.h>
|
|
#include <fcntl.h>
|
|
|
|
#include <asm/unistd.h>
|
|
#include <asm/unistd-portable.h>
|
|
|
|
#include <fcntl_portable.h>
|
|
#include <inotify_portable.h>
|
|
|
|
#include <filefd_portable.h>
|
|
|
|
|
|
#define PORTABLE_TAG "inotify_portable"
|
|
#include <log_portable.h>
|
|
|
|
extern int syscall(int, ...);
|
|
|
|
|
|
/*
|
|
* NOTE: LTP defaults to using O_CLOEXEC for IN_CLOEXEC,
|
|
* and 02000000 if O_CLOEXEC isn't defined.
|
|
*/
|
|
|
|
|
|
/*
|
|
* Portable to Native event flags mapper.
|
|
*/
|
|
static inline int in_flags_pton(int portable_flags)
|
|
{
|
|
int native_flags = 0;
|
|
|
|
ALOGV("%s(portable_flags:0x%x) {", __func__, portable_flags);
|
|
|
|
if (portable_flags & IN_NONBLOCK_PORTABLE) {
|
|
native_flags |= IN_NONBLOCK;
|
|
}
|
|
|
|
if (portable_flags & IN_CLOEXEC_PORTABLE) {
|
|
native_flags |= IN_CLOEXEC;
|
|
}
|
|
|
|
ALOGV("%s: return(native_flags:%d); }", __func__, native_flags);
|
|
return native_flags;
|
|
}
|
|
|
|
|
|
int inotify_init1_portable(int portable_flags) {
|
|
int rv;
|
|
int native_flags;
|
|
|
|
ALOGV(" ");
|
|
ALOGV("%s(portable_flags:%d) {", __func__,
|
|
portable_flags);
|
|
|
|
native_flags = in_flags_pton(portable_flags);
|
|
|
|
rv = syscall(__NR_inotify_init1, native_flags);
|
|
if (rv >= 0) {
|
|
if (native_flags & IN_CLOEXEC) {
|
|
filefd_CLOEXEC_enabled(rv);
|
|
}
|
|
filefd_opened(rv, INOTIFY_FD_TYPE);
|
|
}
|
|
|
|
ALOGV("%s: return(rv:%d); }", __func__, rv);
|
|
return rv;
|
|
}
|
|
|