/[pcre]/code/trunk/pcretest.c
ViewVC logotype

Diff of /code/trunk/pcretest.c

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 658 by ph10, Mon Aug 15 17:43:44 2011 UTC revision 691 by ph10, Sun Sep 11 14:31:21 2011 UTC
# Line 112  to keep two copies, we include the sourc Line 112  to keep two copies, we include the sourc
112  external symbols to prevent clashes. */  external symbols to prevent clashes. */
113    
114  #define _pcre_ucp_gentype      ucp_gentype  #define _pcre_ucp_gentype      ucp_gentype
115    #define _pcre_ucp_typerange    ucp_typerange
116  #define _pcre_utf8_table1      utf8_table1  #define _pcre_utf8_table1      utf8_table1
117  #define _pcre_utf8_table1_size utf8_table1_size  #define _pcre_utf8_table1_size utf8_table1_size
118  #define _pcre_utf8_table2      utf8_table2  #define _pcre_utf8_table2      utf8_table2
119  #define _pcre_utf8_table3      utf8_table3  #define _pcre_utf8_table3      utf8_table3
120  #define _pcre_utf8_table4      utf8_table4  #define _pcre_utf8_table4      utf8_table4
121    #define _pcre_utf8_char_sizes  utf8_char_sizes
122  #define _pcre_utt              utt  #define _pcre_utt              utt
123  #define _pcre_utt_size         utt_size  #define _pcre_utt_size         utt_size
124  #define _pcre_utt_names        utt_names  #define _pcre_utt_names        utt_names
# Line 227  static const char *errtexts[] = { Line 229  static const char *errtexts[] = {
229    "invalid combination of newline options",    "invalid combination of newline options",
230    "bad offset value",    "bad offset value",
231    NULL,  /* SHORTUTF8 is handled specially */    NULL,  /* SHORTUTF8 is handled specially */
232    "nested recursion at the same subject position"    "nested recursion at the same subject position",
233      "JIT stack limit reached"
234  };  };
235    
236    
# Line 579  return sys_errlist[n]; Line 582  return sys_errlist[n];
582  #endif /* HAVE_STRERROR */  #endif /* HAVE_STRERROR */
583    
584    
585    /*************************************************
586    *         JIT memory callback                    *
587    *************************************************/
588    
589    static pcre_jit_stack* jit_callback(void *arg)
590    {
591    return (pcre_jit_stack *)arg;
592    }
593    
594    
595  /*************************************************  /*************************************************
# Line 987  return (cb->callout_number != callout_fa Line 998  return (cb->callout_number != callout_fa
998  *            Local malloc functions              *  *            Local malloc functions              *
999  *************************************************/  *************************************************/
1000    
1001  /* Alternative malloc function, to test functionality and show the size of the  /* Alternative malloc function, to test functionality and save the size of a
1002  compiled re. */  compiled re. The show_malloc variable is set only during matching. */
1003    
1004  static void *new_malloc(size_t size)  static void *new_malloc(size_t size)
1005  {  {
# Line 1006  if (show_malloc) Line 1017  if (show_malloc)
1017  free(block);  free(block);
1018  }  }
1019    
   
1020  /* For recursion malloc/free, to test stacking calls */  /* For recursion malloc/free, to test stacking calls */
1021    
1022  static void *stack_malloc(size_t size)  static void *stack_malloc(size_t size)
# Line 1195  printf(" -p use POSIX interface\n Line 1205  printf(" -p use POSIX interface\n
1205  #endif  #endif
1206  printf("  -q       quiet: do not output PCRE version number at start\n");  printf("  -q       quiet: do not output PCRE version number at start\n");
1207  printf("  -S <n>   set stack size to <n> megabytes\n");  printf("  -S <n>   set stack size to <n> megabytes\n");
1208  printf("  -s       force each pattern to be studied\n"  printf("  -s       force each pattern to be studied at basic level\n"
1209           "  -s+      force each pattern to be studied, using JIT if available\n"
1210         "  -t       time compilation and execution\n");         "  -t       time compilation and execution\n");
1211  printf("  -t <n>   time compilation and execution, repeating <n> times\n");  printf("  -t <n>   time compilation and execution, repeating <n> times\n");
1212  printf("  -tm      time execution (matching) only\n");  printf("  -tm      time execution (matching) only\n");
# Line 1223  int timeit = 0; Line 1234  int timeit = 0;
1234  int timeitm = 0;  int timeitm = 0;
1235  int showinfo = 0;  int showinfo = 0;
1236  int showstore = 0;  int showstore = 0;
1237  int force_study = 0;  int force_study = -1;
1238    int force_study_options = 0;
1239  int quiet = 0;  int quiet = 0;
1240  int size_offsets = 45;  int size_offsets = 45;
1241  int size_offsets_max;  int size_offsets_max;
# Line 1237  int all_use_dfa = 0; Line 1249  int all_use_dfa = 0;
1249  int yield = 0;  int yield = 0;
1250  int stack_size;  int stack_size;
1251    
1252    pcre_jit_stack *jit_stack = NULL;
1253    
1254    
1255  /* These vectors store, end-to-end, a list of captured substring names. Assume  /* These vectors store, end-to-end, a list of captured substring names. Assume
1256  that 1024 is plenty long enough for the few names we'll be testing. */  that 1024 is plenty long enough for the few names we'll be testing. */
1257    
# Line 1273  while (argc > 1 && argv[op][0] == '-') Line 1288  while (argc > 1 && argv[op][0] == '-')
1288    unsigned char *endptr;    unsigned char *endptr;
1289    
1290    if (strcmp(argv[op], "-m") == 0) showstore = 1;    if (strcmp(argv[op], "-m") == 0) showstore = 1;
1291    else if (strcmp(argv[op], "-s") == 0) force_study = 1;    else if (strcmp(argv[op], "-s") == 0) force_study = 0;
1292      else if (strcmp(argv[op], "-s+") == 0)
1293        {
1294        force_study = 1;
1295        force_study_options = PCRE_STUDY_JIT_COMPILE;
1296        }
1297    else if (strcmp(argv[op], "-q") == 0) quiet = 1;    else if (strcmp(argv[op], "-q") == 0) quiet = 1;
1298    else if (strcmp(argv[op], "-b") == 0) debug = 1;    else if (strcmp(argv[op], "-b") == 0) debug = 1;
1299    else if (strcmp(argv[op], "-i") == 0) showinfo = 1;    else if (strcmp(argv[op], "-i") == 0) showinfo = 1;
# Line 1338  while (argc > 1 && argv[op][0] == '-') Line 1358  while (argc > 1 && argv[op][0] == '-')
1358      printf("  %sUTF-8 support\n", rc? "" : "No ");      printf("  %sUTF-8 support\n", rc? "" : "No ");
1359      (void)pcre_config(PCRE_CONFIG_UNICODE_PROPERTIES, &rc);      (void)pcre_config(PCRE_CONFIG_UNICODE_PROPERTIES, &rc);
1360      printf("  %sUnicode properties support\n", rc? "" : "No ");      printf("  %sUnicode properties support\n", rc? "" : "No ");
1361        (void)pcre_config(PCRE_CONFIG_JIT, &rc);
1362        if (rc)
1363          printf("  Just-in-time compiler support\n");
1364        else
1365          printf("  No just-in-time compiler support\n");
1366      (void)pcre_config(PCRE_CONFIG_NEWLINE, &rc);      (void)pcre_config(PCRE_CONFIG_NEWLINE, &rc);
1367      /* Note that these values are always the ASCII values, even      /* Note that these values are always the ASCII values, even
1368      in EBCDIC environments. CR is 13 and NL is 10. */      in EBCDIC environments. CR is 13 and NL is 10. */
# Line 1538  while (!done) Line 1563  while (!done)
1563          {          {
1564          FAIL_READ:          FAIL_READ:
1565          fprintf(outfile, "Failed to read data from %s\n", p);          fprintf(outfile, "Failed to read data from %s\n", p);
1566          if (extra != NULL) new_free(extra);          if (extra != NULL) pcre_free_study(extra);
1567          if (re != NULL) new_free(re);          if (re != NULL) new_free(re);
1568          fclose(f);          fclose(f);
1569          continue;          continue;
# Line 1604  while (!done) Line 1629  while (!done)
1629    /* Look for options after final delimiter */    /* Look for options after final delimiter */
1630    
1631    options = 0;    options = 0;
   study_options = 0;  
1632    log_store = showstore;  /* default from command line */    log_store = showstore;  /* default from command line */
1633    
1634    while (*pp != 0)    while (*pp != 0)
# Line 1641  while (!done) Line 1665  while (!done)
1665  #endif  #endif
1666    
1667        case 'S':        case 'S':
1668        if (do_study == 0) do_study = 1; else        if (do_study == 0)
1669            {
1670            do_study = 1;
1671            if (*pp == '+')
1672              {
1673              study_options |= PCRE_STUDY_JIT_COMPILE;
1674              pp++;
1675              }
1676            }
1677          else
1678          {          {
1679          do_study = 0;          do_study = 0;
1680          no_force_study = 1;          no_force_study = 1;
# Line 1836  while (!done) Line 1869  while (!done)
1869      suppresses the effect of /S (used for a few test patterns where studying is      suppresses the effect of /S (used for a few test patterns where studying is
1870      never sensible). */      never sensible). */
1871    
1872      if (do_study || (force_study && !no_force_study))      if (do_study || (force_study >= 0 && !no_force_study))
1873        {        {
1874        if (timeit > 0)        if (timeit > 0)
1875          {          {
# Line 1844  while (!done) Line 1877  while (!done)
1877          clock_t time_taken;          clock_t time_taken;
1878          clock_t start_time = clock();          clock_t start_time = clock();
1879          for (i = 0; i < timeit; i++)          for (i = 0; i < timeit; i++)
1880            extra = pcre_study(re, study_options, &error);            extra = pcre_study(re, study_options | force_study_options, &error);
1881          time_taken = clock() - start_time;          time_taken = clock() - start_time;
1882          if (extra != NULL) free(extra);          if (extra != NULL) pcre_free_study(extra);
1883          fprintf(outfile, "  Study time %.4f milliseconds\n",          fprintf(outfile, "  Study time %.4f milliseconds\n",
1884            (((double)time_taken * 1000.0) / (double)timeit) /            (((double)time_taken * 1000.0) / (double)timeit) /
1885              (double)CLOCKS_PER_SEC);              (double)CLOCKS_PER_SEC);
1886          }          }
1887        extra = pcre_study(re, study_options, &error);        extra = pcre_study(re, study_options | force_study_options, &error);
1888        if (error != NULL)        if (error != NULL)
1889          fprintf(outfile, "Failed to study: %s\n", error);          fprintf(outfile, "Failed to study: %s\n", error);
1890        else if (extra != NULL)        else if (extra != NULL)
# Line 2079  while (!done) Line 2112  while (!done)
2112        when auto-callouts are involved, the output from runs with and without        when auto-callouts are involved, the output from runs with and without
2113        -s should be identical. */        -s should be identical. */
2114    
2115        if (do_study || (force_study && showinfo && !no_force_study))        if (do_study || (force_study >= 0 && showinfo && !no_force_study))
2116          {          {
2117          if (extra == NULL)          if (extra == NULL)
2118            fprintf(outfile, "Study returned NULL\n");            fprintf(outfile, "Study returned NULL\n");
# Line 2123  while (!done) Line 2156  while (!done)
2156              fprintf(outfile, "\n");              fprintf(outfile, "\n");
2157              }              }
2158            }            }
2159    
2160            /* Show this only if the JIT was set by /S, not by -s. */
2161    
2162            if ((study_options & PCRE_STUDY_JIT_COMPILE) != 0)
2163              {
2164              int jit;
2165              new_info(re, extra, PCRE_INFO_JIT, &jit);
2166              if (jit)
2167                fprintf(outfile, "JIT study was successful\n");
2168              else
2169    #ifdef SUPPORT_JIT
2170                fprintf(outfile, "JIT study was not successful\n");
2171    #else
2172                fprintf(outfile, "JIT support is not available in this version of PCRE\n");
2173    #endif
2174              }
2175          }          }
2176        }        }
2177    
# Line 2176  while (!done) Line 2225  while (!done)
2225          }          }
2226    
2227        new_free(re);        new_free(re);
2228        if (extra != NULL) new_free(extra);        if (extra != NULL) pcre_free_study(extra);
2229        if (locale_set)        if (locale_set)
2230          {          {
2231          new_free((void *)tables);          new_free((void *)tables);
# Line 2444  while (!done) Line 2493  while (!done)
2493            }            }
2494          continue;          continue;
2495    
2496            case 'J':
2497            while(isdigit(*p)) n = n * 10 + *p++ - '0';
2498            if (extra != NULL
2499                && (extra->flags & PCRE_EXTRA_EXECUTABLE_JIT) != 0
2500                && extra->executable_jit != NULL)
2501              {
2502              if (jit_stack != NULL) pcre_jit_stack_free(jit_stack);
2503              jit_stack = pcre_jit_stack_alloc(1, n * 1024);
2504              pcre_assign_jit_stack(extra, jit_callback, jit_stack);
2505              }
2506            continue;
2507    
2508          case 'L':          case 'L':
2509          getlist = 1;          getlist = 1;
2510          continue;          continue;
# Line 2654  while (!done) Line 2715  while (!done)
2715    
2716        /* If find_match_limit is set, we want to do repeated matches with        /* If find_match_limit is set, we want to do repeated matches with
2717        varying limits in order to find the minimum value for the match limit and        varying limits in order to find the minimum value for the match limit and
2718        for the recursion limit. */        for the recursion limit. The match limits are relevant only to the normal
2719          running of pcre_exec(), so disable the JIT optimization. This makes it
2720          possible to run the same set of tests with and without JIT externally
2721          requested. */
2722    
2723        if (find_match_limit)        if (find_match_limit)
2724          {          {
# Line 2663  while (!done) Line 2727  while (!done)
2727            extra = (pcre_extra *)malloc(sizeof(pcre_extra));            extra = (pcre_extra *)malloc(sizeof(pcre_extra));
2728            extra->flags = 0;            extra->flags = 0;
2729            }            }
2730            else extra->flags &= ~PCRE_EXTRA_EXECUTABLE_JIT;
2731    
2732          (void)check_match_limit(re, extra, bptr, len, start_offset,          (void)check_match_limit(re, extra, bptr, len, start_offset,
2733            options|g_notempty, use_offsets, use_size_offsets,            options|g_notempty, use_offsets, use_size_offsets,
# Line 2861  while (!done) Line 2926  while (!done)
2926                fprintf(outfile, "%2dL %s\n", i, stringlist[i]);                fprintf(outfile, "%2dL %s\n", i, stringlist[i]);
2927              if (stringlist[i] != NULL)              if (stringlist[i] != NULL)
2928                fprintf(outfile, "string list not terminated by NULL\n");                fprintf(outfile, "string list not terminated by NULL\n");
             /* free((void *)stringlist); */  
2929              pcre_free_substring_list(stringlist);              pcre_free_substring_list(stringlist);
2930              }              }
2931            }            }
# Line 3012  while (!done) Line 3076  while (!done)
3076  #endif  #endif
3077    
3078    if (re != NULL) new_free(re);    if (re != NULL) new_free(re);
3079    if (extra != NULL) new_free(extra);    if (extra != NULL) pcre_free_study(extra);
3080    if (locale_set)    if (locale_set)
3081      {      {
3082      new_free((void *)tables);      new_free((void *)tables);
3083      setlocale(LC_CTYPE, "C");      setlocale(LC_CTYPE, "C");
3084      locale_set = 0;      locale_set = 0;
3085      }      }
3086      if (jit_stack != NULL)
3087        {
3088        pcre_jit_stack_free(jit_stack);
3089        jit_stack = NULL;
3090        }
3091    }    }
3092    
3093  if (infile == stdin) fprintf(outfile, "\n");  if (infile == stdin) fprintf(outfile, "\n");

Legend:
Removed from v.658  
changed lines
  Added in v.691

webmaster@exim.org
ViewVC Help
Powered by ViewVC 1.1.12