Version bumped to 1.0.1.

[timeplan.git] / timeplan.c

diff --git a/timeplan.c b/timeplan.c
index 7818e43..ebf202d 100644 (file)
--- a/timeplan.c
+++ b/timeplan.c
@@ -10,7 +10,7 @@
 #include <regex.h>
 
 #define ACTS_MAX 20
 #include <regex.h>
 
 #define ACTS_MAX 20

-#define HASH_SIZE 211
+#define HASH_SIZE 971

 #define CONFIGFILE "/.timeplanrc" /* HOME prepended */
 #define DEF_TIMEPLAN "/.timeplan" /* HOME prepended */
 #define MARK_DAY "_days"
 #define CONFIGFILE "/.timeplanrc" /* HOME prepended */
 #define DEF_TIMEPLAN "/.timeplan" /* HOME prepended */
 #define MARK_DAY "_days"


@@ -25,7 +25,7 @@
 #define ERRNO2 strerror(errno)
 #define FAKEUSE =0
 
 #define ERRNO2 strerror(errno)
 #define FAKEUSE =0
 

-static const char version[]="This is TimePlan, version 1.0\n";
+static const char version[]="This is TimePlan, version 1.0.1\n";

 static const char *pname;
 static char *finame;
 static FILE *fi;
 static const char *pname;
 static char *finame;
 static FILE *fi;


@@ -35,6 +35,7 @@ static char buf[LINE_MAX];
 static int line=0;
 static enum { SORT_NO,SORT_TIMETOT,SORT_STORES } sortby=SORT_TIMETOT;
 static unsigned lifetime_days=0;
 static int line=0;
 static enum { SORT_NO,SORT_TIMETOT,SORT_STORES } sortby=SORT_TIMETOT;
 static unsigned lifetime_days=0;

+static unsigned long lifetime_seq=1;

 
 static void usage(void)
 {
 
 static void usage(void)
 {


@@ -84,6 +85,7 @@ static int calctime(int timetot,int at,int of)
 static struct action {
        struct action *next;
        int timetot,stores;
 static struct action {
        struct action *next;
        int timetot,stores;

+       unsigned long last_seq;

        char what[1];
        } *hashtable[HASH_SIZE];
 static int hashtable_tot=0;
        char what[1];
        } *hashtable[HASH_SIZE];
 static int hashtable_tot=0;


@@ -138,7 +140,7 @@ dump:
        if (action)
                printf("=%03d/%02d:%02d %4d\t%s\n",days,hours,mins,
                        action->stores,action->what);
        if (action)
                printf("=%03d/%02d:%02d %4d\t%s\n",days,hours,mins,
                        action->stores,action->what);

-       return(origtot);
+       return origtot;

 }
 
 #define A (*Ap)
 }
 
 #define A (*Ap)


@@ -189,6 +191,7 @@ static unsigned calchash(const char *s)
 unsigned r=57;
 
        while (*s) r=r*7+11*toupper(*s++);
 unsigned r=57;
 
        while (*s) r=r*7+11*toupper(*s++);

+       r=r%HASH_SIZE;

        return r;
 }
 
        return r;
 }
 


@@ -196,8 +199,10 @@ static void storeone(char *what,int length)
 {
 struct action **actionp,*action;
 
 {
 struct action **actionp,*action;
 

+       if (!*what)
+               return;

        if (verbose) printf("storeone: %d: %s\n",length,what);
        if (verbose) printf("storeone: %d: %s\n",length,what);

-       for (actionp=hashtable+(calchash(what)%HASH_SIZE);(action=*actionp);actionp=&action->next)
+       for (actionp=hashtable+calchash(what);(action=*actionp);actionp=&action->next)

                if (!strcasecmp(action->what,what)) break;
        if (!action) {
                if (!(action=malloc(sizeof(*action)+strlen(what)))) {
                if (!strcasecmp(action->what,what)) break;
        if (!action) {
                if (!(action=malloc(sizeof(*action)+strlen(what)))) {


@@ -211,6 +216,13 @@ struct action **actionp,*action;
                *actionp=action;
                hashtable_tot++;
                }
                *actionp=action;
                hashtable_tot++;
                }

+       else {
+               if (action->last_seq==lifetime_seq) {
+                       if (verbose) puts("storeone: preventing duplicate");
+                       return; /* prevent duplicates like: TV-Music  -->  TV-Fun-Music-Fun */
+                       }
+               }
+       action->last_seq=lifetime_seq;

        action->timetot+=length;
        action->stores++;
 }
        action->timetot+=length;
        action->stores++;
 }


@@ -227,8 +239,8 @@ static int iscondition(const char *text)
 struct textlist *cond;
 
        for (cond=conditions;cond;cond=cond->next)
 struct textlist *cond;
 
        for (cond=conditions;cond;cond=cond->next)

-               if (!strcasecmp(text,cond->text)) return(1);
-       return(0);
+               if (!strcasecmp(text,cond->text)) return 1;
+       return 0;

 }
 
 static void addlist(struct textlist ***tail,const char *text,int line)
 }
 
 static void addlist(struct textlist ***tail,const char *text,int line)


@@ -347,6 +359,7 @@ static char *modify(char *what)
 {
 regmatch_t matches[10];
 int i,m;
 {
 regmatch_t matches[10];
 int i,m;

+int doprep,willprep;

 static char modbuf1[sizeof(buf)],modbuf2[sizeof(modbuf1)];
 char *src=what,*dstbase=modbuf1,*dst=dstbase;
 const char *start FAKEUSE,*end FAKEUSE,*patt;
 static char modbuf1[sizeof(buf)],modbuf2[sizeof(modbuf1)];
 char *src=what,*dstbase=modbuf1,*dst=dstbase;
 const char *start FAKEUSE,*end FAKEUSE,*patt;


@@ -354,101 +367,191 @@ const struct textlist *item;
 
        if (verbose) printf("modify: %s\n",what);
        modify_load();
 
        if (verbose) printf("modify: %s\n",what);
        modify_load();

-       for (m=0,item=modifies;item;m++,item=item->next) {
+       for (m=0,item=modifies,willprep=1;;m++,item=item->next) {

 enum { PATT_START,PATT_MID,PATT_END,PATT_TERM } pattpos;
 
 enum { PATT_START,PATT_MID,PATT_END,PATT_TERM } pattpos;
 

-               i=regexec(&modistructs[m].regex,src,LENGTH(matches),matches,0);
-               if (i==REG_NOMATCH) continue;
-               if (i) {
-                       fprintf(ERRH1"regexec() failed for \"%s\""ERRNO1,ERRH2,item->text,ERRNO2);
-                       exit(EXIT_FAILURE);
-                       }
-               if (verbose) printf("matched: %s -> %s\n",item->text,modistructs[m].dst);
-               pattpos=PATT_START; patt=NULL;
-               while (pattpos!=PATT_TERM) {
-                       switch (pattpos) {
-                               case PATT_START:
-                                       start=src;
-                                       end=src+matches->rm_so;
-                                       pattpos=PATT_MID; patt=modistructs[m].dst;
-                                       break;
-                               case PATT_MID:
-                                       if (!*patt) {
-                                               pattpos=PATT_END; patt=NULL;
-                                               continue;
-                                               }
-                                       else if (*patt=='@') {
-                                               start=src; end=src+strlen(src);
+               for (doprep=willprep;doprep>=0;doprep--) {
+                       if (doprep) {
+                               *dst++='-';
+                               for (patt=src;;patt++) {
+                                       if (*patt=='-' || !*patt) {
+                                               if (dst[-1]!='-')
+                                                       *dst++='-';
+                                               if (!*patt)
+                                                       break;

                                                }
                                                }

-                                       else if (*patt>='0' && *patt<='9') {
-regmatch_t *match=matches+(*patt-'0');
-                                               if (match->rm_so==-1
-                                                || match->rm_eo==-1) {
-                                                       fprintf(ERRH1"Trying to substitute '%c' but no \"matches\" entry not set for \"%s\""WHERE1,
-                                                                       ERRH2,*patt,item->text,WHERE2);
-                                                       exit(EXIT_FAILURE);
-                                                       }
-                                               if (match->rm_so>match->rm_eo) {
-                                                       fprintf(ERRH1"Trying to substitute '%c' start>end (%d>%d) for \"%s\""WHERE1,
-                                                                       ERRH2,*patt,match->rm_so,match->rm_eo,item->text,WHERE2);
-                                                       exit(EXIT_FAILURE);
-                                                       }
-                                               start=src+match->rm_so; end=src+match->rm_eo;
+                                       else
+                                               *dst++=*patt;
+                                       }
+                               }
+                       else {
+                               if (!item)
+                                       return src;
+                               i=regexec(&modistructs[m].regex,src,LENGTH(matches),matches,0);
+                               if (i==REG_NOMATCH) {
+                                       willprep=0;
+                                       break;
+                                       }
+                               if (i) {
+                                       fprintf(ERRH1"regexec() failed for \"%s\""ERRNO1,ERRH2,item->text,ERRNO2);
+                                       exit(EXIT_FAILURE);
+                                       }
+                               willprep=1;
+                               if (verbose) printf("matched: %s -> %s\n",item->text,modistructs[m].dst);
+                               pattpos=PATT_START; patt=NULL;
+                               while (pattpos!=PATT_TERM) {
+                                       switch (pattpos) {
+                                               case PATT_START:
+                                                       start=src;
+                                                       end=src+matches->rm_so;
+                                                       pattpos=PATT_MID; patt=modistructs[m].dst;
+                                                       break;
+                                               case PATT_MID:
+                                                       if (!*patt) {
+                                                               pattpos=PATT_END; patt=NULL;
+                                                               continue;
+                                                               }
+                                                       else if (*patt=='@') {
+                                                               start=src; end=src+strlen(src);
+                                                               }
+                                                       else if (*patt>='0' && *patt<='9') {
+               regmatch_t *match=matches+(*patt-'0');
+                                                               if (match->rm_so==-1
+                                                                || match->rm_eo==-1) {
+                                                                       fprintf(ERRH1"Trying to substitute '%c' but no \"matches\" entry not set for \"%s\""WHERE1,
+                                                                                       ERRH2,*patt,item->text,WHERE2);
+                                                                       exit(EXIT_FAILURE);
+                                                                       }
+                                                               if (match->rm_so>match->rm_eo) {
+                                                                       fprintf(ERRH1"Trying to substitute '%c' start>end (%d>%d) for \"%s\""WHERE1,
+                                                                                       ERRH2,*patt,match->rm_so,match->rm_eo,item->text,WHERE2);
+                                                                       exit(EXIT_FAILURE);
+                                                                       }
+                                                               start=src+match->rm_so; end=src+match->rm_eo;
+                                                               }
+                                                       else {
+                                                               start=patt; end=patt+1;
+                                                               }
+                                                       patt++;
+                                                       break;
+                                               case PATT_END:
+                                                       start=src+matches->rm_eo;
+                                                       end=src+strlen(src);
+                                                       pattpos=PATT_TERM; /* assumed: patt=NULL; */
+                                                       break;
+                                               default:
+                                                       assert(0);

                                                }
                                                }

-                                       else {
-                                               start=patt; end=patt+1;
+                                       if ((dst-dstbase+(end-start))>=sizeof(modbuf1)-1/* -1 for '-' during prepping */) {
+                                               fprintf(ERRH1"Maximum buffer size exceeded during substition for \"%s\""WHERE1,
+                                                               ERRH2,item->text,WHERE2);
+                                               exit(EXIT_FAILURE);

                                                }
                                                }

-                                       patt++;
-                                       break;
-                               case PATT_END:
-                                       start=src+matches->rm_eo;
-                                       end=src+strlen(src);
-                                       pattpos=PATT_TERM; /* assumed: patt=NULL; */
-                                       break;
-                               default:
-                                       assert(0);
+                                       memcpy(dst,start,end-start);
+                                       dst+=end-start;
+                                       }

                                }
                                }

-                       if ((dst-dstbase+(end-start))>=sizeof(modbuf1)) {
-                               fprintf(ERRH1"Maximum buffer size exceeded during substition for \"%s\""WHERE1,
-                                               ERRH2,item->text,WHERE2);
-                               exit(EXIT_FAILURE);
+/* SWAP buffers: */
+                       if (dst==dstbase || (dst==dstbase+1 && *dstbase=='-'))
+                               return NULL;
+                       *dst='\0';
+                       if (src==what) {
+                               assert(dstbase==modbuf1);
+                               src=dstbase;
+                               dst=dstbase=modbuf2;

                                }
                                }

-                       memcpy(dst,start,end-start);
-                       dst+=end-start;
-                       }
-               if (dst==dstbase) return(NULL);
-               *dst='\0';
-               if (src==what) {
-                       assert(dstbase==modbuf1);
-                       src=dstbase;
-                       dst=dstbase=modbuf2;
-                       }
-               else {
-char *swap;
-                       assert((src==modbuf1 && dstbase==modbuf2)
-                                        ||(src==modbuf2 && dstbase==modbuf1));
-                       swap=src; src=dstbase; dst=dstbase=swap;
+                       else {
+       char *swap;
+                               assert((src==modbuf1 && dstbase==modbuf2)
+                                                ||(src==modbuf2 && dstbase==modbuf1));
+                               swap=src; src=dstbase; dst=dstbase=swap;
+                               }
+                       } /* for (doprep) */
+               }
+       /* NOTREACHED */
+}
+
+static struct modifycache {
+       struct modifycache *next;
+       char src[1]; /* dst[1] follows after '\0' */
+       } *mcachetable[HASH_SIZE];
+static unsigned long modifycache_hits;
+
+static char *modify_cached(char *what)
+{
+struct modifycache **mcachep,*mcache;
+char *dst;
+size_t whatl;
+
+       if (!*what)
+               return(NULL);
+       whatl=strlen(what);
+       if (verbose) printf("modify_cached: %s\n",what);
+       for (mcachep=mcachetable+calchash(what);(mcache=*mcachep);mcachep=&mcache->next)
+               if (!strcasecmp(mcache->src,what)) break;
+       if (!mcache) {
+               dst=modify(what);
+               if (!(mcache=malloc(sizeof(*mcache)+whatl+1+(dst?strlen(dst):0)))) {
+                       fprintf(ERRH1"malloc() for \"%s\""ERRNO1,ERRH2,what,ERRNO2);
+                       exit(EXIT_FAILURE);

                        }
                        }

+               mcache->next=NULL;
+               memcpy(mcache->src,what,whatl+1);
+               if (dst)
+                       strcpy(mcache->src+whatl+1,dst);
+               else
+                       mcache->src[whatl+1]='\0'; /* dst will be empty */
+               *mcachep=mcache;
+               }
+       else {
+               if (verbose) printf("cache hit.\n");
+               /* if (verbose) would be performance hit */
+                       modifycache_hits++;
+               }
+       if (!mcache->src[whatl+1])
+               return(NULL);
+       return(mcache->src+whatl+1);
+}
+
+static void modify_cached_stats(void)
+{
+struct modifycache **mcachep,*mcache;
+unsigned long depth,maxdepth=0,entries_total=0;
+#define MODIFYCACHE_CALLS (modifycache_hits+entries_total)
+
+       for (mcachep=mcachetable;mcachep<mcachetable+HASH_SIZE;mcachep++) {
+               for (depth=0,mcache=*mcachep;mcache;mcache=mcache->next)
+                       depth++;
+               if (depth>maxdepth)
+                       maxdepth=depth;
+               entries_total+=depth;

                }
                }

-       return src;
+       printf("modify_cached cache stats: hits=%u.%02u%% (%lu/%lu), HASH_SIZE=%d, maxdepth=%lu\n",
+               (unsigned)(   100*modifycache_hits/MODIFYCACHE_CALLS     ),
+               (unsigned)((10000*modifycache_hits/MODIFYCACHE_CALLS)%100),
+                                 modifycache_hits,MODIFYCACHE_CALLS,
+               HASH_SIZE,maxdepth);
+#undef MODIFYCACHE_CALLS

 }
 
 static void store(char *what,int length)
 {
 }
 
 static void store(char *what,int length)
 {

-char *ce;
+char ce_trash,*ce,*ceo=&ce_trash;

 
 

-       if (!(what=modify(what))) {
+       if (!(what=modify_cached(what))) {

                if (verbose) puts("discarded.");
                return;
                }
        if (verbose) printf("store: %d: %s\n",length,what);
                if (verbose) puts("discarded.");
                return;
                }
        if (verbose) printf("store: %d: %s\n",length,what);

-       while ((ce=(tree?strrchr:strchr)(what,'-'))) {
+       while ((ce=(tree?strrchr(what,'-'):strchr(what,'-')))) {

                if (!tree) *ce='\0';
                storeone(what,length);
                if (!tree) *ce='\0';
                storeone(what,length);

-               if (!tree) what=ce+1;
-               else *ce='\0';
+               if (!tree) { *ce='-'; what=ce+1; }
+               else { *ceo='-'; *(ceo=ce)='\0'; }

                }
        storeone(what,length);
                }
        storeone(what,length);

+       if (tree) *ceo='-';
+       lifetime_seq++;

 }
 
 static void hit(time_t t,char *bufaction)
 }
 
 static void hit(time_t t,char *bufaction)


@@ -590,7 +693,7 @@ const char *days[]={"Ne","Po","Ut","St","Ct","Pa","So"};
                        t=mktime(&tm);
                        if (t==-1 || tm.tm_wday<0 || tm.tm_wday>6
                            || tm.tm_mday<1 || tm.tm_mday>31
                        t=mktime(&tm);
                        if (t==-1 || tm.tm_wday<0 || tm.tm_wday>6
                            || tm.tm_mday<1 || tm.tm_mday>31

-                                       || tm.tm_mon <1 || tm.tm_mon >12
+                                       || tm.tm_mon <0 || tm.tm_mon >11

                                        || tm.tm_year<80 || tm.tm_year>150
                                  ) {
                                fprintf(ERRH1"Incorrect timestamp \"%s\""WHERE1,ERRH2,buf,WHERE2);
                                        || tm.tm_year<80 || tm.tm_year>150
                                  ) {
                                fprintf(ERRH1"Incorrect timestamp \"%s\""WHERE1,ERRH2,buf,WHERE2);


@@ -634,6 +737,8 @@ const char *days[]={"Ne","Po","Ut","St","Ct","Pa","So"};
        if (fi!=stdin && fclose(fi))
                fprintf(ERRH1"fclose(3) \"%s\""ERRNO1,ERRH2,finame,ERRNO2);
 
        if (fi!=stdin && fclose(fi))
                fprintf(ERRH1"fclose(3) \"%s\""ERRNO1,ERRH2,finame,ERRNO2);
 

+       if (verbose)
+               modify_cached_stats();

        dumphashtable();
        dumphashtable();

-       return(EXIT_SUCCESS);
+       return EXIT_SUCCESS;

 }
 }