frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

xfree86/linux: fix log flood on acpid open error 

When we can't open the acpid socket, warn once, not once every second
This commit is contained in:
Julien Cristau 2008-12-23 13:08:49 +01:00
parent 0d8184de59
commit 7a05c8b1e7
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
hw/xfree86/os-support/linux/lnx_acpi.c
View File

@ -133,6 +133,7 @@ lnxACPIOpen(void)
int fd; int fd;
struct sockaddr_un addr; struct sockaddr_un addr;
int r = -1; int r = -1;
static int warned = 0;
#ifdef DEBUG #ifdef DEBUG
ErrorF("ACPI: OSPMOpen called\n"); ErrorF("ACPI: OSPMOpen called\n");
@ -148,8 +149,10 @@ lnxACPIOpen(void)
addr.sun_family = AF_UNIX; addr.sun_family = AF_UNIX;
strcpy(addr.sun_path, ACPI_SOCKET); strcpy(addr.sun_path, ACPI_SOCKET);
if ((r = connect(fd, (struct sockaddr*)&addr, sizeof(addr))) == -1) { if ((r = connect(fd, (struct sockaddr*)&addr, sizeof(addr))) == -1) {
xf86MsgVerb(X_WARNING,3,"Open ACPI failed (%s) (%s)\n", ACPI_SOCKET, if (!warned)
strerror(errno)); xf86MsgVerb(X_WARNING,3,"Open ACPI failed (%s) (%s)\n",
ACPI_SOCKET, strerror(errno));
warned = 1;
shutdown(fd, 2); shutdown(fd, 2);
close(fd); close(fd);
return NULL; return NULL;
@ -160,6 +163,7 @@ lnxACPIOpen(void)
xf86PMConfirmEventToOs = lnxACPIConfirmEventToOs; xf86PMConfirmEventToOs = lnxACPIConfirmEventToOs;
ACPIihPtr = xf86AddGeneralHandler(fd,xf86HandlePMEvents,NULL); ACPIihPtr = xf86AddGeneralHandler(fd,xf86HandlePMEvents,NULL);
xf86MsgVerb(X_INFO,3,"Open ACPI successful (%s)\n", ACPI_SOCKET); xf86MsgVerb(X_INFO,3,"Open ACPI successful (%s)\n", ACPI_SOCKET);
warned = 0;
return lnxCloseACPI; return lnxCloseACPI;
} }