Remove the concept of readers

Nek5000 · Feb 11, 2019 · c637a3c · c637a3c
1 parent d19c36d
commit c637a3c
Show file tree

Hide file tree

Showing 7 changed files with 15 additions and 97 deletions.
diff --git a/Makefile b/Makefile
@@ -31,7 +31,7 @@ CSRCS:= $(SRCDIR)/genmap.c \
  $(SRCDIR)/genmap-vector.c $(SRCDIR)/genmap-handle.c $(SRCDIR)/genmap-comm.c \
  $(SRCDIR)/genmap-eigen.c $(SRCDIR)/genmap-laplacian.c $(SRCDIR)/genmap-lanczos.c \
  $(SRCDIR)/genmap-rsb.c \
- $(SRCDIR)/genmap-quality.c $(SRCDIR)/genmap-io.c $(SRCDIR)/genmap-chelpers.c \
+ $(SRCDIR)/genmap-quality.c $(SRCDIR)/genmap-chelpers.c \
  $(SRCDIR)/parRSB.c 
 COBJS:=$(CSRCS:.c=.o)
 

diff --git a/src/genmap-handle.c b/src/genmap-handle.c
@@ -2,23 +2,6 @@
 //
 // GenmapHandle
 //
-int GenmapCreateHandle(GenmapHandle h) {
- h->global = NULL;
- h->local = NULL;
-
- h->elementArray.ptr = NULL;
- h->elementArray.n = h->elementArray.max = 0;
-
- h->Create(h);
-
- return 0;
-}
-
-int GenmapDestroyHandle(GenmapHandle h) {
- GenmapFree(h);
- return 0;
-}
-
 GenmapElements GenmapGetElements(GenmapHandle h) {
  return (GenmapElements) h->elementArray.ptr;
 }

diff --git a/src/genmap-impl.h b/src/genmap-impl.h
@@ -51,10 +51,8 @@ struct GenmapHandle_private {
 
  struct crystal cr;
 
- int (*Create)(GenmapHandle h);
-
- GenmapInt dbgLevel;
- GenmapInt printStat;
+ int dbgLevel;
+ int printStat;
 };
 //
 // GenmapHandle

diff --git a/src/genmap-io.c b/src/genmap-io.c
diff --git a/src/genmap.c b/src/genmap.c
@@ -4,72 +4,20 @@
 #include <stdlib.h>
 #include <stdio.h>
 //
-// Genmap Readers (FEM meshes, .map files, etc.)
-//
-static struct {
- char name[GENMAP_READER_LEN];
- int (*Create)(GenmapHandle h);
-} GenmapReaders[GENMAP_MAX_READERS];
-static size_t GenmapNumReaders = 0;
-static int GenmapReadersRegistered = 0;
-//
-// Register readers -- each reader should call this
-//
-int GenmapRegisterReader(char *name, int (*Create)(GenmapHandle h)) {
- if(GenmapNumReaders >= sizeof(GenmapReaders) / sizeof(GenmapReaders[0])) {
- //TODO: GenmapError
- printf("Error: Too many readers.\n");
- }
-
- strncpy(GenmapReaders[GenmapNumReaders].name, name, GENMAP_READER_LEN);
- GenmapReaders[GenmapNumReaders].Create = Create;
- GenmapNumReaders++;
-
- return 0;
-}
-//
-// GenmapRegister
-//
-int GenmapRegister() {
- int ierr;
- ierr = GenmapRegisterReader("interface", GenmapCreateHandle_interface);
- return ierr;
-}
-//
 // GenmapInit
 //
-int GenmapInit(GenmapHandle *h, GenmapCommExternal ce, char *reader) {
- if(GenmapReadersRegistered == 0) {
- GenmapRegister();
- GenmapReadersRegistered = 1;
- }
-
- char *registeredReader;
- size_t matchLen = 0, matchIdx = 0;
-
- size_t i, j;
- for(i = 0; i < GenmapNumReaders; i++) {
- registeredReader = GenmapReaders[i].name;
- for(j = 0; reader[j]
- && (reader[j] == registeredReader[j]); j++) {
- if(j > matchLen) {
- matchLen = j;
- matchIdx = i;
- }
- }
- }
+int GenmapInit(GenmapHandle *h, GenmapCommExternal ce) {
+ GenmapMalloc(1, h);
+ GenmapHandle h_ = *h;
 
- if(!matchLen) {
- //TODO: GenmapError
- printf("Error: Reader not found.\n");
- }
+ GenmapCreateComm(&h_->global, ce);
+ GenmapCreateComm(&h_->local, ce);
 
- GenmapMalloc(1, h);
- (*h)->Create = GenmapReaders[matchIdx].Create;
- GenmapCreateHandle(*h);
+ h_->elementArray.ptr = NULL;
+ h_->elementArray.n = (*h)->elementArray.max = 0;
 
- GenmapCreateComm(&(*h)->global, ce);
- GenmapCreateComm(&(*h)->local, ce);
+ h_->dbgLevel = 0;
+ h_->printStat = 0;
 
  return 0;
 }
@@ -82,10 +30,9 @@ int GenmapFinalize(GenmapHandle h) {
  if(GenmapGetLocalComm(h))
  GenmapDestroyComm(h->local);
 
-
  array_free(&(h->elementArray));
 
- GenmapDestroyHandle(h);
+ GenmapFree(h);
 
  return 0;
 }

diff --git a/src/genmap.h b/src/genmap.h
@@ -56,7 +56,7 @@ typedef struct GenmapElement_private *GenmapElements;
 //
 // Genmap: Init, Finalize
 //
-int GenmapInit(GenmapHandle *h, GenmapCommExternal ce, char *reader);
+int GenmapInit(GenmapHandle *h, GenmapCommExternal ce);
 int GenmapFinalize(GenmapHandle h);
 //
 // GenmapMalloc, Realloc, Calloc and Free

diff --git a/src/parRSB.c b/src/parRSB.c
@@ -29,7 +29,7 @@ int parRSB_partMesh(long long *egl, long long *vl, int *negl,
  long long *eglcon, long long *vlcon, int neglcon,
  int nve, int *options, MPI_Comm comm) {
  GenmapHandle h;
- GenmapInit(&h, comm, "interface");
+ GenmapInit(&h, comm);
 
  if(options[0] != 0) {
  h->dbgLevel = options[1];