408fa57864
* Add support for correctly handling subprocess termination in shell service (b/3400254 b/3482112 b/2249397) - have a waitpid() track the subprocess, then notify the fdevent via a socket - force an eof on the pty master in fdevent's new subproc handler. - modify fdevent to force-read the pty after an exit. * Migrate the "shell:blabla" handling to "#if !ADB_HOST" sections, where it belongs. * Fix the race around OOM adjusting. - Do it in the child before exec() instead of the in the parent as the child could already have started or not (no /proc/pid/... yet). * Allow for multi-threaded D() invocations to not clobber each other. - Allow locks across object files. - Add lock within D() - Make sure sysdesp init (mutex init also) is called early. * Add some missing close(fd) calls - Match similar existing practices near dup2() * Add extra D() invocations related to FD handling. * Warn about using debugging as stderr/stdout is used for protocol. * Fix some errno handling and make D() correctly handle it. * Add new adb trace_mask: services. * Make fdevent_loop's handle BADFDs more gracefully (could occur some subproc closed its pts explicitely). * Remove obsolete commandline args reported in help. (b/3509092) Change-Id: I928287fdf4f1a86777e22ce105f9581685f46e35
83 lines
2.1 KiB
C
83 lines
2.1 KiB
C
/*
|
|
* Copyright (C) 2006 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.
|
|
*/
|
|
|
|
#ifndef __FDEVENT_H
|
|
#define __FDEVENT_H
|
|
|
|
#include <stdint.h> /* for int64_t */
|
|
|
|
/* events that may be observed */
|
|
#define FDE_READ 0x0001
|
|
#define FDE_WRITE 0x0002
|
|
#define FDE_ERROR 0x0004
|
|
#define FDE_TIMEOUT 0x0008
|
|
|
|
/* features that may be set (via the events set/add/del interface) */
|
|
#define FDE_DONT_CLOSE 0x0080
|
|
|
|
typedef struct fdevent fdevent;
|
|
|
|
typedef void (*fd_func)(int fd, unsigned events, void *userdata);
|
|
|
|
/* Allocate and initialize a new fdevent object
|
|
* Note: use FD_TIMER as 'fd' to create a fd-less object
|
|
* (used to implement timers).
|
|
*/
|
|
fdevent *fdevent_create(int fd, fd_func func, void *arg);
|
|
|
|
/* Uninitialize and deallocate an fdevent object that was
|
|
** created by fdevent_create()
|
|
*/
|
|
void fdevent_destroy(fdevent *fde);
|
|
|
|
/* Initialize an fdevent object that was externally allocated
|
|
*/
|
|
void fdevent_install(fdevent *fde, int fd, fd_func func, void *arg);
|
|
|
|
/* Uninitialize an fdevent object that was initialized by
|
|
** fdevent_install()
|
|
*/
|
|
void fdevent_remove(fdevent *item);
|
|
|
|
/* Change which events should cause notifications
|
|
*/
|
|
void fdevent_set(fdevent *fde, unsigned events);
|
|
void fdevent_add(fdevent *fde, unsigned events);
|
|
void fdevent_del(fdevent *fde, unsigned events);
|
|
|
|
void fdevent_set_timeout(fdevent *fde, int64_t timeout_ms);
|
|
|
|
/* loop forever, handling events.
|
|
*/
|
|
void fdevent_loop();
|
|
|
|
struct fdevent
|
|
{
|
|
fdevent *next;
|
|
fdevent *prev;
|
|
|
|
int fd;
|
|
int force_eof;
|
|
|
|
unsigned short state;
|
|
unsigned short events;
|
|
|
|
fd_func func;
|
|
void *arg;
|
|
};
|
|
|
|
|
|
#endif
|