IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Changeset 5273


Ignore:
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
Files:
4 added
10 edited

Legend:

Unmodified
Added
Removed

  • trunk/Ohana/Makefile

    r4852 r5273  
    6969
    7070# Required libraries depends on the architecture
    71 LIBS-linux = libfits libohana libdummy
    72 LIBS-lin64 = libfits libohana libdummy
    73 LIBS-sid   = libfits libohana libdummy
    74 LIBS-sol   = libfits libohana
     71LIBS-linux = libohana libfits libdvo libdummy
     72LIBS-lin64 = libohana libfits libdvo libdummy
     73LIBS-sid   = libohana libfits libdvo libdummy
     74LIBS-sol   = libohana libfits libdvo
    7575
    7676# general build targets:

  • trunk/Ohana/src/addstar/Makefile

    r5269 r5273  
    8888SERVER = \
    8989$(SRC)/SocketOps.$(ARCH).o \
    90 $(SRC)/IOBufferOps.$(ARCH).o \
    9190$(SRC)/ConfigInit.$(ARCH).o \
    9291$(SRC)/args_server.$(ARCH).o \
    9392$(SRC)/CheckPassword.$(ARCH).o \
    94 $(SRC)/NewImage.$(ARCH).o \
    95 $(SRC)/CommOps.$(ARCH).o
     93$(SRC)/NewImage.$(ARCH).o
    9694
    9795CLIENT = \
    9896$(SRC)/SocketOps.$(ARCH).o \
    99 $(SRC)/IOBufferOps.$(ARCH).o \
    10097$(SRC)/ConfigInit.$(ARCH).o \
    101 $(SRC)/args_client.$(ARCH).o \
    102 $(SRC)/CommOps.$(ARCH).o
     98$(SRC)/args_client.$(ARCH).o
    10399
    104100default: $(PROGRAM)
    … …  
    114110autocode: $(COMMOBJ)
    115111
    116 ADDSTARC = $(SRC)/addstarc.$(ARCH).o $(CLIENT) $(COMMOBJ)
    117 ADDSTARD = $(SRC)/addstard.$(ARCH).o $(SERVER) $(COMMOBJ)
     112ADDSTARC = $(SRC)/addstarc.$(ARCH).o $(CLIENT)
     113ADDSTARD = $(SRC)/addstard.$(ARCH).o $(SERVER)
    118114
    119115$(ADDSTARC) : $(INC)/addstar.h
    … …  
    121117$(ADDSTAR)  : $(INC)/addstar.h
    122118
    123 $(INC)/addstar.h       : $(INC)/commcode.h
    124 
    125119addstar                : $(BIN)/addstar.$(ARCH)
    126120$(BIN)/addstar.$(ARCH) : $(ADDSTAR)
    127121
    128122addstard                : $(BIN)/addstard.$(ARCH)
    129 $(BIN)/addstard.$(ARCH) : $(SRC)/addstard.$(ARCH).o $(SERVER) $(COMMOBJ)
     123$(BIN)/addstard.$(ARCH) : $(ADDSTARD)
    130124
    131125addstarc                : $(BIN)/addstarc.$(ARCH)

  • trunk/Ohana/src/addstar/include/addstar.h

    r5270 r5273  
    1 # include "base.h"
     1# include <ohana.h>
    22# include <dvo.h>
    33# include <signal.h>
    … …  
    99# include <arpa/inet.h>
    1010
    11 /* this is generated locally from the entries in addstar/def */
    12 # include "commcode.h"
     11/* this is generated locally from the entries in addstar/def
     12# include "commcode.h" */
    1313
    1414/* used in find_matches, find_matches_refstars */

  • trunk/Ohana/src/libautocode/Makefile

    r5014 r5273  
    4848$(SRC)/smpdata.$(ARCH).o \
    4949$(SRC)/spectrum.$(ARCH).o \
    50 $(SRC)/spectrum-ascii.$(ARCH).o
     50$(SRC)/spectrum-ascii.$(ARCH).o \
     51$(SRC)/Stars.$(ARCH).o \
     52$(SRC)/AddstarClientOptions.$(ARCH).o
    5153
    5254LIBINC = \
    … …  
    7678$(INC)/smpdata.h \
    7779$(INC)/spectrum.h \
    78 $(INC)/spectrum-ascii.h
     80$(INC)/spectrum-ascii.h \
     81$(INC)/Stars.h \
     82$(INC)/AddstarClientOptions.h
    7983
    8084objects: $(LIBOBJ)
    … …  
    8286install: $(DESTINC)/autocode.h $(DESTLIB)/libautocode.a
    8387        @echo done install
     88
     89test: $(DESTINC)/autocode.h
    8490
    8591autocode: $(INC)/autocode.h $(LIB)/libautocode.$(ARCH).a

  • trunk/Ohana/src/libautocode/def/autocode.c

    r4864 r5273  
    7373  return (TRUE);
    7474}
     75
     76int Send_$STRUCT (int device, $STRUCT *data, int Ndata, int copy) {
     77
     78  int Nbytes;
     79  $STRUCT *tmpdata;
     80
     81  Nbytes = Ndata * sizeof ($STRUCT);
     82
     83  if (copy) {
     84    ALLOCATE (tmpdata, $STRUCT, Ndata);
     85    memcpy (tmpdata, data, Nbytes);
     86  } else {
     87    tmpdata = data;
     88  }
     89
     90  fits_convert_$STRUCT (tmpdata, sizeof ($STRUCT), Ndata);
     91
     92  SendCommand (device, 16, "NVALUE: %6d", Ndata);
     93  SendCommand (device, 16, "NBYTES: %6d", Nbytes);
     94  write (device, tmpdata, Nbytes);
     95 
     96  /* perform handshaking? */
     97
     98  return (TRUE);
     99}
     100
     101int Recv_$STRUCT (int device, $STRUCT **data, int *Ndata) {
     102
     103  int ndata;
     104  IOBuffer message;
     105  $STRUCT *tmpdata;
     106
     107  ExpectCommand (device, 16, 1.0, &message);
     108  sscanf (message.buffer, "%*s %d", &ndata);
     109  FreeIOBuffer (&message);
     110 
     111  /* what is reasonable for timeout? */
     112  ExpectMessage (device, 1.0, &message);
     113 
     114  tmpdata = ($STRUCT *) message.buffer;
     115  fits_convert_$STRUCT (tmpdata, sizeof ($STRUCT), *Ndata);
     116
     117  /* double-check data length? */
     118  /* perform handshaking? */
     119
     120  *Ndata = ndata;
     121  *data = tmpdata;
     122
     123  return (TRUE);
     124}

  • trunk/Ohana/src/libautocode/def/autocode.h

    r4864 r5273  
    66int      fits_table_mkheader_$STRUCT (Header *header);
    77int      fits_convert_$STRUCT ($STRUCT *data, int size, int nitems);
     8int Send_$STRUCT (int device, $STRUCT *data, int Ndata, int copy);
     9int Recv_$STRUCT (int device, $STRUCT **data, int *Ndata);

  • trunk/Ohana/src/libdvo/Makefile

    r5241 r5273  
    6868$(ASRC)/smpdata.$(ARCH).o \
    6969$(ASRC)/spectrum.$(ARCH).o \
    70 $(ASRC)/spectrum-ascii.$(ARCH).o
     70$(ASRC)/spectrum-ascii.$(ARCH).o \
     71$(ASRC)/Stars.$(ARCH).o \
     72$(ASRC)/AddstarClientOptions.$(ARCH).o
    7173
    7274ACOM = $(ADEF)/autocode.c $(ADEF)/autocode.h $(ADEF)/common.h

  • trunk/Ohana/src/libohana/Makefile

    r5237 r5273  
    3535$(SRC)/config.$(ARCH).o          \
    3636$(SRC)/Fread.$(ARCH).o           \
     37$(SRC)/IOBufferOps.$(ARCH).o     \
     38$(SRC)/CommOps.$(ARCH).o         \
    3739$(SRC)/version.$(ARCH).o
    3840

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

    r5237 r5273  
    8787# endif /* FOPEN */
    8888
     89/* socket / pipe communication buffer */
     90typedef struct {
     91  char *buffer;
     92  int   Nalloc;
     93  int   Nreset;
     94  int   Nblock;
     95  int   Nbuffer;
     96} IOBuffer;
     97
    8998extern double hypot();
    9099
    … …  
    143152int     str_to_radec           PROTO((double *ra, double *dec, char *str1, char *str2));
    144153
     154/* IO Buffer functions */
     155int InitIOBuffer (IOBuffer *buffer, int Nalloc);
     156int FlushIOBuffer (IOBuffer *buffer);
     157int ReadtoIOBuffer (IOBuffer *buffer, int fd);
     158int EmptyIOBuffer (IOBuffer *buffer, int Nmax, int fd);
     159void FreeIOBuffer (IOBuffer *buffer);
     160
     161/* communication functions */
     162int ExpectMessage (int device, double timeout, IOBuffer *message);
     163int ExpectCommand (int device, int length, double timeout, IOBuffer *buffer);
     164int SendMessage (int device, char *format, ...);
     165int SendCommand (int device, int length, char *format, ...);
     166int SendCommandV (int device, int length, char *format, va_list argp);
     167
    145168/*
    146169#   define F_SETFL         4   

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

    r5237 r5273  
    235235  S[3] = 'X';
    236236  Ns[0] = Ns[1] = Ns[2] = Ns[3] = 0;
     237  N = 0;
    237238
    238239  for (i = 0; i < Nmemlist; i++) {
Note: See TracChangeset for help on using the changeset viewer.