OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Set close on exec flag FD_CLOEXEC

Browse Source 
Set the close on exec flag when opening dri character devices, so they
will be closed and free any resouces allocated in exec.

Signed-off-by: David Fries <David@Fries.net>
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
This commit is contained in:
David Fries
2011-12-10 11:28:45 -06:00
committed by Dave Airlie
parent 5ea18503e7
commit b60120608f
7 changed files with 66 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/egl/drivers/dri2/platform_wayland.c
View File

@@ -748,7 +748,16 @@ drm_handle_device(void *data, struct wl_drm *drm, const char *device)
if (!dri2_dpy->device_name)
return;
dri2_dpy->fd = open(dri2_dpy->device_name, O_RDWR);
#ifdef O_CLOEXEC
dri2_dpy->fd = open(dri2_dpy->device_name, O_RDWR | O_CLOEXEC);
if (dri2_dpy->fd == -1 && errno == EINVAL)
#endif
{
dri2_dpy->fd = open(dri2_dpy->device_name, O_RDWR);
if (dri2_dpy->fd != -1)
fcntl(dri2_dpy->fd, F_SETFD, fcntl(dri2_dpy->fd, F_GETFD) |
FD_CLOEXEC);
}
if (dri2_dpy->fd == -1) {
_eglLog(_EGL_WARNING, "wayland-egl: could not open %s (%s)",
dri2_dpy->device_name, strerror(errno));

9
src/egl/drivers/dri2/platform_x11.c
View File

@@ -1083,7 +1083,16 @@ dri2_initialize_x11_dri2(_EGLDriver *drv, _EGLDisplay *disp)
if (!dri2_load_driver(disp))
goto cleanup_conn;
#ifdef O_CLOEXEC
dri2_dpy->fd = open(dri2_dpy->device_name, O_RDWR | O_CLOEXEC);
if (dri2_dpy->fd == -1 && errno == EINVAL)
#endif
{
dri2_dpy->fd = open(dri2_dpy->device_name, O_RDWR);
if (dri2_dpy->fd != -1)
fcntl(dri2_dpy->fd, F_SETFD, fcntl(dri2_dpy->fd, F_GETFD) |
FD_CLOEXEC);
}
if (dri2_dpy->fd == -1) {
_eglLog(_EGL_WARNING,
"DRI2: could not open %s (%s)", dri2_dpy->device_name,

11
src/gallium/state_trackers/egl/drm/native_drm.c
View File

@@ -312,7 +312,16 @@ native_create_display(void *dpy, boolean use_sw)
gbm = dpy;
if (gbm == NULL) {
fd = open("/dev/dri/card0", O_RDWR);
const char *device_name="/dev/dri/card0";
#ifdef O_CLOEXEC
fd = open(device_name, O_RDWR | O_CLOEXEC);
if (fd == -1 && errno == EINVAL)
#endif
{
fd = open(device_name, O_RDWR);
if (fd != -1)
fcntl(fd, F_SETFD, fcntl(fd, F_GETFD) | FD_CLOEXEC);
}
/* FIXME: Use an internal constructor to create a gbm
* device with gallium backend directly, without setenv */
setenv("GBM_BACKEND", "gbm_gallium_drm.so", 1);

11
src/gallium/state_trackers/egl/fbdev/native_fbdev.c
View File

@@ -515,7 +515,16 @@ native_create_display(void *dpy, boolean use_sw)
/* well, this makes fd 0 being ignored */
if (!dpy) {
fd = open("/dev/fb0", O_RDWR);
const char *device_name="/dev/fb0";
#ifdef O_CLOEXEC
fd = open(device_name, O_RDWR | O_CLOEXEC);
if (fd == -1 && errno == EINVAL)
#endif
{
fd = open(device_name, O_RDWR);
if (fd != -1)
fcntl(fd, F_SETFD, fcntl(fd, F_GETFD) | FD_CLOEXEC);
}
}
else {
fd = dup((int) pointer_to_intptr(dpy));

10
src/gallium/state_trackers/egl/wayland/native_drm.c
View File

@@ -133,7 +133,15 @@ drm_handle_device(void *data, struct wl_drm *drm, const char *device)
if (!drmdpy->device_name)
return;
drmdpy->fd = open(drmdpy->device_name, O_RDWR);
#ifdef O_CLOEXEC
drmdpy->fd = open(drmdpy->device_name, O_RDWR | O_CLOEXEC);
if (drmdpy->fd == -1 && errno == EINVAL)
#endif
{
drmdpy->fd = open(drmdpy->device_name, O_RDWR);
if (drmdpy->fd != -1)
fcntl(drmdpy->fd, F_SETFD, fcntl(drmdpy->fd, F_GETFD) | FD_CLOEXEC);
}
if (drmdpy->fd == -1) {
_eglLog(_EGL_WARNING, "wayland-egl: could not open %s (%s)",
drmdpy->device_name, strerror(errno));

10
src/gallium/state_trackers/egl/x11/x11_screen.c
View File

@@ -265,7 +265,15 @@ x11_screen_enable_dri2(struct x11_screen *xscr,
if (!x11_screen_probe_dri2(xscr, NULL, NULL))
return -1;
fd = open(xscr->dri_device, O_RDWR);
#ifdef O_CLOEXEC
fd = open(xscr->dri_device, O_RDWR | O_CLOEXEC);
if (fd == -1 && errno == EINVAL)
#endif
{
fd = open(xscr->dri_device, O_RDWR);
if (fd != -1)
fcntl(fd, F_SETFD, fcntl(fd, F_GETFD) | FD_CLOEXEC);
}
if (fd < 0) {
_eglLog(_EGL_WARNING, "failed to open %s", xscr->dri_device);
return -1;

10
src/glx/dri2_glx.c
View File

@@ -1045,7 +1045,15 @@ dri2CreateScreen(int screen, struct glx_display * priv)
goto handle_error;
}
psc->fd = open(deviceName, O_RDWR);
#ifdef O_CLOEXEC
psc->fd = open(deviceName, O_RDWR | O_CLOEXEC);
if (psc->fd == -1 && errno == EINVAL)
#endif
{
psc->fd = open(deviceName, O_RDWR);
if (psc->fd != -1)
fcntl(psc->fd, F_SETFD, fcntl(psc->fd, F_GETFD) | FD_CLOEXEC);
}
if (psc->fd < 0) {
ErrorMessageF("failed to open drm device: %s\n", strerror(errno));
goto handle_error;