Enlightenment CVS committal
Author : essiene
Project : e17
Module : apps/entrance
Dir : e17/apps/entrance/src/daemon
Modified Files:
Entranced_Display.h entranced_display.c spawner.c
Log Message:
Also did renaming on entranced_display.c. All references to Entranced_Display_
replaced with edd_, we shouldn't be promoting RSI :). Moved some more stuff
around. Once step closer
===================================================================
RCS file: /cvs/e/e17/apps/entrance/src/daemon/Entranced_Display.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- Entranced_Display.h 1 Aug 2006 05:19:49 -0000 1.1
+++ Entranced_Display.h 1 Aug 2006 05:30:58 -0000 1.2
@@ -24,11 +24,10 @@
} Entranced_Display;
-Entranced_Display* Entranced_Display_New(void);
-void Entranced_Display_Spawn_X(Entranced_Display *);
-pid_t Entranced_Display_Start_Server_Once(Entranced_Display *);
-void Entranced_Display_Spawn_Entrance(Entranced_Display *);
-int Entranced_Display_X_Restart(Entranced_Display *);
-void Entranced_Display_XReady_Set(unsigned char i);
+Entranced_Display* edd_new(void);
+void edd_spawn_x(Entranced_Display *);
+void edd_spawn_entrance(Entranced_Display *);
+int edd_x_restart(Entranced_Display *);
+void edd_x_ready_set(unsigned char i);
#endif
===================================================================
RCS file: /cvs/e/e17/apps/entrance/src/daemon/entranced_display.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- entranced_display.c 1 Aug 2006 05:19:49 -0000 1.1
+++ entranced_display.c 1 Aug 2006 05:30:58 -0000 1.2
@@ -8,11 +8,7 @@
static unsigned char x_ready = 0;
static struct sigaction _entrance_x_sa;
-void
-Entranced_Display_XReady_Set(unsigned char i)
-{
- x_ready = i;
-}
+static pid_t _start_server_once(Entranced_Display *);
/**
@@ -20,7 +16,7 @@
* @return A pointer to an Entranced_Display handle for the new context
*/
Entranced_Display *
-Entranced_Display_New(void)
+edd_new(void)
{
Entranced_Display *d;
@@ -47,7 +43,7 @@
* @param d The spawner display context that will handle this server
*/
void
-Entranced_Display_Spawn_X(Entranced_Display * d)
+edd_spawn_x(Entranced_Display * d)
{
int i = 0;
@@ -57,19 +53,73 @@
d->status = NOT_RUNNING;
while ((i < d->attempts) && (d->status != RUNNING))
{
- if ((d->pid = Entranced_Display_Start_Server_Once(d)) > 0)
+ if ((d->pid = _start_server_once(d)) > 0)
break;
++i;
}
}
+
+/**
+ * Start a new Entrance session
+ * @param d The spawner display context that this session will use
+ */
+void
+edd_spawn_entrance(Entranced_Display *d)
+{
+ char entrance_cmd[PATH_MAX];
+
+ d->client.pid = 0;
+ d->client.uid = -1;
+ d->client.gid = -1;
+ if (d->client.homedir)
+ free(d->client.homedir);
+ d->client.homedir = NULL;
+
+ snprintf(entrance_cmd, PATH_MAX, "%s -d %s", ENTRANCE, d->name);
+ if (d->config)
+ snprintf(entrance_cmd, PATH_MAX, "%s -d %s -c \"%s\" -z %d",
+ ENTRANCE, d->name, d->config, getpid());
+ else
+ snprintf(entrance_cmd, PATH_MAX, "%s -d %s -z %d", ENTRANCE, d->name,
+ getpid());
+ printf("Starting command: %s\n", entrance_cmd);
+ d->e_exe = ecore_exe_run(entrance_cmd, d);
+ d->client.pid = ecore_exe_pid_get(d->e_exe);
+}
+
+int
+edd_x_restart(Entranced_Display * d)
+{
+ /* Attempt to restart X server */
+ d->status = NOT_RUNNING;
+
+ syslog(LOG_INFO, "Attempting to restart X server.");
+ edd_spawn_x(d);
+ if (d->status != RUNNING)
+ {
+ syslog(LOG_CRIT, "Failed to restart the X server. Aborting.");
+ return 0;
+ }
+ else
+ syslog(LOG_INFO, "Successfully restarted the X server.");
+ return 1;
+}
+
+void
+edd_x_ready_set(unsigned char i)
+{
+ x_ready = i;
+}
+
+/*privates*/
/**
* Single attempt to start the X Server.
* @param d The spawner display context that will handle this server
* @return The status of the display context after the launch attempt
*/
-pid_t
-Entranced_Display_Start_Server_Once(Entranced_Display * d)
+static pid_t
+_start_server_once(Entranced_Display * d) /*seems private*/
{
double start_time;
char x_cmd[PATH_MAX];
@@ -139,50 +189,3 @@
return xpid;
}
}
-
-/**
- * Start a new Entrance session
- * @param d The spawner display context that this session will use
- */
-void
-Entranced_Display_Spawn_Entrance(Entranced_Display *d)
-{
- char entrance_cmd[PATH_MAX];
-
- d->client.pid = 0;
- d->client.uid = -1;
- d->client.gid = -1;
- if (d->client.homedir)
- free(d->client.homedir);
- d->client.homedir = NULL;
-
- snprintf(entrance_cmd, PATH_MAX, "%s -d %s", ENTRANCE, d->name);
- if (d->config)
- snprintf(entrance_cmd, PATH_MAX, "%s -d %s -c \"%s\" -z %d",
- ENTRANCE, d->name, d->config, getpid());
- else
- snprintf(entrance_cmd, PATH_MAX, "%s -d %s -z %d", ENTRANCE, d->name,
- getpid());
- printf("Starting command: %s\n", entrance_cmd);
- d->e_exe = ecore_exe_run(entrance_cmd, d);
- d->client.pid = ecore_exe_pid_get(d->e_exe);
-}
-
-int
-Entranced_Display_X_Restart(Entranced_Display * d)
-{
- /* Attempt to restart X server */
- d->status = NOT_RUNNING;
-
- syslog(LOG_INFO, "Attempting to restart X server.");
- Entranced_Display_Spawn_X(d);
- if (d->status != RUNNING)
- {
- syslog(LOG_CRIT, "Failed to restart the X server. Aborting.");
- return 0;
- }
- else
- syslog(LOG_INFO, "Successfully restarted the X server.");
- return 1;
-}
-
===================================================================
RCS file: /cvs/e/e17/apps/entrance/src/daemon/spawner.c,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -3 -r1.34 -r1.35
--- spawner.c 1 Aug 2006 05:04:35 -0000 1.34
+++ spawner.c 1 Aug 2006 05:30:58 -0000 1.35
@@ -92,7 +92,7 @@
openlog("entranced", LOG_NOWAIT, LOG_DAEMON);
/* Set up a spawner context */
- d = Entranced_Display_New();
+ d = edd_new();
entranced_ipc_display_set(d);
/* Parse command-line options */
@@ -198,7 +198,7 @@
/* Launch X Server */
syslog(LOG_INFO, "Starting X server.");
- Entranced_Display_Spawn_X(d);
+ edd_spawn_x(d);
if (d->status == NOT_RUNNING)
{
@@ -210,7 +210,7 @@
/* Run Entrance */
syslog(LOG_INFO, "Starting Entrance.");
- Entranced_Display_Spawn_Entrance(d);
+ edd_spawn_entrance(d);
/* Main program loop */
entranced_debug("Entering main loop.\n");
@@ -343,7 +343,7 @@
/* X sends SIGUSR1 to let us know it is ready */
/* if (e->number == 1)*/
/* x_ready = 1; this becomes below */
- Entranced_Display_XReady_Set(1);
+ edd_x_ready_set(1);
/* return 1; */
}
@@ -399,7 +399,7 @@
if (waitpid(d->pid, NULL, WNOHANG) > 0)
{
syslog(LOG_INFO, "The X Server apparently died as well.");
- if (!Entranced_Display_X_Restart(d))
+ if (!edd_x_restart(d))
exit(1);
}
@@ -415,7 +415,7 @@
sleep(2);
kill(d->pid, SIGKILL);
- if (!Entranced_Display_X_Restart(d))
+ if (!edd_x_restart(d))
exit(1);
}
@@ -426,7 +426,7 @@
d->client.connected = 0;
entranced_auth_user_remove(d);
- Entranced_Display_Spawn_Entrance(d);
+ edd_spawn_entrance(d);
return 1;
}
-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys -- and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
