IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Ignore:
Timestamp:
Mar 24, 2006, 2:42:35 PM (21 years ago)
Author:
eugene
Message:

moved check_permissions to libohana, added buttons to Kii

Location:
trunk/Ohana/src/addstar
Files:
9 edited

Legend:

Unmodified
Added
Removed

  • trunk/Ohana/src/addstar/Makefile

    r5899 r6674  
    8787$(SRC)/match_refstars.$(ARCH).o \
    8888
    89 SERVER = \
     89ADDSTARD = \
     90$(SRC)/addstard.$(ARCH).o \
    9091$(SRC)/SocketOps.$(ARCH).o \
    9192$(SRC)/ConfigInit.$(ARCH).o \
    … …  
    130131$(SRC)/NewRefcat.$(ARCH).o
    131132
    132 CLIENT = \
     133ADDSTART = \
     134$(SRC)/addstart.$(ARCH).o \
     135$(SRC)/DatasetOps.$(ARCH).o \
     136$(SRC)/SocketOps.$(ARCH).o \
     137$(SRC)/ConfigInit.$(ARCH).o \
     138$(SRC)/args_server.$(ARCH).o \
     139$(SRC)/CheckPassword.$(ARCH).o \
     140$(SRC)/UpdateDatabase_Image.$(ARCH).o \
     141$(SRC)/UpdateDatabase_Reflist.$(ARCH).o \
     142$(SRC)/UpdateDatabase_Refcat.$(ARCH).o \
     143$(SRC)/airmass.$(ARCH).o \
     144$(SRC)/build_links.$(ARCH).o \
     145$(SRC)/calibrate.$(ARCH).o \
     146$(SRC)/find_matches.$(ARCH).o \
     147$(SRC)/find_matches_closest.$(ARCH).o \
     148$(SRC)/find_matches_refstars.$(ARCH).o \
     149$(SRC)/find_subset.$(ARCH).o \
     150$(SRC)/get2mass.$(ARCH).o \
     151$(SRC)/get2mass_as.$(ARCH).o \
     152$(SRC)/get2mass_dr2.$(ARCH).o \
     153$(SRC)/getgsc.$(ARCH).o \
     154$(SRC)/getusno.$(ARCH).o \
     155$(SRC)/greference.$(ARCH).o \
     156$(SRC)/gcatalog.$(ARCH).o \
     157$(SRC)/gimages.$(ARCH).o \
     158$(SRC)/image-db.$(ARCH).o \
     159$(SRC)/in_image.$(ARCH).o \
     160$(SRC)/load_pt_catalog.$(ARCH).o \
     161$(SRC)/load_subpix.$(ARCH).o \
     162$(SRC)/mkcatalog.$(ARCH).o \
     163$(SRC)/replace_match.$(ARCH).o \
     164$(SRC)/SetSignals.$(ARCH).o \
     165$(SRC)/SkyRegionUtils.$(ARCH).o \
     166$(SRC)/SkyListForStars.$(ARCH).o \
     167$(SRC)/sort_lists.$(ARCH).o \
     168$(SRC)/update_coords.$(ARCH).o \
     169$(SRC)/wcatalog.$(ARCH).o \
     170$(SRC)/Shutdown.$(ARCH).o \
     171$(SRC)/edge_check.$(ARCH).o \
     172$(SRC)/check_permissions.$(ARCH).o \
     173$(SRC)/opening_angle.$(ARCH).o \
     174$(SRC)/ListenClients_Thread.$(ARCH).o \
     175$(SRC)/NewImage_Thread.$(ARCH).o \
     176$(SRC)/NewReflist_Thread.$(ARCH).o \
     177$(SRC)/NewRefcat_Thread.$(ARCH).o
     178
     179ADDSTARC = \
     180$(SRC)/addstarc.$(ARCH).o \
    133181$(SRC)/SocketOps.$(ARCH).o \
    134182$(SRC)/ConfigInit.$(ARCH).o \
    … …  
    143191$(SRC)/args_client.$(ARCH).o
    144192
    145 ADDSTARC = $(SRC)/addstarc.$(ARCH).o $(CLIENT)
    146 ADDSTARD = $(SRC)/addstard.$(ARCH).o $(SERVER)
    147 
    148193$(ADDSTARC) : $(INC)/addstar.h
    149194$(ADDSTARD) : $(INC)/addstar.h
     195$(ADDSTART) : $(INC)/addstar.h
    150196$(ADDSTAR)  : $(INC)/addstar.h
    151197
    … …  
    155201addstard                : $(BIN)/addstard.$(ARCH)
    156202$(BIN)/addstard.$(ARCH) : $(ADDSTARD)
     203
     204addstart                : $(BIN)/addstart.$(ARCH)
     205$(BIN)/addstart.$(ARCH) : $(ADDSTART)
     206        @if [ ! -d $(BIN) ]; then mkdir -p $(BIN); fi
     207        $(CC) $^ -o $@ $(LFLAGS) -lpthread
    157208
    158209addstarc                : $(BIN)/addstarc.$(ARCH)

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

    r5945 r6674  
    2020    fprintf (stderr, "ERROR:  photcode %s not found in photcode table\n", NAME); \
    2121    exit (0); }
     22
     23typedef struct {
     24  int Nstars;
     25  Stars *stars;
     26  Image *image;
     27  Coords *mosaic;
     28  SkyRegion *patch;
     29  AddstarClientOptions *options;
     30  char *refcat;
     31} DVO_DATA;
    2232
    2333typedef struct sockaddr_in SockAddress;
    … …  
    204214int SkyListSetPath (SkyList *list, char *path);
    205215SkyTable *SkyTableLoadOptimal ();
     216
     217int InitDataset ();
     218int PushDataset (DVO_DATA *data);
     219DVO_DATA *PopDataset (void);
     220void *ListenClients_Thread (void *data);
     221int NewImage_Thread (int BindSocket);
     222int NewRefcat_Thread (int BindSocket);
     223int NewReflist_Thread (int BindSocket);

  • trunk/Ohana/src/addstar/src/DatasetOps.c

    r6498 r6674  
    11# include "addstar.h"
     2# include <pthread.h>
    23
    34/* the init function is an alternative */
    … …  
    56pthread_mutex_t fastmutex = PTHREAD_MUTEX_INITIALIZER;
    67
    7 static int lock = FALSE;
    88static int Ndataset = 0;
    99static int NDATASET = 0;
    … …  
    2929  int N;
    3030
    31   pthread_mutex_lock(&mutex);
     31  pthread_mutex_lock(&fastmutex);
    3232
    3333  N = Ndataset;
    3434  Ndataset ++;
    35   CHECK_REALLOCATE (dataset, DVO_DATA, NDATASET, Ndataset, 100);
     35  CHECK_REALLOCATE (dataset, DVO_DATA *, NDATASET, Ndataset, 100);
    3636
    3737  dataset[N] = data;
    3838
    39   pthread_mutex_unlock(&mutex);
     39  pthread_mutex_unlock(&fastmutex);
    4040  return (TRUE);
    4141}
    … …  
    4444DVO_DATA *PopDataset (void) {
    4545
     46  int i;
    4647  DVO_DATA *data;
    4748
    48   pthread_mutex_lock(&mutex);
     49  pthread_mutex_lock(&fastmutex);
    4950
    5051  if (Ndataset == 0) {
    51     pthread_mutex_unlock(&mutex);
     52    pthread_mutex_unlock(&fastmutex);
    5253    return (NULL);
    5354  }
    … …  
    6162  if ((Ndataset < NDATASET / 2) && (Ndataset > 50)) {
    6263    NDATASET = Ndataset / 2;
    63     REALLOCATE (dataset, DVO_DATA, NDATASET);
     64    REALLOCATE (dataset, DVO_DATA *, NDATASET);
    6465  }
    6566
    66   pthread_mutex_unlock(&mutex);
     67  pthread_mutex_unlock(&fastmutex);
    6768  return (data);
    6869}

  • trunk/Ohana/src/addstar/src/ListenClients_Thread.c

    r6498 r6674  
    22
    33/* wait for incoming messages from clients */
    4 int ListenClients_Thread () {
     4void *ListenClients_Thread (void *data) {
    55
    66  int status, InitSocket, BindSocket;
    77  SockAddress Address;
    88  IOBuffer message;
    9   AddstarClientOptions options;
    109 
    1110  /* if we have multiple threads, each one creates its own socket? */

  • trunk/Ohana/src/addstar/src/NewRefcat_Thread.c

    r6498 r6674  
    77  IOBuffer message;
    88  SkyRegion *patch;
     9  DVO_DATA *dataset;
    910
    1011  /* accept incoming data set */

  • trunk/Ohana/src/addstar/src/NewReflist_Thread.c

    r6498 r6674  
    66  Stars *stars;
    77  AddstarClientOptions *options;
     8  DVO_DATA *dataset;
    89
    910  /* accept incoming data set */

  • trunk/Ohana/src/addstar/src/addstart.c

    r6498 r6674  
    11# include "addstar.h"
     2# include <pthread.h>
    23
    34int main (int argc, char **argv) {
    45
    5   int status, InitSocket, BindSocket;
    6   SockAddress Address;
    7   IOBuffer message;
    86  AddstarClientOptions options;
     7  pthread_t thread;
     8  DVO_DATA *dataset;
     9  // pthread_attr_t attr;
    910
    1011  options = ConfigInit (&argc, argv);
    … …  
    1314  /* store the sky table in a global for internal use */
    1415  ServerSky = SkyTableLoadOptimal (CATDIR, SKY_TABLE, GSCFILE, SKY_DEPTH, VERBOSE);
    15   SkyTableSetFilename (ServerSky, CATDIR, "cpt");
     16  SkyTableSetFilenames (ServerSky, CATDIR, "cpt");
    1617
    1718  VERBOSE = TRUE;
    … …  
    2425
    2526  /* decide if we need an argument to dbthread */
    26   pthread_create (thread, attr, ListenClients_Thread, NULL);
     27  pthread_create (&thread, NULL, &ListenClients_Thread, NULL);
    2728
    2829  while (1) {

  • trunk/Ohana/src/addstar/src/load_pt_catalog.c

    r5945 r6674  
    33int load_pt_catalog (Catalog *catalog, SkyRegion *region) {
    44 
    5   check_permissions (catalog[0].filename);
     5  if (!check_file_access (catalog[0].filename, TRUE, TRUE)) {
     6    exit (1);
     7  }
     8
    69  if (VERBOSE) fprintf (stderr, "adding to %s\n", catalog[0].filename);
    710   

  • trunk/Ohana/src/addstar/src/match_refstars.c

    r3339 r6674  
    1313    if (stars[i].found != -1) continue;
    1414    gregion_star (&stars[i], &region);
    15     check_permissions (region.filename);
     15    if (!check_file_access (region.filename, TRUE, TRUE)) {
     16      exit (0);
     17    }
    1618    make_backup (region.filename);
    1719
Note: See TracChangeset for help on using the changeset viewer.