<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[Freeswitch-trunk][15167] </title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<div id="header">FreeSWITCH Subversion</div>
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://fisheye.freeswitch.org/changelog/FreeSWITCH?cs=15167">15167</a></dd>
<dt>Author</dt> <dd>anthm</dd>
<dt>Date</dt> <dd>2009-10-16 10:48:40 -0500 (Fri, 16 Oct 2009)</dd>
</dl>
<h3>Log Message</h3>
<pre>make windows restart while it's blocking on the console <a href="http://jira.freeswitch.org/browse/FSCORE-435">FSCORE-435</a>
Should work in every case with 1 exception
if you have started to type a command on the real console and never hit enter then do a *restart* not a shutdown, you will have to complete the command.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#freeswitchtrunksrcswitch_consolec">freeswitch/trunk/src/switch_console.c</a></li>
<li><a href="#freeswitchtrunksrcswitch_corec">freeswitch/trunk/src/switch_core.c</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="freeswitchtrunksrcswitch_consolec"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/switch_console.c (15166 => 15167)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/switch_console.c 2009-10-15 20:54:34 UTC (rev 15166)
+++ freeswitch/trunk/src/switch_console.c 2009-10-16 15:48:40 UTC (rev 15167)
</span><span class="lines">@@ -841,15 +841,16 @@
</span><span class="cx"> SWITCH_DECLARE(void) switch_console_loop(void)
</span><span class="cx"> {
</span><span class="cx">
</span><del>- char cmd[2048];
- int32_t activity = 1;
- switch_size_t x = 0;
-
</del><ins>+ char cmd[2048] = "";
+ int32_t activity = 1, r;
</ins><span class="cx"> gethostname(hostname, sizeof(hostname));
</span><span class="cx">
</span><span class="cx"> while (running) {
</span><span class="cx"> int32_t arg;
</span><del>-#ifndef _MSC_VER
</del><ins>+#ifdef _MSC_VER
+ HANDLE stdinHandle = GetStdHandle(STD_INPUT_HANDLE);
+ INPUT_RECORD in[128];
+#else
</ins><span class="cx"> fd_set rfds, efds;
</span><span class="cx"> struct timeval tv = { 0, 20000 };
</span><span class="cx"> #endif
</span><span class="lines">@@ -863,11 +864,33 @@
</span><span class="cx"> switch_log_printf(SWITCH_CHANNEL_LOG_CLEAN, SWITCH_LOG_CONSOLE, "\nfreeswitch@%s> ", hostname);
</span><span class="cx"> }
</span><span class="cx"> #ifdef _MSC_VER
</span><del>- activity = WaitForSingleObject(GetStdHandle(STD_INPUT_HANDLE), 20);
</del><ins>+ r = WaitForSingleObject(stdinHandle, 200);
+ activity = 0;
</ins><span class="cx">
</span><del>- if (activity == 102) {
- fflush(stdout);
- continue;
</del><ins>+ if (r == WAIT_OBJECT_0) {
+ DWORD bytes = 0;
+ DWORD read, i;
+ PeekConsoleInput(stdinHandle, in, 128, &read);
+ for (i = 0; i < read; i++) {
+ if (in[i].EventType == KEY_EVENT && !in[i].Event.KeyEvent.bKeyDown) {
+ activity = 1;
+ break;
+ }
+ }
+ if (activity) {
+ char *end;
+ ReadConsole(stdinHandle, cmd, sizeof(cmd), &bytes, NULL);
+ end = end_of_p(cmd);
+ while(*end == '\r' || *end == '\n') {
+ *end-- = '\0';
+ }
+ }
+
+ if (cmd[0]) {
+ running = switch_console_process(cmd, 0);
+ memset(cmd, 0, sizeof(cmd));
+ }
+
</ins><span class="cx"> }
</span><span class="cx"> #else
</span><span class="cx"> FD_ZERO(&rfds);
</span><span class="lines">@@ -890,7 +913,7 @@
</span><span class="cx"> fflush(stdout);
</span><span class="cx"> continue;
</span><span class="cx"> }
</span><del>-#endif
</del><ins>+
</ins><span class="cx"> memset(&cmd, 0, sizeof(cmd));
</span><span class="cx"> for (x = 0; x < (sizeof(cmd) - 1); x++) {
</span><span class="cx"> int c = getchar();
</span><span class="lines">@@ -911,6 +934,7 @@
</span><span class="cx"> if (cmd[0]) {
</span><span class="cx"> running = switch_console_process(cmd, 0);
</span><span class="cx"> }
</span><ins>+#endif
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="freeswitchtrunksrcswitch_corec"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/switch_core.c (15166 => 15167)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/switch_core.c 2009-10-15 20:54:34 UTC (rev 15166)
+++ freeswitch/trunk/src/switch_core.c 2009-10-16 15:48:40 UTC (rev 15167)
</span><span class="lines">@@ -1593,11 +1593,36 @@
</span><span class="cx"> }
</span><span class="cx"> break;
</span><span class="cx"> case SCSC_SHUTDOWN:
</span><ins>+
+#ifdef _MSC_VER
+ {
+ HANDLE shutdown_event;
+ char path[512];
+ /* for windows we need the event to signal for shutting down a background FreeSWITCH */
+ snprintf(path, sizeof(path), "Global\\Freeswitch.%d", getpid());
+
+ /* open the event so we can signal it */
+ shutdown_event = OpenEvent(EVENT_MODIFY_STATE, FALSE, path);
+
+
+ if (shutdown_event) {
+ /* signal the event to shutdown */
+ SetEvent(shutdown_event);
+ /* cleanup */
+ CloseHandle(shutdown_event);
+ }
+ }
+#endif
+
+
</ins><span class="cx"> if (*val) {
</span><span class="cx"> switch_set_flag((&runtime), SCF_RESTART);
</span><span class="cx"> switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "Restarting\n");
</span><span class="cx"> } else {
</span><span class="cx"> switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "Shutting down\n");
</span><ins>+#ifdef _MSC_VER
+ fclose(stdin);
+#endif
</ins><span class="cx"> }
</span><span class="cx"> runtime.running = 0;
</span><span class="cx"> break;
</span></span></pre>
</div>
</div>
<div id="footer">See you at ClueCon</div>
</body>
</html>