1628 |
|
* RPC handlers |
1629 |
|
*/ |
1630 |
|
|
1631 |
+ |
static GMainLoop *g_gui_loop; |
1632 |
+ |
|
1633 |
|
static int handle_ErrorAlert(rpc_connection_t *connection) |
1634 |
|
{ |
1635 |
|
D(bug("handle_ErrorAlert\n")); |
1662 |
|
{ |
1663 |
|
D(bug("handle_Exit\n")); |
1664 |
|
|
1665 |
+ |
g_main_quit(g_gui_loop); |
1666 |
|
return RPC_ERROR_NO_ERROR; |
1667 |
|
} |
1668 |
|
|
1669 |
|
|
1670 |
|
/* |
1671 |
+ |
* SIGCHLD handler |
1672 |
+ |
*/ |
1673 |
+ |
|
1674 |
+ |
static char g_app_path[PATH_MAX]; |
1675 |
+ |
static rpc_connection_t *g_gui_connection = NULL; |
1676 |
+ |
|
1677 |
+ |
static void sigchld_handler(int sig, siginfo_t *sip, void *) |
1678 |
+ |
{ |
1679 |
+ |
D(bug("Child %d exitted with status = %x\n", sip->si_pid, sip->si_status)); |
1680 |
+ |
|
1681 |
+ |
// XXX perform a new wait because sip->si_status is sometimes not |
1682 |
+ |
// the exit _value_ on MacOS X but rather the usual status field |
1683 |
+ |
// from waitpid() -- we could arrange this code in some other way... |
1684 |
+ |
int status; |
1685 |
+ |
if (waitpid(sip->si_pid, &status, 0) < 0) |
1686 |
+ |
status = sip->si_status; |
1687 |
+ |
if (WIFEXITED(status)) |
1688 |
+ |
status = WEXITSTATUS(status); |
1689 |
+ |
if (status & 0x80) |
1690 |
+ |
status |= -1 ^0xff; |
1691 |
+ |
|
1692 |
+ |
if (status < 0) { // negative -> execlp/-errno |
1693 |
+ |
char str[256]; |
1694 |
+ |
sprintf(str, GetString(STR_NO_B2_EXE_FOUND), g_app_path, strerror(-status)); |
1695 |
+ |
ErrorAlert(str); |
1696 |
+ |
status = 1; |
1697 |
+ |
} |
1698 |
+ |
|
1699 |
+ |
if (status != 0) { |
1700 |
+ |
if (g_gui_connection) |
1701 |
+ |
rpc_exit(g_gui_connection); |
1702 |
+ |
exit(status); |
1703 |
+ |
} |
1704 |
+ |
} |
1705 |
+ |
|
1706 |
+ |
|
1707 |
+ |
/* |
1708 |
|
* Start standalone GUI |
1709 |
|
*/ |
1710 |
|
|
1735 |
|
char gui_connection_path[64]; |
1736 |
|
sprintf(gui_connection_path, "/org/BasiliskII/GUI/%d", getpid()); |
1737 |
|
|
1738 |
+ |
// Catch exits from the child process |
1739 |
+ |
struct sigaction sigchld_sa, old_sigchld_sa; |
1740 |
+ |
sigemptyset(&sigchld_sa.sa_mask); |
1741 |
+ |
sigchld_sa.sa_sigaction = sigchld_handler; |
1742 |
+ |
sigchld_sa.sa_flags = SA_NOCLDSTOP | SA_SIGINFO; |
1743 |
+ |
if (sigaction(SIGCHLD, &sigchld_sa, &old_sigchld_sa) < 0) { |
1744 |
+ |
char str[256]; |
1745 |
+ |
sprintf(str, GetString(STR_SIG_INSTALL_ERR), SIGCHLD, strerror(errno)); |
1746 |
+ |
ErrorAlert(str); |
1747 |
+ |
return 1; |
1748 |
+ |
} |
1749 |
+ |
|
1750 |
|
// Search and run the BasiliskII executable |
1751 |
< |
// XXX it can be in a bundle on MacOS X |
1752 |
< |
char b2_path[PATH_MAX]; |
1753 |
< |
strcpy(b2_path, argv[0]); |
1754 |
< |
char *p = strrchr(b2_path, '/'); |
1755 |
< |
p = p ? p + 1 : b2_path; |
1756 |
< |
*p = '\0'; |
1757 |
< |
strcat(b2_path, "BasiliskII"); |
1751 |
> |
char *p; |
1752 |
> |
strcpy(g_app_path, argv[0]); |
1753 |
> |
if ((p = strstr(g_app_path, "BasiliskIIGUI.app/Contents/MacOS")) != NULL) { |
1754 |
> |
strcpy(p, "BasiliskII.app/Contents/MacOS/BasiliskII"); |
1755 |
> |
if (access(g_app_path, X_OK) < 0) { |
1756 |
> |
char str[256]; |
1757 |
> |
sprintf(str, GetString(STR_NO_B2_EXE_FOUND), g_app_path, strerror(errno)); |
1758 |
> |
WarningAlert(str); |
1759 |
> |
strcpy(g_app_path, "/Applications/BasiliskII.app/Contents/MacOS/BasiliskII"); |
1760 |
> |
} |
1761 |
> |
} else { |
1762 |
> |
p = strrchr(g_app_path, '/'); |
1763 |
> |
p = p ? p + 1 : g_app_path; |
1764 |
> |
strcpy(p, "BasiliskII"); |
1765 |
> |
} |
1766 |
|
|
1767 |
|
int pid = fork(); |
1768 |
|
if (pid == 0) { |
1769 |
< |
execl(b2_path, b2_path, "--gui-connection", gui_connection_path, (char *)NULL); |
1770 |
< |
return -errno; |
1769 |
> |
D(bug("Trying to execute %s\n", g_app_path)); |
1770 |
> |
execlp(g_app_path, g_app_path, "--gui-connection", gui_connection_path, (char *)NULL); |
1771 |
> |
#ifdef _POSIX_PRIORITY_SCHEDULING |
1772 |
> |
// XXX get a chance to run the parent process so that to not confuse/upset GTK... |
1773 |
> |
sched_yield(); |
1774 |
> |
#endif |
1775 |
> |
_exit(-errno); |
1776 |
|
} |
1777 |
|
|
1778 |
|
// Establish a connection to Basilisk II |
1779 |
< |
rpc_connection_t *connection; |
1715 |
< |
if ((connection = rpc_init_server(gui_connection_path)) == NULL) { |
1779 |
> |
if ((g_gui_connection = rpc_init_server(gui_connection_path)) == NULL) { |
1780 |
|
printf("ERROR: failed to initialize GUI-side RPC server connection\n"); |
1781 |
|
return 1; |
1782 |
|
} |
1785 |
|
{ RPC_METHOD_WARNING_ALERT, handle_WarningAlert }, |
1786 |
|
{ RPC_METHOD_EXIT, handle_Exit } |
1787 |
|
}; |
1788 |
< |
if (rpc_method_add_callbacks(connection, vtable, sizeof(vtable) / sizeof(vtable[0])) < 0) { |
1788 |
> |
if (rpc_method_add_callbacks(g_gui_connection, vtable, sizeof(vtable) / sizeof(vtable[0])) < 0) { |
1789 |
|
printf("ERROR: failed to setup GUI method callbacks\n"); |
1790 |
|
return 1; |
1791 |
|
} |
1792 |
|
int socket; |
1793 |
< |
if ((socket = rpc_listen_socket(connection)) < 0) { |
1793 |
> |
if ((socket = rpc_listen_socket(g_gui_connection)) < 0) { |
1794 |
|
printf("ERROR: failed to initialize RPC server thread\n"); |
1795 |
|
return 1; |
1796 |
|
} |
1797 |
|
|
1798 |
< |
int child_status = 1; |
1799 |
< |
GMainLoop *loop = g_main_new(TRUE); |
1736 |
< |
while (g_main_is_running(loop)) { |
1798 |
> |
g_gui_loop = g_main_new(TRUE); |
1799 |
> |
while (g_main_is_running(g_gui_loop)) { |
1800 |
|
|
1801 |
|
// Process a few events pending |
1802 |
|
const int N_EVENTS_DISPATCH = 10; |
1805 |
|
break; |
1806 |
|
} |
1807 |
|
|
1808 |
< |
// Check if the child has terminated |
1809 |
< |
int status = 1; |
1747 |
< |
int ret = waitpid(pid, &status, WNOHANG); |
1748 |
< |
if (ret == pid || (ret < 0 && errno == ECHILD)) { |
1749 |
< |
if (WIFEXITED(status)) { |
1750 |
< |
child_status = WEXITSTATUS(status); |
1751 |
< |
if (child_status & 0x80) |
1752 |
< |
child_status |= -1 ^0xff; |
1753 |
< |
} |
1754 |
< |
break; |
1755 |
< |
} |
1756 |
< |
|
1757 |
< |
// Check for RPC events |
1758 |
< |
// XXX implement an rpc_try_dispatch(connection, timeout) |
1759 |
< |
fd_set rfds; |
1760 |
< |
FD_ZERO(&rfds); |
1761 |
< |
FD_SET(socket, &rfds); |
1762 |
< |
struct timeval tv; |
1763 |
< |
tv.tv_sec = 1; |
1764 |
< |
tv.tv_usec = 0; |
1765 |
< |
ret = select(socket + 1, &rfds, NULL, NULL, &tv); |
1766 |
< |
if (ret < 0) |
1767 |
< |
break; |
1808 |
> |
// Check for RPC events (100 ms timeout) |
1809 |
> |
int ret = rpc_wait_dispatch(g_gui_connection, 100000); |
1810 |
|
if (ret == 0) |
1811 |
|
continue; |
1812 |
< |
rpc_dispatch(connection); |
1813 |
< |
} |
1814 |
< |
|
1773 |
< |
rpc_exit(connection); |
1774 |
< |
|
1775 |
< |
// Report failure to execute the BasiliskII binary |
1776 |
< |
if (child_status < 0) { |
1777 |
< |
char str[256]; |
1778 |
< |
sprintf(str, GetString(STR_NO_B2_EXE_FOUND), b2_path, strerror(-child_status)); |
1779 |
< |
ErrorAlert(str); |
1780 |
< |
return 1; |
1812 |
> |
if (ret < 0) |
1813 |
> |
break; |
1814 |
> |
rpc_dispatch(g_gui_connection); |
1815 |
|
} |
1816 |
|
|
1817 |
< |
return child_status; |
1817 |
> |
rpc_exit(g_gui_connection); |
1818 |
> |
return 0; |
1819 |
|
} |
1820 |
|
|
1821 |
|
return 0; |