Changeset 5273 for trunk/Ohana/src/libohana

Timestamp:

Oct 11, 2005, 8:11:57 AM (21 years ago)

Author:

eugene

Message:

moving IOBuffer and CommOps to libohana, adding AddstarClientOptions and Stars to libautocode

Location:

trunk/Ohana/src/libohana

Files:

• Makefile (modified) (1 diff)
• include/ohana.h (modified) (2 diffs)
• src/CommOps.c (added)
• src/IOBufferOps.c (added)
• src/ohana_allocate.c (modified) (1 diff)

trunk/Ohana/src/libohana/Makefile

@@ -35 +35 @@
 $(SRC)/config.$(ARCH).o          \
 $(SRC)/Fread.$(ARCH).o           \
+$(SRC)/IOBufferOps.$(ARCH).o     \
+$(SRC)/CommOps.$(ARCH).o         \
 $(SRC)/version.$(ARCH).o
 

trunk/Ohana/src/libohana/include/ohana.h

@@ -87 +87 @@
 # endif /* FOPEN */
 
+/* socket / pipe communication buffer */
+typedef struct {
+  char *buffer;
+  int   Nalloc;
+  int   Nreset;
+  int   Nblock;
+  int   Nbuffer;
+} IOBuffer;
+
 extern double hypot();
 
@@ -143 +152 @@
 int     str_to_radec           PROTO((double *ra, double *dec, char *str1, char *str2));
 
+/* IO Buffer functions */
+int InitIOBuffer (IOBuffer *buffer, int Nalloc);
+int FlushIOBuffer (IOBuffer *buffer);
+int ReadtoIOBuffer (IOBuffer *buffer, int fd);
+int EmptyIOBuffer (IOBuffer *buffer, int Nmax, int fd);
+void FreeIOBuffer (IOBuffer *buffer);
+
+/* communication functions */
+int ExpectMessage (int device, double timeout, IOBuffer *message);
+int ExpectCommand (int device, int length, double timeout, IOBuffer *buffer);
+int SendMessage (int device, char *format, ...);
+int SendCommand (int device, int length, char *format, ...);
+int SendCommandV (int device, int length, char *format, va_list argp);
+
 /*
 #   define F_SETFL         4   

trunk/Ohana/src/libohana/src/ohana_allocate.c

@@ -235 +235 @@
   S[3] = 'X';
   Ns[0] = Ns[1] = Ns[2] = Ns[3] = 0;
+  N = 0;
 
   for (i = 0; i < Nmemlist; i++) {