Macintosh-HW/RASCSI
1
0
Fork 0
mirror of https://github.com/akuker/RASCSI.git synced 2024-06-10 17:29:35 +00:00
Code Issues Projects Releases Wiki Activity

Code to gracefully shutdown rascsi daemon

Browse Source 
Adding the ability to gracefully shut down the rascsi daemon via rasctl -s. Also added a logging for when Cleanup function is called, and when ListDevices is requested.
This commit is contained in:
PhrAx 2021-05-29 23:30:57 -07:00
parent dbf78b772b
commit 7ee74d253b
2 changed files with 29 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/raspberrypi/rascsi.cpp
View File

@ -208,6 +208,8 @@ BOOL Init()
void Cleanup()
{
int i;
FPRT(stdout,"Calling Cleanup.\n");
// Delete the disks
for (i = 0; i < CtrlMax * UnitNum; i++) {
@ -1042,8 +1044,17 @@ static void *MonThread(void *param)
// Remove the newline character
p[strlen(p) - 1] = 0;
// Shut down the daemon
if (xstrncasecmp(p, "shutdown", 4) == 0) {
FPRT(stdout,"Received call to shut down daemon.\n");
Cleanup();
exit(0);
}
// List all of the devices
if (xstrncasecmp(p, "list", 4) == 0) {
FPRT(stdout,"Received call to list devices.\n");
ListDevice(fp);
goto next;
}

21
src/raspberrypi/rasctl.cpp
View File

@ -72,6 +72,7 @@ int main(int argc, char* argv[])
int type;
char *file;
BOOL list;
BOOL shutdown;
int len;
char *ext;
char buf[BUFSIZ];
@ -82,6 +83,7 @@ int main(int argc, char* argv[])
type = -1;
file = NULL;
list = FALSE;
shutdown = FALSE;
// Display help
if (argc < 2) {
@ -91,14 +93,16 @@ int main(int argc, char* argv[])
__DATE__,
__TIME__);
fprintf(stderr,
"Usage: %s -i ID [-u UNIT] [-c CMD] [-t TYPE] [-f FILE]\n",
"Usage: %s -i ID [-u UNIT] [-c CMD] [-t TYPE] [-f FILE] [-s]\n",
argv[0]);
fprintf(stderr, " where ID := {0|1|2|3|4|5|6|7}\n");
fprintf(stderr, " UNIT := {0|1} default setting is 0.\n");
fprintf(stderr, " CMD := {attach|detach|insert|eject|protect}\n");
fprintf(stderr, " TYPE := {hd|mo|cd|bridge|daynaport}\n");
fprintf(stderr, " FILE := image file path\n");
fprintf(stderr, " CMD is 'attach' or 'insert' and FILE parameter is required.\n");
fprintf(stderr, " if CMD is 'attach' or 'insert', FILE parameter is required.\n");
fprintf(stderr, " -s if running, this will stop the rascsi daemon.\n");
fprintf(stderr, " if using systemd, shutdown rascsi with 'sudo systemctl stop rascsi.service'\n");
fprintf(stderr, "Usage: %s -l\n", argv[0]);
fprintf(stderr, " Print device list.\n");
exit(0);
@ -106,7 +110,7 @@ int main(int argc, char* argv[])
// Parse the arguments
opterr = 0;
while ((opt = getopt(argc, argv, "i:u:c:t:f:l")) != -1) {
while ((opt = getopt(argc, argv, "i:u:c:t:f:l:s")) != -1) {
switch (opt) {
case 'i':
id = optarg[0] - '0';
@ -181,9 +185,20 @@ int main(int argc, char* argv[])
case 'l':
list = TRUE;
break;
case 's':
shutdown = TRUE;
break;
}
}
// Shutdown the daemon
if (shutdown) {
fprintf(stderr, "Attempting to shut down daemon\n");
sprintf(buf, "shutdown\n");
SendCommand(buf);
exit(0);
}
// List display only
if (id < 0 && cmd < 0 && type < 0 && file == NULL && list) {
sprintf(buf, "list\n");