diogo/yap-6.3
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

remove YAP sockets interface.

Browse Source
This commit is contained in:
Vitor Santos Costa 2011-02-12 23:38:24 +00:00
parent 2d07a7730e
commit 98684ba4bb
9 changed files with 19 additions and 1747 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
C/c_interface.c
View File

@ -1560,7 +1560,7 @@ YAP_ExecuteFirst(PredEntry *pe, CPredicate exec_code)
return TRUE; return TRUE;
} }
} else { } else {
(exec_code)(); return (exec_code)();
} }
} }
@ -2894,9 +2894,6 @@ YAP_Exit(int retval)
X_API void X_API void
YAP_InitSocks(char *host, long port) YAP_InitSocks(char *host, long port)
{ {
#if USE_SOCKET
Yap_init_socks(host, port);
#endif
} }
X_API void X_API void

347
C/iopreds.c
View File

@ -77,9 +77,6 @@ static char SccsId[] = "%W% %G%";
#define strncpy(X,Y,Z) strcpy(X,Y) #define strncpy(X,Y,Z) strcpy(X,Y)
#endif #endif
#if _MSC_VER || defined(__MINGW32__) #if _MSC_VER || defined(__MINGW32__)
#if USE_SOCKET
#include <winsock2.h>
#endif
#include <windows.h> #include <windows.h>
#ifndef S_ISDIR #ifndef S_ISDIR
#define S_ISDIR(x) (((x)&_S_IFDIR)==_S_IFDIR) #define S_ISDIR(x) (((x)&_S_IFDIR)==_S_IFDIR)
@ -93,10 +90,6 @@ STATIC_PROTO (int console_post_process_read_char, (int, StreamDesc *));
STATIC_PROTO (int console_post_process_eof, (StreamDesc *)); STATIC_PROTO (int console_post_process_eof, (StreamDesc *));
STATIC_PROTO (int post_process_read_char, (int, StreamDesc *)); STATIC_PROTO (int post_process_read_char, (int, StreamDesc *));
STATIC_PROTO (int post_process_eof, (StreamDesc *)); STATIC_PROTO (int post_process_eof, (StreamDesc *));
#if USE_SOCKET
STATIC_PROTO (int SocketPutc, (int, int));
STATIC_PROTO (int ConsoleSocketPutc, (int, int));
#endif
STATIC_PROTO (int PipePutc, (int, int)); STATIC_PROTO (int PipePutc, (int, int));
STATIC_PROTO (int ConsolePipePutc, (int, int)); STATIC_PROTO (int ConsolePipePutc, (int, int));
STATIC_PROTO (int ConsolePutc, (int, int)); STATIC_PROTO (int ConsolePutc, (int, int));
@ -109,10 +102,6 @@ STATIC_PROTO (int ISOWGetc, (int));
STATIC_PROTO (int ConsoleGetc, (int)); STATIC_PROTO (int ConsoleGetc, (int));
STATIC_PROTO (int PipeGetc, (int)); STATIC_PROTO (int PipeGetc, (int));
STATIC_PROTO (int ConsolePipeGetc, (int)); STATIC_PROTO (int ConsolePipeGetc, (int));
#if USE_SOCKET
STATIC_PROTO (int SocketGetc, (int));
STATIC_PROTO (int ConsoleSocketGetc, (int));
#endif
#if HAVE_LIBREADLINE && HAVE_READLINE_READLINE_H #if HAVE_LIBREADLINE && HAVE_READLINE_READLINE_H
STATIC_PROTO (int ReadlineGetc, (int)); STATIC_PROTO (int ReadlineGetc, (int));
STATIC_PROTO (int ReadlinePutc, (int,int)); STATIC_PROTO (int ReadlinePutc, (int,int));
@ -262,7 +251,6 @@ yap_fflush(int sno)
if ( (Stream[sno].status & Output_Stream_f) && if ( (Stream[sno].status & Output_Stream_f) &&
! (Stream[sno].status & ! (Stream[sno].status &
(Null_Stream_f| (Null_Stream_f|
Socket_Stream_f|
Pipe_Stream_f| Pipe_Stream_f|
Free_Stream_f)) ) { Free_Stream_f)) ) {
if (Stream[sno].status & SWI_Stream_f) { if (Stream[sno].status & SWI_Stream_f) {
@ -276,17 +264,6 @@ yap_fflush(int sno)
static void static void
unix_upd_stream_info (StreamDesc * s) unix_upd_stream_info (StreamDesc * s)
{ {
#if USE_SOCKET
if (Yap_sockets_io &&
s->u.file.file == NULL)
{
s->status |= Socket_Stream_f;
s->u.socket.domain = af_inet;
s->u.socket.flags = client_socket;
s->u.socket.fd = 0;
return;
}
#endif /* USE_SOCKET */
#if _MSC_VER || defined(__MINGW32__) #if _MSC_VER || defined(__MINGW32__)
{ {
if ( if (
@ -346,11 +323,6 @@ p_always_prompt_user(void)
s->status |= Promptable_Stream_f; s->status |= Promptable_Stream_f;
s->stream_gets = DefaultGets; s->stream_gets = DefaultGets;
#if USE_SOCKET
if (s->status & Socket_Stream_f) {
s->stream_getc = ConsoleSocketGetc;
} else
#endif
#if HAVE_LIBREADLINE && HAVE_READLINE_READLINE_H #if HAVE_LIBREADLINE && HAVE_READLINE_READLINE_H
if (s->status & Tty_Stream_f) { if (s->status & Tty_Stream_f) {
s->stream_getc = ReadlineGetc; s->stream_getc = ReadlineGetc;
@ -390,14 +362,6 @@ static void
InitFileIO(StreamDesc *s) InitFileIO(StreamDesc *s)
{ {
s->stream_gets = PlGetsFunc(); s->stream_gets = PlGetsFunc();
#if USE_SOCKET
if (s->status & Socket_Stream_f) {
/* Console is a socket and socket will prompt */
s->stream_putc = ConsoleSocketPutc;
s->stream_wputc = put_wchar;
s->stream_getc = ConsoleSocketGetc;
} else
#endif
if (s->status & Pipe_Stream_f) { if (s->status & Pipe_Stream_f) {
/* Console is a socket and socket will prompt */ /* Console is a socket and socket will prompt */
s->stream_putc = ConsolePipePutc; s->stream_putc = ConsolePipePutc;
@ -486,15 +450,9 @@ InitStdStream (int sno, SMALLUNSGN flags, YP_File file)
static void static void
InitStdStreams (void) InitStdStreams (void)
{ {
if (Yap_sockets_io) { InitStdStream (StdInStream, Input_Stream_f, stdin);
InitStdStream (StdInStream, Input_Stream_f, NULL); InitStdStream (StdOutStream, Output_Stream_f, stdout);
InitStdStream (StdOutStream, Output_Stream_f, NULL); InitStdStream (StdErrStream, Output_Stream_f, stderr);
InitStdStream (StdErrStream, Output_Stream_f, NULL);
} else {
InitStdStream (StdInStream, Input_Stream_f, stdin);
InitStdStream (StdOutStream, Output_Stream_f, stdout);
InitStdStream (StdErrStream, Output_Stream_f, stderr);
}
Yap_c_input_stream = StdInStream; Yap_c_input_stream = StdInStream;
Yap_c_output_stream = StdOutStream; Yap_c_output_stream = StdOutStream;
Yap_c_error_stream = StdErrStream; Yap_c_error_stream = StdErrStream;
@ -797,66 +755,6 @@ IOSWIWideGetc(int sno)
return ch; return ch;
} }
#if USE_SOCKET
/* static */
static int
ConsoleSocketPutc (int sno, int ch)
{
StreamDesc *s = &Stream[sno];
char c = ch;
#if MAC || _MSC_VER
if (ch == 10)
{
ch = '\n';
}
#endif
#if _MSC_VER || defined(__MINGW32__)
send(s->u.socket.fd, &c, sizeof(c), 0);
#else
if (write(s->u.socket.fd, &c, sizeof(c)) < 0) {
#if HAVE_STRERROR
Yap_Error(FATAL_ERROR, TermNil, "no access to console: %s", strerror(errno));
#else
Yap_Error(FATAL_ERROR, TermNil, "no access to console");
#endif
}
#endif
count_output_char(ch,s);
return ((int) ch);
}
static int
SocketPutc (int sno, int ch)
{
StreamDesc *s = &Stream[sno];
char c = ch;
#if MAC || _MSC_VER
if (ch == 10)
{
ch = '\n';
}
#endif
#if _MSC_VER || defined(__MINGW32__)
send(s->u.socket.fd, &c, sizeof(c), 0);
#else
{
int out = 0;
while (!out) {
out = write(s->u.socket.fd, &c, sizeof(c));
if (out <0) {
#if HAVE_STRERROR
Yap_Error(PERMISSION_ERROR_INPUT_STREAM, TermNil, "error writing stream socket: %s", strerror(errno));
#else
Yap_Error(PERMISSION_ERROR_INPUT_STREAM, TermNil, "error writing stream socket");
#endif
}
}
}
#endif
return (int) ch;
}
#endif
/* static */ /* static */
static int static int
@ -1189,15 +1087,6 @@ EOFGetc(int sno)
if (YP_feof (s->u.file.file)) if (YP_feof (s->u.file.file))
YP_clearerr (s->u.file.file); YP_clearerr (s->u.file.file);
/* reset our function for reading input */ /* reset our function for reading input */
#if USE_SOCKET
if (s->status & Socket_Stream_f) {
if (s->status & Promptable_Stream_f)
s->stream_putc = ConsoleSocketPutc;
else
s->stream_putc = SocketPutc;
s->stream_wputc = put_wchar;
} else
#endif
if (s->status & Pipe_Stream_f) { if (s->status & Pipe_Stream_f) {
if (s->status & Promptable_Stream_f) if (s->status & Promptable_Stream_f)
s->stream_putc = ConsolePipePutc; s->stream_putc = ConsolePipePutc;
@ -1304,83 +1193,6 @@ console_post_process_eof(StreamDesc *s)
return EOFCHAR; return EOFCHAR;
} }
#if USE_SOCKET
/*
sockets cannot use standard FILE *, we have to go through fds, and in the
case of VC++, we have to use the receive routines...
*/
static int
SocketGetc(int sno)
{
register StreamDesc *s = &Stream[sno];
register Int ch;
char c;
int count;
/* should be able to use a buffer */
#if _MSC_VER || defined(__MINGW32__)
count = recv(s->u.socket.fd, &c, sizeof(char), 0);
#else
count = read(s->u.socket.fd, &c, sizeof(char));
#endif
if (count == 0) {
s->u.socket.flags = closed_socket;
return post_process_eof(s);
} else if (count > 0) {
ch = c;
} else {
#if HAVE_STRERROR
Yap_Error(SYSTEM_ERROR, TermNil,
"( socket_getc: %s)", strerror(errno));
#else
Yap_Error(SYSTEM_ERROR, TermNil,
"(socket_getc)");
#endif
return post_process_eof(s);
}
return post_process_read_char(ch, s);
}
/*
Basically, the same as console but also sends a prompt and takes care of
finding out whether we are at the start of a newline.
*/
static int
ConsoleSocketGetc(int sno)
{
register StreamDesc *s = &Stream[sno];
int ch;
Int c;
int count;
/* send the prompt away */
if (newline) {
char *cptr = Prompt, ch;
/* use the default routine */
while ((ch = *cptr++) != '\0') {
Stream[StdErrStream].stream_putc(StdErrStream, ch);
}
strncpy(Prompt, RepAtom (AtPrompt)->StrOfAE, MAX_PROMPT);
newline = FALSE;
}
/* should be able to use a buffer */
Yap_PrologMode |= ConsoleGetcMode;
#if _MSC_VER || defined(__MINGW32__)
count = recv(s->u.socket.fd, (void *)&c, sizeof(char), 0);
#else
count = read(s->u.socket.fd, &c, sizeof(char));
#endif
Yap_PrologMode &= ~ConsoleGetcMode;
if (count == 0) {
return console_post_process_eof(s);
} else if (count > 0) {
ch = c;
} else {
Yap_Error(SYSTEM_ERROR, TermNil, "read");
return console_post_process_eof(s);
}
return console_post_process_read_char(ch, s);
}
#endif
static int static int
PipeGetc(int sno) PipeGetc(int sno)
@ -1593,11 +1405,7 @@ PlUnGetc (int sno)
if (s->stream_getc != PlUnGetc) if (s->stream_getc != PlUnGetc)
return(s->stream_getc(sno)); return(s->stream_getc(sno));
ch = s->och; ch = s->och;
if (s->status & Socket_Stream_f) { if (s->status & Promptable_Stream_f) {
s->stream_getc = SocketGetc;
s->stream_putc = SocketPutc;
s->stream_wputc = put_wchar;
} else if (s->status & Promptable_Stream_f) {
s->stream_putc = ConsolePutc; s->stream_putc = ConsolePutc;
s->stream_wputc = put_wchar; s->stream_wputc = put_wchar;
#if HAVE_LIBREADLINE && HAVE_READLINE_READLINE_H #if HAVE_LIBREADLINE && HAVE_READLINE_READLINE_H
@ -2043,11 +1851,6 @@ p_stream_flags (void)
static Int static Int
GetStreamFd(int sno) GetStreamFd(int sno)
{ {
#if USE_SOCKET
if (Stream[sno].status & Socket_Stream_f) {
return(Stream[sno].u.socket.fd);
} else
#endif
if (Stream[sno].status & Pipe_Stream_f) { if (Stream[sno].status & Pipe_Stream_f) {
#if _MSC_VER || defined(__MINGW32__) #if _MSC_VER || defined(__MINGW32__)
return((Int)(Stream[sno].u.pipe.hdl)); return((Int)(Stream[sno].u.pipe.hdl));
@ -2068,91 +1871,11 @@ Yap_GetStreamFd(int sno)
int int
Yap_CheckIOStream(Term stream, char * error) Yap_CheckIOStream(Term stream, char * error)
{ {
int sno = CheckStream(stream, Input_Stream_f|Output_Stream_f|Socket_Stream_f, error); int sno = CheckStream(stream, Input_Stream_f|Output_Stream_f, error);
UNLOCK(Stream[sno].streamlock); UNLOCK(Stream[sno].streamlock);
return(sno); return(sno);
} }
#if USE_SOCKET
Term
Yap_InitSocketStream(int fd, socket_info flags, socket_domain domain) {
StreamDesc *st;
int sno;
sno = GetFreeStreamD();
if (sno < 0) {
PlIOError (SYSTEM_ERROR,TermNil, "new stream not available for socket/4");
return(TermNil);
}
st = &Stream[sno];
st->u.socket.domain = domain;
st->u.socket.flags = flags;
if (flags & (client_socket|server_session_socket)) {
/* I can read and write from these sockets */
st->status = (Socket_Stream_f|Input_Stream_f|Output_Stream_f);
} else {
/* oops, I cannot */
st->status = Socket_Stream_f;
}
st->u.socket.fd = fd;
st->charcount = 0;
st->linecount = 1;
st->linepos = 0;
st->stream_putc = SocketPutc;
st->stream_wputc = put_wchar;
st->stream_getc = SocketGetc;
st->stream_gets = DefaultGets;
st->stream_wgetc = get_wchar;
if (CharConversionTable != NULL)
st->stream_wgetc_for_read = ISOWGetc;
else
st->stream_wgetc_for_read = st->stream_wgetc;
UNLOCK(st->streamlock);
return(MkStream(sno));
}
/* given a socket file descriptor, get the corresponding stream descripor */
int
Yap_CheckSocketStream(Term stream, char * error)
{
int sno = CheckStream(stream, Socket_Stream_f, error);
UNLOCK(Stream[sno].streamlock);
return sno;
}
/* given a stream index, get the corresponding domain */
socket_domain
Yap_GetSocketDomain(int sno)
{
return(Stream[sno].u.socket.domain);
}
/* given a stream index, get the corresponding status */
socket_info
Yap_GetSocketStatus(int sno)
{
return(Stream[sno].u.socket.flags);
}
/* update info on a socket, eg, new->server or new->client */
void
Yap_UpdateSocketStream(int sno, socket_info flags, socket_domain domain) {
StreamDesc *st;
st = &Stream[sno];
st->u.socket.domain = domain;
st->u.socket.flags = flags;
if (flags & (client_socket|server_session_socket)) {
/* I can read and write from these sockets */
st->status = (Socket_Stream_f|Input_Stream_f|Output_Stream_f);
} else {
/* oops, I cannot */
st->status = Socket_Stream_f;
}
}
#endif /* USE_SOCKET */
#if _MSC_VER || defined(__MINGW32__) #if _MSC_VER || defined(__MINGW32__)
#define SYSTEM_STAT _stat #define SYSTEM_STAT _stat
@ -2279,7 +2002,7 @@ static Int p_change_alias_to_stream (void)
return (FALSE); return (FALSE);
} }
at = AtomOfTerm(tname); at = AtomOfTerm(tname);
if ((sno = CheckStream (tstream, Input_Stream_f | Output_Stream_f | Append_Stream_f | Socket_Stream_f, "change_stream_alias/2")) == -1) { if ((sno = CheckStream (tstream, Input_Stream_f | Output_Stream_f | Append_Stream_f, "change_stream_alias/2")) == -1) {
UNLOCK(Stream[sno].streamlock); UNLOCK(Stream[sno].streamlock);
return(FALSE); return(FALSE);
} }
@ -2449,7 +2172,7 @@ SetAlias (Atom arg, int sno)
Int alno = aliasp-FileAliases; Int alno = aliasp-FileAliases;
aliasp->alias_stream = sno; aliasp->alias_stream = sno;
if (!(Stream[sno].status & if (!(Stream[sno].status &
(Null_Stream_f|Socket_Stream_f))) { (Null_Stream_f))) {
switch(alno) { switch(alno) {
case 0: case 0:
Yap_stdin = Stream[sno].u.file.file; Yap_stdin = Stream[sno].u.file.file;
@ -2756,7 +2479,7 @@ p_check_stream (void)
static Int static Int
p_check_if_stream (void) p_check_if_stream (void)
{ /* '$check_stream'(Stream) */ { /* '$check_stream'(Stream) */
int sno = CheckStream (ARG1, Input_Stream_f | Output_Stream_f | Append_Stream_f | Socket_Stream_f, "check_stream/1"); int sno = CheckStream (ARG1, Input_Stream_f | Output_Stream_f | Append_Stream_f , "check_stream/1");
if (sno != -1) if (sno != -1)
UNLOCK(Stream[sno].streamlock); UNLOCK(Stream[sno].streamlock);
return sno != -1; return sno != -1;
@ -2766,13 +2489,8 @@ static Term
StreamName(int i) StreamName(int i)
{ {
if (i < 3) return(MkAtomTerm(AtomUser)); if (i < 3) return(MkAtomTerm(AtomUser));
#if USE_SOCKET if (Stream[i].status & Pipe_Stream_f)
if (Stream[i].status & Socket_Stream_f) return(MkAtomTerm(AtomPipe));
return(MkAtomTerm(AtomSocket));
else
#endif
if (Stream[i].status & Pipe_Stream_f)
return(MkAtomTerm(AtomPipe));
return(Stream[i].u.file.user_name); return(Stream[i].u.file.user_name);
} }
@ -2852,15 +2570,8 @@ Yap_CloseStreams (int loud)
if (Stream[sno].status & Pipe_Stream_f) if (Stream[sno].status & Pipe_Stream_f)
CloseHandle (Stream[sno].u.pipe.hdl); CloseHandle (Stream[sno].u.pipe.hdl);
#else #else
if (Stream[sno].status & (Pipe_Stream_f|Socket_Stream_f)) if (Stream[sno].status & (Pipe_Stream_f))
close (Stream[sno].u.pipe.fd); close (Stream[sno].u.pipe.fd);
#endif
#if USE_SOCKET
else if (Stream[sno].status & (Socket_Stream_f)) {
Yap_CloseSocket(Stream[sno].u.socket.fd,
Stream[sno].u.socket.flags,
Stream[sno].u.socket.domain);
}
#endif #endif
else if (Stream[sno].status & (SWI_Stream_f)) { else if (Stream[sno].status & (SWI_Stream_f)) {
SWIClose(Stream[sno].u.swi_stream.swi_ptr); SWIClose(Stream[sno].u.swi_stream.swi_ptr);
@ -2883,15 +2594,8 @@ Yap_CloseStreams (int loud)
static void static void
CloseStream(int sno) CloseStream(int sno)
{ {
if (!(Stream[sno].status & (Null_Stream_f|Socket_Stream_f|Pipe_Stream_f|SWI_Stream_f))) if (!(Stream[sno].status & (Null_Stream_f|Pipe_Stream_f|SWI_Stream_f)))
YP_fclose (Stream[sno].u.file.file); YP_fclose (Stream[sno].u.file.file);
#if USE_SOCKET
else if (Stream[sno].status & (Socket_Stream_f)) {
Yap_CloseSocket(Stream[sno].u.socket.fd,
Stream[sno].u.socket.flags,
Stream[sno].u.socket.domain);
}
#endif
else if (Stream[sno].status & Pipe_Stream_f) { else if (Stream[sno].status & Pipe_Stream_f) {
#if _MSC_VER || defined(__MINGW32__) #if _MSC_VER || defined(__MINGW32__)
CloseHandle (Stream[sno].u.pipe.hdl); CloseHandle (Stream[sno].u.pipe.hdl);
@ -2911,10 +2615,6 @@ CloseStream(int sno)
{ {
Yap_c_output_stream = StdOutStream; Yap_c_output_stream = StdOutStream;
} }
/* if (st->status == Socket_Stream_f|Input_Stream_f|Output_Stream_f) {
Yap_CloseSocket();
}
*/
} }
void void
@ -2926,7 +2626,7 @@ Yap_CloseStream(int sno)
static Int static Int
p_close (void) p_close (void)
{ /* '$close'(+Stream) */ { /* '$close'(+Stream) */
Int sno = CheckStream (ARG1, (Input_Stream_f | Output_Stream_f | Socket_Stream_f), "close/2"); Int sno = CheckStream (ARG1, (Input_Stream_f | Output_Stream_f), "close/2");
if (sno < 0) if (sno < 0)
return (FALSE); return (FALSE);
if (sno <= StdErrStream) { if (sno <= StdErrStream) {
@ -3769,11 +3469,6 @@ p_user_file_name (void)
int sno = CheckStream (ARG1, Input_Stream_f | Output_Stream_f | Append_Stream_f,"user_file_name/2"); int sno = CheckStream (ARG1, Input_Stream_f | Output_Stream_f | Append_Stream_f,"user_file_name/2");
if (sno < 0) if (sno < 0)
return (FALSE); return (FALSE);
#if USE_SOCKET
if (Stream[sno].status & Socket_Stream_f)
tout = MkAtomTerm(AtomSocket);
else
#endif
if (Stream[sno].status & Pipe_Stream_f) if (Stream[sno].status & Pipe_Stream_f)
tout = MkAtomTerm(AtomPipe); tout = MkAtomTerm(AtomPipe);
else else
@ -3796,18 +3491,13 @@ p_cur_line_no (void)
Int no = 1; Int no = 1;
int i; int i;
Atom my_stream; Atom my_stream;
#if USE_SOCKET
if (Stream[sno].status & Socket_Stream_f)
my_stream = AtomSocket;
else
#endif
if (Stream[sno].status & Pipe_Stream_f) if (Stream[sno].status & Pipe_Stream_f)
my_stream = AtomPipe; my_stream = AtomPipe;
else else
my_stream = Stream[sno].u.file.name; my_stream = Stream[sno].u.file.name;
for (i = 0; i < MaxStreams; i++) for (i = 0; i < MaxStreams; i++)
{ {
if (!(Stream[i].status & (Free_Stream_f|Socket_Stream_f|Pipe_Stream_f)) && if (!(Stream[i].status & (Free_Stream_f|Pipe_Stream_f)) &&
Stream[i].u.file.name == my_stream) Stream[i].u.file.name == my_stream)
no += Stream[i].linecount - 1; no += Stream[i].linecount - 1;
} }
@ -5537,11 +5227,6 @@ Yap_StreamToFileNo(Term t)
return((Int)(Stream[sno].u.pipe.hdl)); return((Int)(Stream[sno].u.pipe.hdl));
#else #else
return(Stream[sno].u.pipe.fd); return(Stream[sno].u.pipe.fd);
#endif
#if USE_SOCKET
} else if (Stream[sno].status & Socket_Stream_f) {
UNLOCK(Stream[sno].streamlock);
return(Stream[sno].u.socket.fd);
#endif #endif
} else { } else {
UNLOCK(Stream[sno].streamlock); UNLOCK(Stream[sno].streamlock);
@ -5704,7 +5389,6 @@ Yap_FileDescriptorFromStream(Term t)
if (sno < 0) if (sno < 0)
return NULL; return NULL;
if (Stream[sno].status & (Null_Stream_f| if (Stream[sno].status & (Null_Stream_f|
Socket_Stream_f|
Pipe_Stream_f| Pipe_Stream_f|
Free_Stream_f)) Free_Stream_f))
return NULL; return NULL;
@ -5805,9 +5489,6 @@ Yap_InitIOPreds(void)
CurrentModule = cm; CurrentModule = cm;
Yap_InitReadUtil (); Yap_InitReadUtil ();
#if USE_SOCKET
Yap_InitSockets ();
#endif
InitPlIO (); InitPlIO ();
#if HAVE_LIBREADLINE && HAVE_READLINE_READLINE_H #if HAVE_LIBREADLINE && HAVE_READLINE_READLINE_H
InitReadline(); InitReadline();

1305
C/ypsocks.c
View File

File diff suppressed because it is too large Load Diff

6
H/Yapproto.h
View File

@ -467,12 +467,6 @@ void STD_PROTO(Yap_InitSWIHash,(void));
int STD_PROTO(Yap_get_stream_handle,(Term, int, int, void *)); int STD_PROTO(Yap_get_stream_handle,(Term, int, int, void *));
Term STD_PROTO(Yap_get_stream_position,(void *)); Term STD_PROTO(Yap_get_stream_position,(void *));
/* ypsocks.c */
void STD_PROTO(Yap_InitSockets,(void));
#ifdef USE_SOCKET
void STD_PROTO(Yap_init_socks,(char *, long));
#endif
/* opt.preds.c */ /* opt.preds.c */
void STD_PROTO(Yap_init_optyap_preds,(void)); void STD_PROTO(Yap_init_optyap_preds,(void));

12
H/iopreds.h
View File

@ -75,13 +75,6 @@ typedef struct stream_desc
int fd; int fd;
#endif #endif
} pipe; } pipe;
#if USE_SOCKET
struct {
socket_domain domain;
socket_info flags;
int fd;
} socket;
#endif
} u; } u;
Int charcount, linecount, linepos; Int charcount, linecount, linepos;
Int status; Int status;
@ -113,7 +106,6 @@ StreamDesc;
#define Eof_Stream_f 0x000010 #define Eof_Stream_f 0x000010
#define Null_Stream_f 0x000020 #define Null_Stream_f 0x000020
#define Tty_Stream_f 0x000040 #define Tty_Stream_f 0x000040
#define Socket_Stream_f 0x000080
#define Binary_Stream_f 0x000100 #define Binary_Stream_f 0x000100
#define Eof_Error_Stream_f 0x000200 #define Eof_Error_Stream_f 0x000200
#define Reset_Eof_Stream_f 0x000400 #define Reset_Eof_Stream_f 0x000400
@ -121,10 +113,6 @@ StreamDesc;
#define Push_Eof_Stream_f 0x001000 #define Push_Eof_Stream_f 0x001000
#define Seekable_Stream_f 0x002000 #define Seekable_Stream_f 0x002000
#define Promptable_Stream_f 0x004000 #define Promptable_Stream_f 0x004000
#if USE_SOCKET
#define Client_Socket_Stream_f 0x008000
#define Server_Socket_Stream_f 0x010000
#endif
#define Pipe_Stream_f 0x040000 #define Pipe_Stream_f 0x040000
#define Popen_Stream_f 0x080000 #define Popen_Stream_f 0x080000
#define User_Stream_f 0x100000 #define User_Stream_f 0x100000

6
Makefile.in
View File

@ -248,7 +248,7 @@ C_SOURCES= \
$(srcdir)/packages/udi/rtree.c \ $(srcdir)/packages/udi/rtree.c \
$(srcdir)/packages/udi/rtree_udi.c \ $(srcdir)/packages/udi/rtree_udi.c \
$(srcdir)/C/utilpreds.c $(srcdir)/C/write.c $(srcdir)/console/yap.c \ $(srcdir)/C/utilpreds.c $(srcdir)/C/write.c $(srcdir)/console/yap.c \
$(srcdir)/C/ypsocks.c $(srcdir)/C/ypstdio.c \ $(srcdir)/C/ypstdio.c \
$(srcdir)/BEAM/eam_am.c $(srcdir)/BEAM/eam_showcode.c \ $(srcdir)/BEAM/eam_am.c $(srcdir)/BEAM/eam_showcode.c \
$(srcdir)/BEAM/eamindex.c $(srcdir)/BEAM/eamamasm.c \ $(srcdir)/BEAM/eamindex.c $(srcdir)/BEAM/eamamasm.c \
$(srcdir)/BEAM/eam_gc.c $(srcdir)/BEAM/eam_split.c \ $(srcdir)/BEAM/eam_gc.c $(srcdir)/BEAM/eam_split.c \
@ -309,7 +309,7 @@ PL_SOURCES= \
$(srcdir)/pl/save.yap \ $(srcdir)/pl/save.yap \
$(srcdir)/pl/setof.yap \ $(srcdir)/pl/setof.yap \
$(srcdir)/pl/signals.yap \ $(srcdir)/pl/signals.yap \
$(srcdir)/pl/sockets.yap $(srcdir)/pl/sort.yap \ $(srcdir)/pl/sort.yap \
$(srcdir)/pl/statistics.yap \ $(srcdir)/pl/statistics.yap \
$(srcdir)/pl/strict_iso.yap \ $(srcdir)/pl/strict_iso.yap \
$(srcdir)/pl/tabling.yap $(srcdir)/pl/threads.yap \ $(srcdir)/pl/tabling.yap $(srcdir)/pl/threads.yap \
@ -347,7 +347,7 @@ ENGINE_OBJECTS = \
udi.o rtree.o rtree_udi.o\ udi.o rtree.o rtree_udi.o\
unify.o userpreds.o utilpreds.o \ unify.o userpreds.o utilpreds.o \
write.o \ write.o \
blobs.o swi.o ypsocks.o ypstdio.o $(IOLIB_OBJECTS) @MPI_OBJS@ blobs.o swi.o ypstdio.o $(IOLIB_OBJECTS) @MPI_OBJS@
C_INTERFACE_OBJECTS = \ C_INTERFACE_OBJECTS = \
load_foreign.o load_dl.o load_dld.o load_dyld.o \ load_foreign.o load_dl.o load_dld.o load_dyld.o \

2
library/dialect/swi/fli/swi.c
View File

@ -2746,7 +2746,7 @@ Yap_read_term(term_t t, IOSTREAM *st, term_t vs)
if (!Yap_unify(out, Yap_GetFromSlot(t))) { if (!Yap_unify(out, Yap_GetFromSlot(t))) {
return FALSE; return FALSE;
} }
if (!Yap_unify(vs, Yap_GetFromSlot(varnames))) { if (!Yap_unify(varnames, Yap_GetFromSlot(vs))) {
return FALSE; return FALSE;
} }
return TRUE; return TRUE;

1
pl/init.yap
View File

@ -73,7 +73,6 @@ otherwise.
'callcount.yap', 'callcount.yap',
'load_foreign.yap', 'load_foreign.yap',
'save.yap', 'save.yap',
'sockets.yap',
'sort.yap', 'sort.yap',
'setof.yap', 'setof.yap',
'statistics.yap', 'statistics.yap',

82
pl/sockets.yap
View File

@ -1,82 +0,0 @@
/*************************************************************************
* *
* YAP Prolog *
* *
* Yap Prolog was developed at NCCUP - Universidade do Porto *
* *
* Copyright L.Damas, V.S.Costa and Universidade do Porto 1985-1997 *
* *
**************************************************************************
* *
* File: sockets.yap *
* Last rev: *
* mods: *
* comments: Socket predicates *
* *
*************************************************************************/
socket(S,D) :-
socket(S, 'SOCK_STREAM', 0, D).
socket_accept(S,F) :-
socket_accept(S, _, F).
socket_select(Socks, OutSocks, TimeOut, Streams, OutStreams) :-
'$check_list_for_sockets'(Socks, socket_select(Socks, OutSocks, TimeOut, Streams, OutStreams)),
'$check_list_for_sockets'(Streams, socket_select(Socks, OutSocks, TimeOut, Streams, OutStreams)),
'$select_cp_fds'(Socks, Streams, Fds),
'$check_select_time'(TimeOut, Sec, USec, socket_select(Socks, OutSocks, TimeOut, Streams, OutStreams)),
'$socket_select'(Fds, Sec, USec, NFds),
'$cp_socket_fds'(Socks, NFds, OutSocks, NFdsS),
'$cp_stream_fds'(Streams, NFdsS, OutStreams).
/* check whether a list of options is valid */
'$check_list_for_sockets'(V,G) :- var(V), !,
'$do_error'(instantiation_error,G).
'$check_list_for_sockets'([],_) :- !.
'$check_list_for_sockets'([_|T],G) :- !,
'$check_list_for_sockets'(T,G).
'$check_list_for_sockets'(T,G) :-
'$do_error'(type_error(list,T),G).
'$select_cp_fds'([], Fds, Fds).
'$select_cp_fds'([_-Fd|L], Fds0, [Fd|Fds]) :-
'$select_cp_fds'(L, Fds0, Fds).
'$check_select_time'(V, _, _, Goal) :-
var(V), !,
'$do_error'(instantiation_error,Goal).
'$check_select_time'(off, -1, -1, _).
'$check_select_time'(Sec0:USec0, Sec, USec, _) :-
Sec is Sec0,
USec is USec0,
Sec >= 0, USec >= 0.
'$cp_socket_fds'([], Fds, [], Fds).
'$cp_socket_fds'([_|Scks], [[]|Fds], Out, StrFds) :- !,
'$cp_socket_fds'(Scks, Fds, Out, StrFds).
'$cp_socket_fds'([T-Socket|Scks], [Socket|Fds], [T-connection(Client,Stream)|Out], StrFds) :-
socket_accept(Socket, Client, Stream),
'$cp_socket_fds'(Scks, Fds, Out, StrFds).
'$cp_stream_fds'([], _, []).
'$cp_stream_fds'([_|Strs], [[]|Fds], Out) :- !,
'$cp_stream_fds'(Strs, Fds, Out).
'$cp_stream_fds'([Stream|Strs], [Stream|Fds], [Stream|Out]) :-
'$cp_stream_fds'(Strs, Fds, Out).
socket_buffering(Sock, Flag, InSize, OutSize) :-
var(OutSize), OutSize \= InSize, !,
'$do_error'(instantiation_error,socket_buffering(Sock, Flag, InSize, OutSize)).
socket_buffering(Sock, Flag, InSize, OutSize) :-
'$convert_sock_buff'(OutSize, OutNumb),
'$socket_buffering'(Sock, Flag, InNumb, OutNumb),
'$convert_sock_buff'(InSize, InNumb).
'$convert_sock_buff'(V, V) :- var(V), !.
'$convert_sock_buff'(unbuf, 1) :- !.
'$convert_sock_buff'(fullbuf, _).