Diff of /branches/mty-makai/mty.c

OSDN > Find Software > プロジェクト・ナニ屋

 Browse Subversion Repository



/[naniya]/branches/mty-makai/mty.c




Diff of /branches/mty-makai/mty.c



 Parent Directory

|  Revision Log



|  Patch














revision 233 by notanpe,
Thu Sep 17 14:07:37 2009 UTC




revision 234 by notanpe,
Mon Sep 28 09:14:24 2009 UTC






#

Line 72 
 unsigned char  umeStr[10];


Line 72 
 unsigned char  umeStr[10];












72
 int     umeLen;
 int     umeLen;

















73
 
 

















74
 FILE    *nfp;   /* 全数 */
 FILE    *nfp;   /* 全数 */














 FILE    *tfp;   /* ↑以外の特殊検索 */
 










 #ifdef CHIN
 













75
 FILE    *cfp;   /* ち */
 FILE    *cfp;   /* ち */















76


 #endif /* CHIN */


 FILE    *tfp;   /* ↑以外の特殊検索 */















77
 #ifdef REON
 #ifdef REON

















78
 FILE    *rfp;   /* 正規表現 */
 FILE    *rfp;   /* 正規表現 */

















79
 #endif /* REON */
 #endif /* REON */











#

Line 102 
 int    verbose;


Line 100 
 int    verbose;












100
 #define   DEF_GEAR   10
 #define   DEF_GEAR   10

















101
 int     gear;
 int     gear;

















102
 
 












103
 
 #ifdef SELF







104
 
 #define   SELF_LIM_CNT   50







105
 
 #define   SELF_LIM_SEC   60 * 60 * 1000 /* 1h */







106
 
 #endif /* SELF */







107
 
 












108
 unsigned char   saltChar[2];
 unsigned char   saltChar[2];

















109
 
 

















110
 #ifdef ALLKEY
 #ifdef ALLKEY











#

Line 132 
 int    special = 0;


Line 135 
 int    special = 0;












135
 #define ST_NIKO 1<<0x1 /* 二構 */
 #define ST_NIKO 1<<0x1 /* 二構 */

















136
 #define ST_BUOO 1<<0x8 /* ぶお */
 #define ST_BUOO 1<<0x8 /* ぶお */

















137
 #define ST_DOSU 1<<0x9 /* 怒数 */
 #define ST_DOSU 1<<0x9 /* 怒数 */















138


 #define ST_CHIN 1<<0xb /* ^Chinko Uni では感嘆用のフラグ */


 #define ST_CHIN 1<<0xb /* ちん Uni では感嘆用のフラグ */













139


 #define ST_EROI 1<<0xc /* エロい人 Uni では拡飛のフラグ */


 #define ST_EROI 1<<0xc /* エロ Uni では拡飛のフラグ */















140
 #define ST_HREN 1<<0xd /* 飛連 */
 #define ST_HREN 1<<0xd /* 飛連 */

















141
 #define ST_YAKU 1<<0xe /* 八雲 */
 #define ST_YAKU 1<<0xe /* 八雲 */

















142
 
 











#

Line 156 
 char   *str;


Line 159 
 char   *str;












159
      case '9': special |= (ST_DOSU | ST_ALLN); break;
      case '9': special |= (ST_DOSU | ST_ALLN); break;

















160
      case 'd': special |= ST_HREN; break;
      case 'd': special |= ST_HREN; break;

















161
      case 'e': special |= ST_YAKU; break;
      case 'e': special |= ST_YAKU; break;












162
 
      case 'Y': special |= ST_CHIN; break;












163
      case 'Z': special |= ST_EROI; break;
      case 'Z': special |= ST_EROI; break;

















164
      case 'S':
      case 'S':

















165
       seedOffset = atoi( str + 4 );
       seedOffset = atoi( str + 4 );











#

Line 1235 
 checkSpecial( trip, kind )


Line 1239 
 checkSpecial( trip, kind )












1239
 char    *trip;
 char    *trip;

















1240
 unsigned char   *kind;
 unsigned char   *kind;

















1241
 {
 {















1242


 #ifdef CHIN


   if ( special & ST_CHIN ) {













1243


   /* 強制的に検索 */


    /* ^Chi(r */













1244


   if ( trip[0] == 'C' && trip[1] == 'h' && trip[2] == 'i' &&


    if ( trip[0] == 'C' && trip[1] == 'h' && trip[2] == 'i' &&













1245


        trip[3] == 'n' && trip[4] == 'k' && trip[5] == 'o' ) {


         trip[3] == 'n' && trip[4] == 'k' && trip[5] == 'o' ) {













1246


    strcpy( kind, "ち" );


     strcpy( kind, "ち" );













1247


    return( cfp );


     return( cfp );













1248


 


    }















1249
   }
   }














 #endif /* CHIN */
 













1250
 
 

















1251
   if ( special & ST_BUOO ) {
   if ( special & ST_BUOO ) {

















1252
    /* ぶお [A-Za-z]aoo[A-Za-z]uoo$ */
    /* ぶお [A-Za-z]aoo[A-Za-z]uoo$ */











#

Line 1558 
 main(int argc, char *argv[])


Line 1562 
 main(int argc, char *argv[])












1562
   /* タゲ読み込み */
   /* タゲ読み込み */

















1563
   root_expr = expr_parse( "target.txt" );
   root_expr = expr_parse( "target.txt" );

















1564
 
 














 #ifdef CHIN
 










   special |= ST_CHIN;
 










 #endif /* CHIN */
 













1565
   if ( verbose ) {
   if ( verbose ) {

















1566
    printf( "特殊検索オプション : " );
    printf( "特殊検索オプション : " );

















1567
    if ( special & ST_DOSU ) {
    if ( special & ST_DOSU ) {











#

Line 1579 
 main(int argc, char *argv[])


Line 1580 
 main(int argc, char *argv[])












1580
    if ( special & ST_BUOO ) {
    if ( special & ST_BUOO ) {

















1581
     printf( "ぶお " );
     printf( "ぶお " );

















1582
    }
    }












1583
 
    if ( special & ST_CHIN ) {







1584
 
     printf( "ちん " );







1585
 
    }












1586
    if ( special & ST_HREN ) {
    if ( special & ST_HREN ) {

















1587
     printf( "飛連 " );
     printf( "飛連 " );

















1588
    }
    }











#

Line 1777 
 main(int argc, char *argv[])


Line 1781 
 main(int argc, char *argv[])












1781
    return errno;
    return errno;

















1782
   }
   }

















1783
   setvbuf( nfp, NULL, _IONBF, BUFSIZ );
   setvbuf( nfp, NULL, _IONBF, BUFSIZ );














 #ifdef CHIN
 













1784
   if ( (cfp = fopen( "logchi.txt", "at" )) == NULL ) {
   if ( (cfp = fopen( "logchi.txt", "at" )) == NULL ) {

















1785
    perror( "logchi.txt" );
    perror( "logchi.txt" );

















1786
    return errno;
    return errno;

















1787
   }
   }

















1788
   setvbuf( cfp, NULL, _IONBF, BUFSIZ );
   setvbuf( cfp, NULL, _IONBF, BUFSIZ );














 #endif /* CHIN */
 













1789
 #ifdef REON
 #ifdef REON

















1790
   if ( (rfp = fopen( "logreg.txt", "at" )) == NULL ) {
   if ( (rfp = fopen( "logreg.txt", "at" )) == NULL ) {

















1791
    perror( "logreg.txt" );
    perror( "logreg.txt" );











#

Line 2032 
 main(int argc, char *argv[])


Line 2034 
 main(int argc, char *argv[])












2034
      cr = 0;
      cr = 0;

















2035
 {
 {

















2036
      unsigned char      len[10];
      unsigned char      len[10];












2037
 
 #ifdef SELF







2038
 
      static hitCount = 0;







2039
 
 #endif /* SELF */







2040
 
 












2041
      sprintf( len, "%02d", hitLen );
      sprintf( len, "%02d", hitLen );

















2042
 #ifdef NAMA
 #ifdef NAMA

















2043
      hit( ofp, hash, pkt_c->uk.key, kk, k, len, MAKAI_FALSE );
      hit( ofp, hash, pkt_c->uk.key, kk, k, len, MAKAI_FALSE );

















2044
 #else /* NAMA */
 #else /* NAMA */

















2045
      hit( ofp, hash, pkt_c->uk.key, kk, k, len, MAKAI_TRUE );
      hit( ofp, hash, pkt_c->uk.key, kk, k, len, MAKAI_TRUE );

















2046
 #endif /* NAMA */
 #endif /* NAMA */












2047
 
 







2048
 
 #ifdef SELF







2049
 
      hitCount++;







2050
 
      if ( hitCount >= SELF_LIM_CNT ) {







2051
 
       exit( 0 );







2052
 
      }







2053
 
 #endif /* SELF */












2054
 }
 }

















2055
     }
     }

















2056
    }
    }











#

Line 2061 
 main(int argc, char *argv[])


Line 2074 
 main(int argc, char *argv[])












2074
     int a, b, c;
     int a, b, c;

















2075
     /* 通算(単位 ktrips/sec) */
     /* 通算(単位 ktrips/sec) */

















2076
     diffTime = curTime - status.startTime;
     diffTime = curTime - status.startTime;












2077
 
 #ifdef SELF







2078
 
     if ( diffTime >= SELF_LIM_SEC ) {







2079
 
      exit( 0 );







2080
 
     }







2081
 
 #endif /* SELF */












2082
     a = status.loop / ((1000 / USEC_SEC) * diffTime);
     a = status.loop / ((1000 / USEC_SEC) * diffTime);

















2083
 #ifdef BENCH
 #ifdef BENCH

















2084
     if ( (diffTime / USEC_SEC) > (BENCH * 60) ) {
     if ( (diffTime / USEC_SEC) > (BENCH * 60) ) {





























Legend:



Removed from v.233
 


changed lines


 
Added in v.234













Back to OSDN">Back to OSDN
ViewVC Help


Powered by ViewVC 1.1.26
 /[naniya]/branches/mty-makai/mty.c
-revision 233 by notanpe,
Thu Sep 17 14:07:37 2009 UTC
+revision 234 by notanpe,
Mon Sep 28 09:14:24 2009 UTC
 Line 72 
 unsigned char  umeStr[10];
  int     umeLen;
  FILE    *nfp;   /* 全数 */
- FILE    *tfp;   /* ↑以外の特殊検索 */
- #ifdef CHIN
  FILE    *cfp;   /* ち */
- #endif /* CHIN */
+ FILE    *tfp;   /* ↑以外の特殊検索 */
  #ifdef REON
  FILE    *rfp;   /* 正規表現 */
  #endif /* REON */
-Line 102 
 int    verbose;
+Line 100 
 int    verbose;
  #define   DEF_GEAR   10
  int     gear;
+ #ifdef SELF
+ #define   SELF_LIM_CNT   50
+ #define   SELF_LIM_SEC   60 * 60 * 1000 /* 1h */
+ #endif /* SELF */
  unsigned char   saltChar[2];
  #ifdef ALLKEY
-Line 132 
 int    special = 0;
+Line 135 
 int    special = 0;
  #define ST_NIKO 1<<0x1 /* 二構 */
  #define ST_BUOO 1<<0x8 /* ぶお */
  #define ST_DOSU 1<<0x9 /* 怒数 */
- #define ST_CHIN 1<<0xb /* ^Chinko Uni では感嘆用のフラグ */
+ #define ST_CHIN 1<<0xb /* ちん Uni では感嘆用のフラグ */
- #define ST_EROI 1<<0xc /* エロい人 Uni では拡飛のフラグ */
+ #define ST_EROI 1<<0xc /* エロ Uni では拡飛のフラグ */
  #define ST_HREN 1<<0xd /* 飛連 */
  #define ST_YAKU 1<<0xe /* 八雲 */
-Line 156 
 char   *str;
+Line 159 
 char   *str;
       case '9': special |= (ST_DOSU | ST_ALLN); break;
       case 'd': special |= ST_HREN; break;
       case 'e': special |= ST_YAKU; break;
+      case 'Y': special |= ST_CHIN; break;
       case 'Z': special |= ST_EROI; break;
       case 'S':
        seedOffset = atoi( str + 4 );
-Line 1235 
 checkSpecial( trip, kind )
+Line 1239 
 checkSpecial( trip, kind )
  char    *trip;
  unsigned char   *kind;
  {
- #ifdef CHIN
+   if ( special & ST_CHIN ) {
-   /* 強制的に検索 */
+    /* ^Chi(r */
-   if ( trip[0] == 'C' && trip[1] == 'h' && trip[2] == 'i' &&
+    if ( trip[0] == 'C' && trip[1] == 'h' && trip[2] == 'i' &&
-        trip[3] == 'n' && trip[4] == 'k' && trip[5] == 'o' ) {
+         trip[3] == 'n' && trip[4] == 'k' && trip[5] == 'o' ) {
-    strcpy( kind, "ち" );
+     strcpy( kind, "ち" );
-    return( cfp );
+     return( cfp );
+    }
    }
- #endif /* CHIN */
    if ( special & ST_BUOO ) {
     /* ぶお [A-Za-z]aoo[A-Za-z]uoo$ */
-Line 1558 
 main(int argc, char *argv[])
+Line 1562 
 main(int argc, char *argv[])
    /* タゲ読み込み */
    root_expr = expr_parse( "target.txt" );
- #ifdef CHIN
-   special |= ST_CHIN;
- #endif /* CHIN */
    if ( verbose ) {
     printf( "特殊検索オプション : " );
     if ( special & ST_DOSU ) {
-Line 1579 
 main(int argc, char *argv[])
+Line 1580 
 main(int argc, char *argv[])
     if ( special & ST_BUOO ) {
      printf( "ぶお " );
     }
+    if ( special & ST_CHIN ) {
+     printf( "ちん " );
+    }
     if ( special & ST_HREN ) {
      printf( "飛連 " );
     }
-Line 1777 
 main(int argc, char *argv[])
+Line 1781 
 main(int argc, char *argv[])
     return errno;
    }
    setvbuf( nfp, NULL, _IONBF, BUFSIZ );
- #ifdef CHIN
    if ( (cfp = fopen( "logchi.txt", "at" )) == NULL ) {
     perror( "logchi.txt" );
     return errno;
    }
    setvbuf( cfp, NULL, _IONBF, BUFSIZ );
- #endif /* CHIN */
  #ifdef REON
    if ( (rfp = fopen( "logreg.txt", "at" )) == NULL ) {
     perror( "logreg.txt" );
-Line 2032 
 main(int argc, char *argv[])
+Line 2034 
 main(int argc, char *argv[])
       cr = 0;
  {
       unsigned char      len[10];
+ #ifdef SELF
+      static hitCount = 0;
+ #endif /* SELF */
       sprintf( len, "%02d", hitLen );
  #ifdef NAMA
       hit( ofp, hash, pkt_c->uk.key, kk, k, len, MAKAI_FALSE );
  #else /* NAMA */
       hit( ofp, hash, pkt_c->uk.key, kk, k, len, MAKAI_TRUE );
  #endif /* NAMA */
+ #ifdef SELF
+      hitCount++;
+      if ( hitCount >= SELF_LIM_CNT ) {
+       exit( 0 );
+      }
+ #endif /* SELF */
  }
      }
     }
-Line 2061 
 main(int argc, char *argv[])
+Line 2074 
 main(int argc, char *argv[])
      int a, b, c;
      /* 通算(単位 ktrips/sec) */
      diffTime = curTime - status.startTime;
+ #ifdef SELF
+     if ( diffTime >= SELF_LIM_SEC ) {
+      exit( 0 );
+     }
+ #endif /* SELF */
      a = status.loop / ((1000 / USEC_SEC) * diffTime);
  #ifdef BENCH
      if ( (diffTime / USEC_SEC) > (BENCH * 60) ) {
 Legend:



Removed from v.233
 


changed lines


 
Added in v.234
 Legend:



Removed from v.233
 


changed lines


 
Added in v.234
-Removed from v.233
+Added in v.234
-Back to OSDN">Back to OSDN
+ViewVC Help
 Powered by ViewVC 1.1.26

Develop and Download Open Source Software

プロジェクト・ナニ屋

Browse Subversion Repository