Attachment 50062 Details for Bug 117248

[patch] handle acpid events before dbus events

powersaved-handle_acpid_before_dbus.diff (text/plain), 1.91 KB, created by Forgotten User ZhJd0F0L3x on 2005-09-15 18:18:53 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Forgotten User ZhJd0F0L3x

Created: 2005-09-15 18:18:53 UTC

Size: 1.91 KB

patch

obsolete

>Index: daemon/powersaved.cpp
>===================================================================
>RCS file: /cvsroot/powersave/powersave/daemon/powersaved.cpp,v
>retrieving revision 1.143
>diff -u -r1.143 powersaved.cpp
>--- daemon/powersaved.cpp	9 Sep 2005 17:33:31 -0000	1.143
>+++ daemon/powersaved.cpp	15 Sep 2005 17:53:58 -0000
>@@ -436,6 +436,21 @@
> 		/* measure time that functions need to process to substract from polling interval */
> 		gettimeofday(&tv_start, NULL);
> 
>+		/* ignore ACPI events if we went to sleep or the machine will possibly shutdown
>+		   because of a pressed power button. Watch out the suspend/standby functions in 
>+		   acpi.cpp where the value for this variable is set to 1*/
>+		if ( !acpidDied && FD_ISSET(hwEvent_fd, &temp_fd_set)){
>+			pDebug(DBG_DEBUG, "hw FD %d is set, handling it ...\n", hwEvent_fd);
>+			// acpid socket died ?
>+			if (handleHWEventRequest() == -2) {
>+				acpidDied = true;
>+				close(hwEvent_fd);
>+				FD_CLR(hwEvent_fd, &fd_set_reading);
>+				pDebug (DBG_ERR, "acpid socket died\n");
>+			}
>+			continue;
>+		} 
>+
> 		if (!DBus_Server::DBusDied && FD_ISSET(dbus_fd, &temp_fd_set)) {
> 			pDebug(DBG_INFO, "Handling dbus request on fd: %d", dbus_fd);
> 			if (dbus_server.handleRequest() != 0){
>@@ -485,22 +500,7 @@
> 			}
> 		}
> 
>-		/* ignore ACPI events if we went to sleep or the machine will possibly shutdown
>-		   because of a pressed power button. Watch out the suspend/standby functions in 
>-		   acpi.cpp where the value for this variable is set to 1*/
>-		if ( !acpidDied && FD_ISSET(hwEvent_fd, &temp_fd_set)){
>-			pDebug(DBG_DEBUG, "hw FD %d is set, handling it ...\n", hwEvent_fd);
>-			// acpid socket died ?
>-			if (handleHWEventRequest() == -2) {
>-				acpidDied = true;
>-				close(hwEvent_fd);
>-				FD_CLR(hwEvent_fd, &fd_set_reading);
>-				pDebug (DBG_ERR, "acpid socket died\n");
>-			}
>-			continue;
>-		} 
>-		else
>-			pDebug(DBG_DEBUG, "Timeout.\n");
>+		pDebug(DBG_DEBUG, "Timeout.\n");
> 
> 
>

Actions: View | Diff

Attachments on bug 117248: 50047 | 50062