izackp/mosh
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use libstddjb's selfpipe instead of signalfd

Browse Source 
Use selfpipe in our client, server, and examples.
This commit is contained in:
Quentin Smith
2012-02-26 20:50:17 -05:00
committed by Keith Winstein
parent 6d65fe9f79
commit 9a3ab83783
6 changed files with 79 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/examples/Makefile.am
+2
View File
@@ -18,6 +18,8 @@ parse_LDADD = ../terminal/libmoshterminal.a ../util/libmoshutil.a -lutil $(BOOST
termemu_SOURCES = termemu.cc
termemu_CPPFLAGS = -I$(srcdir)/../terminal -I$(srcdir)/../util -I$(srcdir)/../statesync -I$(builddir)/../protobufs
termemu_LDADD = ../terminal/libmoshterminal.a ../util/libmoshutil.a ../statesync/libmoshstatesync.a ../protobufs/libmoshprotos.a -lutil $(BOOST_LDFLAGS) $(protobuf_LIBS)
termemu_CPPFLAGS += $(STDDJB_CPPFLAGS)
termemu_LDADD += $(STDDJB_LDFLAGS)
ntester_SOURCES = ntester.cc
ntester_CPPFLAGS = -I$(srcdir)/../statesync -I$(srcdir)/../terminal -I$(srcdir)/../network -I$(srcdir)/../crypto -I$(builddir)/../protobufs $(BOOST_CPPFLAGS)
src/examples/termemu.cc
+14 -16
View File
@@ -35,7 +35,6 @@
#include <sys/ioctl.h>
#include <sys/stat.h>
#include <fcntl.h>
#include <sys/signalfd.h>
#include <termios.h>
#include <sys/types.h>
#include <pwd.h>
@@ -51,6 +50,10 @@
#include "completeterminal.h"
#include "swrite.h"
extern "C" {
#include "selfpipe.h"
}
const size_t buf_size = 16384;
void emulate_terminal( int fd );
@@ -193,19 +196,14 @@ bool tick( Terminal::Framebuffer &state, const Terminal::Framebuffer &new_frame
void emulate_terminal( int fd )
{
/* establish WINCH fd and start listening for signal */
sigset_t signal_mask;
assert( sigemptyset( &signal_mask ) == 0 );
assert( sigaddset( &signal_mask, SIGWINCH ) == 0 );
/* stop "ignoring" WINCH signal */
assert( sigprocmask( SIG_BLOCK, &signal_mask, NULL ) == 0 );
int winch_fd = signalfd( -1, &signal_mask, 0 );
if ( winch_fd < 0 ) {
perror( "signalfd" );
int signal_fd = selfpipe_init();
if ( signal_fd < 0 ) {
perror( "selfpipe" );
return;
}
assert( selfpipe_trap(SIGWINCH) == 0 );
/* get current window size */
struct winsize window_size;
if ( ioctl( STDIN_FILENO, TIOCGWINSZ, &window_size ) < 0 ) {
@@ -231,7 +229,7 @@ void emulate_terminal( int fd )
pollfds[ 1 ].fd = fd;
pollfds[ 1 ].events = POLLIN;
pollfds[ 2 ].fd = winch_fd;
pollfds[ 2 ].fd = signal_fd;
pollfds[ 2 ].events = POLLIN;
swrite( STDOUT_FILENO, Terminal::Emulator::open().c_str() );
@@ -240,7 +238,9 @@ void emulate_terminal( int fd )
while ( 1 ) {
int active_fds = poll( pollfds, 3, poll_timeout );
if ( active_fds < 0 ) {
if ( active_fds < 0 && errno == EINTR ) {
continue;
} else if ( active_fds < 0 ) {
perror( "poll" );
break;
}
@@ -287,9 +287,7 @@ void emulate_terminal( int fd )
}
} else if ( pollfds[ 2 ].revents & POLLIN ) {
/* resize */
struct signalfd_siginfo info;
assert( read( winch_fd, &info, sizeof( info ) ) == sizeof( info ) );
assert( info.ssi_signo == SIGWINCH );
assert( selfpipe_read() == SIGWINCH );
/* get new size */
if ( ioctl( STDIN_FILENO, TIOCGWINSZ, &window_size ) < 0 ) {