Changeset 2010 for trunk


Ignore:
Timestamp:
Apr 9, 2012, 5:02:37 PM (7 years ago)
Author:
ksherdy
Message:

Refactor fixed lengths to sync ICXML buffer model. Report GID on start pos, scan forward support file diff QA.

Location:
trunk/symbol_table
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • trunk/symbol_table/main_template.cpp

    r2001 r2010  
    251251
    252252            fscanner.scan_to_next();
    253 
    254253        }
     254
    255255    }
    256256
  • trunk/symbol_table/src/Makefile

    r2001 r2010  
    66ARCH=$(shell getconf LONG_BIT)
    77ifeq ($(ARCH),32)
    8     AFLAGS=-march=pentium4
    9     PAPI=-DPAPI -I$(PAPI_DIR)/include -L$(PAPI_DIR)/lib -lpapi
     8        AFLAGS=-march=pentium4
     9        PAPI=-DPAPI -I$(PAPI_DIR)/include -L$(PAPI_DIR)/lib -lpapi
    1010else
    11     AFLAGS=-march=nocona -m64
    12     PAPI=-DPAPI -I$(PAPI_DIR)/include -L$(PAPI_DIR)/lib -lpapi
     11        AFLAGS=-march=nocona -m64
     12        PAPI=-DPAPI -I$(PAPI_DIR)/include -L$(PAPI_DIR)/lib -lpapi
    1313endif
    1414
    1515all: basis_bits.hpp buffer.hpp byte_pool.hpp  hash_strms.hpp  hash_table.hpp  id_group_strms.hpp  id_symbol_table.hpp  main.cpp  Makefile  marker_strms.hpp  symbol_table.hpp  transpose.hpp
    16         $(CC) -o main main.cpp $(AFLAGS) #-DHASH_TABLE_HPP_DEBUG # -DBUFFER_PROFILING -DID_SYMBOL_TABLE_TEMPLATE_HPP_DEBUG
     16        $(CC) -o main main.cpp $(AFLAGS) #-DID_SYMBOL_TABLE_TEMPLATE_HPP_DEBUG -DHASH_TABLE_HPP_DEBUG # -DBUFFER_PROFILING
    1717
    1818clean:
  • trunk/symbol_table/src/buffer.hpp

    r2001 r2010  
    99#define LOOKBACK_BLOCKS 1
    1010#define LOOKBACK_SIZE BLOCK_SIZE * LOOKBACK_BLOCKS
    11 #define SEGMENT_BLOCKS 100 // Starts and NO COPY BACK
    12 #define SEGMENT_SIZE BLOCK_SIZE * (SEGMENT_BLOCKS)                                          // (bytes) a multiple of BLOCK_SIZE
     11#define SEGMENT_BLOCKS 1000                                                     // No COPY BACK for test, starts within segment
     12#define SEGMENT_SIZE BLOCK_SIZE * (SEGMENT_BLOCKS)      // (bytes) a multiple of BLOCK_SIZE
    1313#define SEGMENT_ALLOC_SIZE (LOOKBACK_SIZE + SEGMENT_SIZE + PADDING_SIZE) / sizeof(BitBlock) // (bytes)
    1414
  • trunk/symbol_table/src/id_symbol_table.hpp

    r2001 r2010  
    77 * and mask partial block with null bytes.
    88 *
    9  * Number of length groups MUST coincide with the
     9 * Number of length groups must coincide with the
    1010 * number compiler generated length groups.
    1111 *
     
    7575        hash_table_gte_17.print_diagnostics();
    7676#endif
    77 
    7877    }
    7978
     
    8281                 BitBlock h0 [], BitBlock h1 [], uint32_t blocks, SYMBOL & symbols) {
    8382
    84         uint32_t blk_offset;
    85 
    86         for(uint32_t blk=0;blk<blocks;blk++) {
    87 
    88         blk_offset = blk * BLOCKSIZE;
    89         ///////////////////////////////////////////////////////////////////////////////
    90         // Byte Space Hash
    91         ///////////////////////////////////////////////////////////////////////////////
    92         if(bitblock::any(groups[blk].ends_1)) {
    93             do_block<SYMBOL, hash_table <identity_strategy_t<uint8_t,1>, hash_strategy_t<1>, ALLOCATOR> >
    94                     (blk_offset,
    95                     hash_table_1,
    96                     groups[blk].ends_1,
    97                      &buffer[blk_offset], 1,                                                    /* buffer, symbol length */
    98                     &buffer[blk_offset], &buffer[blk_offset], bytes2bits(1), BLOCK_SIZE, /* h0, h1, hash lgth (bits), hash block size (bits) */
    99                     symbols);
     83                uint32_t blk_offset;
     84
     85                for(uint32_t blk=0;blk<blocks;blk++) {
     86
     87                blk_offset = blk * BLOCKSIZE;
     88                ///////////////////////////////////////////////////////////////////////////////
     89                // Byte Space Hash
     90                ///////////////////////////////////////////////////////////////////////////////
     91                if(bitblock::any(groups[blk].ends_1)) {
     92                        do_block<SYMBOL, hash_table <identity_strategy_t<uint8_t,1>, hash_strategy_t<1>, ALLOCATOR> >
     93                                (blk_offset,
     94                                hash_table_1,
     95                                groups[blk].ends_1,
     96                                 &buffer[blk_offset], 1,                                                  /* buffer, symbol length */
     97                                &buffer[blk_offset], &buffer[blk_offset], bytes2bits(1), BLOCK_SIZE, /* h0, h1, hash lgth (bits), hash block size (bits) */
     98                                symbols);
    10099            }
    101         }
    102 //      if(bitblock::any(groups[blk].ends_2)) {
    103 //      do_block<SYMBOL, hash_table <identity_strategy_t<uint16_t,2>, hash_strategy_t<2>, ALLOCATOR> >(hash_table_2, groups[blk].ends_2, &buffer[blk], 2, &buffer[blk], &buffer[blk], bytes2bits(2), BLOCK_SIZE, symbols);
    104 //      }
    105 //      if(bitblock::any(groups[blk].ends_3)) {
    106 //      do_block<SYMBOL, hash_table <identity_strategy_t<uint16_t,3>, hash_strategy_t<3>, ALLOCATOR> >(hash_table_3, groups[blk].ends_3, &buffer[blk], 3, &buffer[blk], &buffer[blk], bytes2bits(3), BLOCK_SIZE, symbols);
    107 //      }
    108 //      if(bitblock::any(groups[blk].ends_4)) {
    109 //      do_block<SYMBOL, hash_table <identity_strategy_t<uint32_t,4>, hash_strategy_t<4>, ALLOCATOR> >(hash_table_4, groups[blk].ends_4, &buffer[blk], 4, &buffer[blk], &buffer[blk], bytes2bits(4), BLOCK_SIZE, symbols);
    110 //      }
    111 //      if(bitblock::any(groups[blk].ends_5)) {
    112 //      do_block<SYMBOL, hash_table <identity_strategy_t<uint32_t,5>, hash_strategy_t<5>, ALLOCATOR> >(hash_table_5, groups[blk].ends_5, &buffer[blk], 5, &buffer[blk], &buffer[blk], bytes2bits(5), BLOCK_SIZE, symbols);
    113 //      }
    114 //      if(bitblock::any(groups[blk].ends_6)) {
    115 //      do_block<SYMBOL, hash_table <identity_strategy_t<uint32_t,6>, hash_strategy_t<6>, ALLOCATOR> >(hash_table_6, groups[blk].ends_6, &buffer[blk], 6, &buffer[blk], &buffer[blk], bytes2bits(6), BLOCK_SIZE, symbols);
    116 //      }
    117 //      if(bitblock::any(groups[blk].ends_7)) {
    118 //      do_block<SYMBOL, hash_table <identity_strategy_t<uint32_t,7>, hash_strategy_t<7>, ALLOCATOR> >(hash_table_7, groups[blk].ends_7, &buffer[blk], 7, &buffer[blk], &buffer[blk], bytes2bits(7), BLOCK_SIZE, symbols);
    119 //      }
    120 //      ///////////////////////////////////////////////////////////////////////////////
    121 //      // Bit Space Hash
    122 //      ///////////////////////////////////////////////////////////////////////////////
    123 //      if(bitblock::any(groups[blk].ends_8)) {
    124 //      do_block<SYMBOL, hash_table <identity_strategy_t<uint64_t,8>, hash_strategy_d, ALLOCATOR> >(hash_table_8, groups[blk].ends_8, &buffer[blk], 8, (uint8_t *)&h0[blk], (uint8_t *)&h1[blk], 8, BLOCK_SIZE/8, symbols);
    125 //      }
    126 //      if(bitblock::any(groups[blk].ends_9)) {
    127 //      do_block<SYMBOL, hash_table<identity_strategy_t<uint64_t,9>, hash_strategy_d, ALLOCATOR> >(hash_table_9, groups[blk].ends_9, &buffer[blk], 9, (uint8_t *)&h0[blk], (uint8_t *)&h1[blk], 9, BLOCK_SIZE/8, symbols);
    128 //      }
    129 //      if(bitblock::any(groups[blk].ends_10)) {
    130 //      do_block<SYMBOL, hash_table<identity_strategy_t<uint64_t,10>, hash_strategy_d, ALLOCATOR> >(hash_table_10, groups[blk].ends_10, &buffer[blk], 10, (uint8_t *)&h0[blk], (uint8_t *)&h1[blk], 10, BLOCK_SIZE/8, symbols);
    131 //      }
    132 //      if(bitblock::any(groups[blk].ends_11)) {
    133 //      do_block<SYMBOL, hash_table<identity_strategy_t<uint64_t,11>, hash_strategy_d, ALLOCATOR> >(hash_table_11, groups[blk].ends_11, &buffer[blk], 11, (uint8_t *)&h0[blk], (uint8_t *)&h1[blk], 11, BLOCK_SIZE/8, symbols);
    134 //      }
    135 //      if(bitblock::any(groups[blk].ends_12)) {
    136 //      do_block<SYMBOL, hash_table<identity_strategy_t<uint64_t,12>, hash_strategy_d, ALLOCATOR> >(hash_table_12, groups[blk].ends_12, &buffer[blk], 12, (uint8_t *)&h0[blk], (uint8_t *)&h1[blk], 12, BLOCK_SIZE/8, symbols);
    137 //      }
    138 //      if(bitblock::any(groups[blk].ends_13)) {
    139 //      do_block<SYMBOL, hash_table<identity_strategy_t<uint64_t,13>, hash_strategy_d, ALLOCATOR> >(hash_table_13, groups[blk].ends_13, &buffer[blk], 13, (uint8_t *)&h0[blk], (uint8_t *)&h1[blk], 13, BLOCK_SIZE/8, symbols);
    140 //      }
    141 //      if(bitblock::any(groups[blk].ends_14)) {
    142 //      do_block<SYMBOL, hash_table<identity_strategy_t<uint64_t,14>, hash_strategy_d, ALLOCATOR> >(hash_table_14, groups[blk].ends_14, &buffer[blk], 14, (uint8_t *)&h0[blk], (uint8_t *)&h1[blk], 14, BLOCK_SIZE/8, symbols);
    143 //      }
    144 //      if(bitblock::any(groups[blk].ends_15)) {
    145 //      do_block<SYMBOL, hash_table<identity_strategy_t<uint64_t,15>, hash_strategy_d, ALLOCATOR> >(hash_table_15, groups[blk].ends_15, &buffer[blk], 15, (uint8_t *)&h0[blk], (uint8_t *)&h1[blk], 15, BLOCK_SIZE/8, symbols);
    146 //      }
    147 //      if(bitblock::any(groups[blk].ends_16)) {
    148 //      do_block<SYMBOL, hash_table<identity_strategy_t<BitBlock,16>, hash_strategy_d, ALLOCATOR> >(hash_table_16, groups[blk].ends_16, &buffer[blk], 16, (uint8_t *)&h0[blk], (uint8_t *)&h1[blk], 16, BLOCK_SIZE/8, symbols);
    149 //      }
     100
     101        if(bitblock::any(groups[blk].ends_2)) {
     102            do_block<SYMBOL, hash_table <identity_strategy_t<uint16_t,2>, hash_strategy_t<2>, ALLOCATOR> >
     103                                (blk_offset,
     104                                 hash_table_2,
     105                                 groups[blk].ends_2,
     106                                 &buffer[blk_offset], 2,
     107                                 &buffer[blk_offset], &buffer[blk_offset], bytes2bits(2), BLOCK_SIZE,
     108                                 symbols);
     109        }
     110
     111        if(bitblock::any(groups[blk].ends_3)) {
     112            do_block<SYMBOL, hash_table <identity_strategy_t<uint16_t,3>, hash_strategy_t<3>, ALLOCATOR> >
     113                                (blk_offset,
     114                                 hash_table_3,
     115                                 groups[blk].ends_3,
     116                                 &buffer[blk_offset], 3,
     117                                 &buffer[blk_offset], &buffer[blk_offset], bytes2bits(3), BLOCK_SIZE,
     118                                 symbols);
     119        }
     120        if(bitblock::any(groups[blk].ends_4)) {
     121            do_block<SYMBOL, hash_table <identity_strategy_t<uint32_t,4>, hash_strategy_t<4>, ALLOCATOR> >
     122                                (blk_offset,
     123                                 hash_table_4,
     124                                 groups[blk].ends_4,
     125                                 &buffer[blk_offset], 4,
     126                                 &buffer[blk_offset], &buffer[blk_offset], bytes2bits(4), BLOCK_SIZE,
     127                                 symbols);
     128        }
     129
     130        if(bitblock::any(groups[blk].ends_5)) {
     131            do_block<SYMBOL, hash_table <identity_strategy_t<uint32_t,5>, hash_strategy_t<5>, ALLOCATOR> >
     132                                (blk_offset,
     133                                 hash_table_5,
     134                                 groups[blk].ends_5,
     135                                 &buffer[blk_offset], 5,
     136                                 &buffer[blk_offset], &buffer[blk_offset], bytes2bits(5), BLOCK_SIZE,
     137                                 symbols);
     138        }
     139        if(bitblock::any(groups[blk].ends_6)) {
     140            do_block<SYMBOL, hash_table <identity_strategy_t<uint32_t,6>, hash_strategy_t<6>, ALLOCATOR> >
     141                                (blk_offset,
     142                                 hash_table_6,
     143                                 groups[blk].ends_6,
     144                                 &buffer[blk_offset], 6,
     145                                 &buffer[blk_offset], &buffer[blk_offset], bytes2bits(6), BLOCK_SIZE,
     146                                 symbols);
     147        }
     148        if(bitblock::any(groups[blk].ends_7)) {
     149            do_block<SYMBOL, hash_table <identity_strategy_t<uint32_t,7>, hash_strategy_t<7>, ALLOCATOR> >
     150                                (blk_offset,
     151                                 hash_table_7,
     152                                 groups[blk].ends_7,
     153                                 &buffer[blk_offset], 7,
     154                                 &buffer[blk_offset], &buffer[blk_offset], bytes2bits(7), BLOCK_SIZE,
     155                                 symbols);
     156        }
     157
     158        ///////////////////////////////////////////////////////////////////////////////
     159        // Bit Space Hash
     160        ///////////////////////////////////////////////////////////////////////////////
     161        if(bitblock::any(groups[blk].ends_8)) {
     162            do_block<SYMBOL, hash_table <identity_strategy_t<uint64_t,8>, hash_strategy_d, ALLOCATOR> >
     163                                (blk_offset,
     164                                 hash_table_8,
     165                                 groups[blk].ends_8, &buffer[blk_offset], 8,
     166                                 (uint8_t *)&h0[blk], (uint8_t *)&h1[blk], 8, BLOCK_SIZE/8,
     167                                 symbols);
     168        }
     169                if(bitblock::any(groups[blk].ends_9)) {
     170                        do_block<SYMBOL, hash_table<identity_strategy_t<uint64_t,9>, hash_strategy_d, ALLOCATOR> >
     171                                (blk_offset,
     172                                hash_table_9,
     173                                groups[blk].ends_9, &buffer[blk_offset], 9,
     174                                (uint8_t *)&h0[blk], (uint8_t *)&h1[blk], 9, BLOCK_SIZE/8,
     175                                symbols);
     176                }
     177
     178                if(bitblock::any(groups[blk].ends_10)) {
     179                        do_block<SYMBOL, hash_table<identity_strategy_t<uint64_t,10>, hash_strategy_d, ALLOCATOR> >
     180                                (blk_offset,
     181                                hash_table_10,
     182                                groups[blk].ends_10, &buffer[blk_offset], 10,
     183                                (uint8_t *)&h0[blk], (uint8_t *)&h1[blk], 10, BLOCK_SIZE/8,
     184                                symbols);
     185                }
     186                if(bitblock::any(groups[blk].ends_11)) {
     187                        do_block<SYMBOL, hash_table<identity_strategy_t<uint64_t,11>, hash_strategy_d, ALLOCATOR> >
     188                                        (blk_offset,
     189                                        hash_table_11,
     190                                        groups[blk].ends_11, &buffer[blk_offset], 11,
     191                                        (uint8_t *)&h0[blk], (uint8_t *)&h1[blk], 11, BLOCK_SIZE/8,
     192                                        symbols);
     193                }
     194                if(bitblock::any(groups[blk].ends_12)) {
     195                        do_block<SYMBOL, hash_table<identity_strategy_t<uint64_t,12>, hash_strategy_d, ALLOCATOR> >
     196                                        (blk_offset,
     197                                        hash_table_12,
     198                                        groups[blk].ends_12, &buffer[blk_offset], 12,
     199                                        (uint8_t *)&h0[blk], (uint8_t *)&h1[blk], 12, BLOCK_SIZE/8,
     200                                        symbols);
     201                }
     202                if(bitblock::any(groups[blk].ends_13)) {
     203                        do_block<SYMBOL, hash_table<identity_strategy_t<uint64_t,13>, hash_strategy_d, ALLOCATOR> >
     204                                        (blk_offset,
     205                                        hash_table_13,
     206                                        groups[blk].ends_13, &buffer[blk_offset], 13,
     207                                        (uint8_t *)&h0[blk], (uint8_t *)&h1[blk], 13, BLOCK_SIZE/8,
     208                                        symbols);
     209                }
     210                if(bitblock::any(groups[blk].ends_14)) {
     211                        do_block<SYMBOL, hash_table<identity_strategy_t<uint64_t,14>, hash_strategy_d, ALLOCATOR> >
     212                                        (blk_offset,
     213                                        hash_table_14,
     214                                        groups[blk].ends_14, &buffer[blk_offset], 14,
     215                                        (uint8_t *)&h0[blk], (uint8_t *)&h1[blk], 14, BLOCK_SIZE/8,
     216                                        symbols);
     217                }
     218                if(bitblock::any(groups[blk].ends_15)) {
     219                        do_block<SYMBOL, hash_table<identity_strategy_t<uint64_t,15>, hash_strategy_d, ALLOCATOR> >
     220                                        (blk_offset,
     221                                        hash_table_15,
     222                                        groups[blk].ends_15, &buffer[blk_offset], 15,
     223                                        (uint8_t *)&h0[blk], (uint8_t *)&h1[blk], 15, BLOCK_SIZE/8,
     224                                        symbols);
     225                }
     226                if(bitblock::any(groups[blk].ends_16)) {
     227                        do_block<SYMBOL, hash_table<identity_strategy_t<BitBlock,16>, hash_strategy_d, ALLOCATOR> >
     228                                        (blk_offset,
     229                                        hash_table_16,
     230                                        groups[blk].ends_16, &buffer[blk_offset], 16,
     231                                        (uint8_t *)&h0[blk], (uint8_t *)&h1[blk], 16, BLOCK_SIZE/8,
     232                                        symbols);
     233                }
     234
     235                }
     236
    150237//      if(bitblock::any(ends_gte_17[blk])) {
    151238//      do_block<SYMBOL, hash_table<identity_strategy_d, hash_strategy_d, ALLOCATOR> >(hash_table_gte_17, &starts[blk], &ends_gte_17[blk], &buffer[blk], (uint8_t *)&h0[blk], (uint8_t *)&h1[blk], BLOCK_SIZE/8, symbols);
     
    201288    spos = (epos - lgth);
    202289
    203     if(!fscanner.is_done() && (spos < 0)) { // block boundary case
    204 
     290        if(!fscanner.is_done() && (spos < 0) ) { // block boundary case
     291
     292        ////////////////////////////////////////////////////////////////////
     293        // Start - Review boundary logic
     294        ////////////////////////////////////////////////////////////////////
    205295        uint8_t * lb_buffer = buffer - ((lgth / BLOCK_SIZE) + 1)*BLOCK_SIZE;
    206         int32_t lb_spos = BLOCK_SIZE - ((-1*spos) & (BLOCK_SIZE-1));
     296        int32_t lb_spos = (BLOCK_SIZE - (-1*spos)) & (BLOCK_SIZE-1);
    207297
    208298        uint8_t * lb_h0 = h0 - ((lgth / BLOCK_SIZE) + 1)*h_block_size;
    209299        uint8_t * lb_h1 = h1 - ((lgth / BLOCK_SIZE) + 1)*h_block_size;
    210300
    211         gid = h_table.lookup_or_insert(lb_buffer, lb_spos, lgth,
    212                                  lb_h0, lb_h1, h_lgth);
     301        gid = h_table.lookup_or_insert(lb_buffer, lb_spos, lgth, lb_h0, lb_h1, h_lgth);
    213302
    214303        symbols.gids[blk_offset + spos] = gid;
    215 
    216         epos = fscanner.scan_to_next();
    217         spos = (epos - lgth);
    218 
    219     }
    220 
    221     while(!fscanner.is_done() && (spos >= 0)) {
    222 
    223         gid = h_table.lookup_or_insert(buffer, spos, lgth, h0, h1, h_lgth);
    224         //symbols.gids[epos] = gid;
    225         symbols.gids[blk_offset + spos] = gid;
    226 
    227 #ifdef ID_SYMBOL_TABLE_TEMPLATE_HPP_DEBUG
    228         print_symbol_debug(buffer, spos, epos, lgth);
    229 #endif
     304        ////////////////////////////////////////////////////////////////////
     305        // End
     306        ////////////////////////////////////////////////////////////////////
     307
     308        #ifdef ID_SYMBOL_TABLE_TEMPLATE_HPP_DEBUG
     309                        print_symbol_debug(lb_buffer, lb_spos, epos, lgth);
     310        #endif
     311
    230312        fscanner.scan_to_next();
    231313        epos = fscanner.get_pos();
    232314        spos = (epos - lgth);
     315
     316    }
     317
     318        while(!fscanner.is_done()) {
     319
     320                gid = h_table.lookup_or_insert(buffer, spos, lgth, h0, h1, h_lgth);
     321                symbols.gids[blk_offset + spos] = gid;
     322
     323        #ifdef ID_SYMBOL_TABLE_TEMPLATE_HPP_DEBUG
     324                print_symbol_debug(buffer, spos, epos, lgth);
     325        #endif
     326
     327                fscanner.scan_to_next();
     328                epos = fscanner.get_pos();
     329                spos = (epos - lgth);
    233330    }
    234331
  • trunk/symbol_table/symbol_table.pro.user

    r1960 r2010  
    22<qtcreator>
    33 <data>
    4   <variable>ProjectExplorer.Project.ActiveTarget</variable>
     4  <variable>RunConfiguration0-BaseEnvironmentBase</variable>
     5  <value type="int">2</value>
     6 </data>
     7 <data>
     8  <variable>RunConfiguration0-CommandLineArguments</variable>
     9  <valuelist type="QVariantList"/>
     10 </data>
     11 <data>
     12  <variable>RunConfiguration0-ProFile</variable>
     13  <value type="QString">symbol_table.pro</value>
     14 </data>
     15 <data>
     16  <variable>RunConfiguration0-RunConfiguration.name</variable>
     17  <value type="QString">symbol_table</value>
     18 </data>
     19 <data>
     20  <variable>RunConfiguration0-UseDyldImageSuffix</variable>
     21  <value type="bool">false</value>
     22 </data>
     23 <data>
     24  <variable>RunConfiguration0-UseTerminal</variable>
     25  <value type="bool">false</value>
     26 </data>
     27 <data>
     28  <variable>RunConfiguration0-UserEnvironmentChanges</variable>
     29  <valuelist type="QVariantList"/>
     30 </data>
     31 <data>
     32  <variable>RunConfiguration0-UserSetName</variable>
     33  <value type="bool">false</value>
     34 </data>
     35 <data>
     36  <variable>RunConfiguration0-UserSetWorkingDirectory</variable>
     37  <value type="bool">false</value>
     38 </data>
     39 <data>
     40  <variable>RunConfiguration0-UserWorkingDirectory</variable>
     41  <value type="QString"></value>
     42 </data>
     43 <data>
     44  <variable>RunConfiguration0-type</variable>
     45  <value type="QString">Qt4ProjectManager.Qt4RunConfiguration</value>
     46 </data>
     47 <data>
     48  <variable>activeRunConfiguration</variable>
    549  <value type="int">0</value>
    650 </data>
    751 <data>
    8   <variable>ProjectExplorer.Project.EditorSettings</variable>
     52  <variable>activebuildconfiguration</variable>
     53  <value type="QString">Debug</value>
     54 </data>
     55 <data>
     56  <variable>buildConfiguration-Debug</variable>
    957  <valuemap type="QVariantMap">
    10    <value key="EditorConfiguration.Codec" type="QByteArray">ISO-8859-5</value>
     58   <value key="ProjectExplorer.BuildConfiguration.DisplayName" type="QString">Debug</value>
     59   <value key="QtVersionId" type="int">0</value>
     60   <value key="ToolChain" type="int">0</value>
     61   <value key="addQDumper" type=""></value>
     62   <value key="buildConfiguration" type="int">2</value>
    1163  </valuemap>
    1264 </data>
    1365 <data>
    14   <variable>ProjectExplorer.Project.Target.0</variable>
     66  <variable>buildConfiguration-Release</variable>
    1567  <valuemap type="QVariantMap">
    16    <value key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName" type="QString">Desktop</value>
    17    <value key="ProjectExplorer.ProjectConfiguration.DisplayName" type="QString"></value>
    18    <value key="ProjectExplorer.ProjectConfiguration.Id" type="QString">Qt4ProjectManager.Target.DesktopTarget</value>
    19    <value key="ProjectExplorer.Target.ActiveBuildConfiguration" type="int">0</value>
    20    <value key="ProjectExplorer.Target.ActiveDeployConfiguration" type="int">0</value>
    21    <value key="ProjectExplorer.Target.ActiveRunConfiguration" type="int">0</value>
    22    <valuemap key="ProjectExplorer.Target.BuildConfiguration.0" type="QVariantMap">
    23     <valuemap key="ProjectExplorer.BuildConfiguration.BuildStepList.0" type="QVariantMap">
    24      <valuemap key="ProjectExplorer.BuildStepList.Step.0" type="QVariantMap">
    25       <value key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName" type="QString">Make</value>
    26       <value key="ProjectExplorer.ProjectConfiguration.DisplayName" type="QString"></value>
    27       <value key="ProjectExplorer.ProjectConfiguration.Id" type="QString">Qt4ProjectManager.MakeStep</value>
    28       <value key="Qt4ProjectManager.MakeStep.Clean" type="bool">false</value>
    29       <valuelist key="Qt4ProjectManager.MakeStep.MakeArguments" type="QVariantList"/>
    30       <value key="Qt4ProjectManager.MakeStep.MakeCommand" type="QString"></value>
    31      </valuemap>
    32      <value key="ProjectExplorer.BuildStepList.StepsCount" type="int">1</value>
    33      <value key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName" type="QString">Build</value>
    34      <value key="ProjectExplorer.ProjectConfiguration.DisplayName" type="QString"></value>
    35      <value key="ProjectExplorer.ProjectConfiguration.Id" type="QString">ProjectExplorer.BuildSteps.Build</value>
    36     </valuemap>
    37     <valuemap key="ProjectExplorer.BuildConfiguration.BuildStepList.1" type="QVariantMap">
    38      <valuemap key="ProjectExplorer.BuildStepList.Step.0" type="QVariantMap">
    39       <value key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName" type="QString">Make</value>
    40       <value key="ProjectExplorer.ProjectConfiguration.DisplayName" type="QString"></value>
    41       <value key="ProjectExplorer.ProjectConfiguration.Id" type="QString">Qt4ProjectManager.MakeStep</value>
    42       <value key="Qt4ProjectManager.MakeStep.Clean" type="bool">true</value>
    43       <valuelist key="Qt4ProjectManager.MakeStep.MakeArguments" type="QVariantList">
    44        <value type="QString">clean</value>
    45       </valuelist>
    46       <value key="Qt4ProjectManager.MakeStep.MakeCommand" type="QString"></value>
    47      </valuemap>
    48      <value key="ProjectExplorer.BuildStepList.StepsCount" type="int">1</value>
    49      <value key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName" type="QString">Clean</value>
    50      <value key="ProjectExplorer.ProjectConfiguration.DisplayName" type="QString"></value>
    51      <value key="ProjectExplorer.ProjectConfiguration.Id" type="QString">ProjectExplorer.BuildSteps.Clean</value>
    52     </valuemap>
    53     <value key="ProjectExplorer.BuildConfiguration.BuildStepListCount" type="int">2</value>
    54     <value key="ProjectExplorer.BuildConfiguration.ClearSystemEnvironment" type="bool">false</value>
    55     <valuelist key="ProjectExplorer.BuildConfiguration.UserEnvironmentChanges" type="QVariantList"/>
    56     <value key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName" type="QString">Debug</value>
    57     <value key="ProjectExplorer.ProjectConfiguration.DisplayName" type="QString"></value>
    58     <value key="ProjectExplorer.ProjectConfiguration.Id" type="QString">Qt4ProjectManager.Qt4BuildConfiguration</value>
    59     <value key="Qt4ProjectManager.Qt4BuildConfiguration.BuildConfiguration" type="int">2</value>
    60     <value key="Qt4ProjectManager.Qt4BuildConfiguration.BuildDirectory" type="QString">/home/ksherdy/Development/qt/symbol_table-build-desktop</value>
    61     <value key="Qt4ProjectManager.Qt4BuildConfiguration.QtVersionId" type="int">2</value>
    62     <value key="Qt4ProjectManager.Qt4BuildConfiguration.ToolChain" type="int">0</value>
    63     <value key="Qt4ProjectManager.Qt4BuildConfiguration.UseShadowBuild" type="bool">false</value>
    64    </valuemap>
    65    <valuemap key="ProjectExplorer.Target.BuildConfiguration.1" type="QVariantMap">
    66     <valuemap key="ProjectExplorer.BuildConfiguration.BuildStepList.0" type="QVariantMap">
    67      <valuemap key="ProjectExplorer.BuildStepList.Step.0" type="QVariantMap">
    68       <value key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName" type="QString">qmake</value>
    69       <value key="ProjectExplorer.ProjectConfiguration.DisplayName" type="QString"></value>
    70       <value key="ProjectExplorer.ProjectConfiguration.Id" type="QString">QtProjectManager.QMakeBuildStep</value>
    71       <valuelist key="QtProjectManager.QMakeBuildStep.QMakeArguments" type="QVariantList"/>
    72       <value key="QtProjectManager.QMakeBuildStep.QMakeForced" type="bool">false</value>
    73      </valuemap>
    74      <valuemap key="ProjectExplorer.BuildStepList.Step.1" type="QVariantMap">
    75       <value key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName" type="QString">Make</value>
    76       <value key="ProjectExplorer.ProjectConfiguration.DisplayName" type="QString"></value>
    77       <value key="ProjectExplorer.ProjectConfiguration.Id" type="QString">Qt4ProjectManager.MakeStep</value>
    78       <value key="Qt4ProjectManager.MakeStep.Clean" type="bool">false</value>
    79       <valuelist key="Qt4ProjectManager.MakeStep.MakeArguments" type="QVariantList"/>
    80       <value key="Qt4ProjectManager.MakeStep.MakeCommand" type="QString"></value>
    81      </valuemap>
    82      <value key="ProjectExplorer.BuildStepList.StepsCount" type="int">2</value>
    83      <value key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName" type="QString">Build</value>
    84      <value key="ProjectExplorer.ProjectConfiguration.DisplayName" type="QString"></value>
    85      <value key="ProjectExplorer.ProjectConfiguration.Id" type="QString">ProjectExplorer.BuildSteps.Build</value>
    86     </valuemap>
    87     <valuemap key="ProjectExplorer.BuildConfiguration.BuildStepList.1" type="QVariantMap">
    88      <valuemap key="ProjectExplorer.BuildStepList.Step.0" type="QVariantMap">
    89       <value key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName" type="QString">Make</value>
    90       <value key="ProjectExplorer.ProjectConfiguration.DisplayName" type="QString"></value>
    91       <value key="ProjectExplorer.ProjectConfiguration.Id" type="QString">Qt4ProjectManager.MakeStep</value>
    92       <value key="Qt4ProjectManager.MakeStep.Clean" type="bool">true</value>
    93       <valuelist key="Qt4ProjectManager.MakeStep.MakeArguments" type="QVariantList">
    94        <value type="QString">clean</value>
    95       </valuelist>
    96       <value key="Qt4ProjectManager.MakeStep.MakeCommand" type="QString"></value>
    97      </valuemap>
    98      <value key="ProjectExplorer.BuildStepList.StepsCount" type="int">1</value>
    99      <value key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName" type="QString">Clean</value>
    100      <value key="ProjectExplorer.ProjectConfiguration.DisplayName" type="QString"></value>
    101      <value key="ProjectExplorer.ProjectConfiguration.Id" type="QString">ProjectExplorer.BuildSteps.Clean</value>
    102     </valuemap>
    103     <value key="ProjectExplorer.BuildConfiguration.BuildStepListCount" type="int">2</value>
    104     <value key="ProjectExplorer.BuildConfiguration.ClearSystemEnvironment" type="bool">false</value>
    105     <valuelist key="ProjectExplorer.BuildConfiguration.UserEnvironmentChanges" type="QVariantList"/>
    106     <value key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName" type="QString">Release</value>
    107     <value key="ProjectExplorer.ProjectConfiguration.DisplayName" type="QString"></value>
    108     <value key="ProjectExplorer.ProjectConfiguration.Id" type="QString">Qt4ProjectManager.Qt4BuildConfiguration</value>
    109     <value key="Qt4ProjectManager.Qt4BuildConfiguration.BuildConfiguration" type="int">0</value>
    110     <value key="Qt4ProjectManager.Qt4BuildConfiguration.BuildDirectory" type="QString">/home/ksherdy/Development/qt/symbol_table-build-desktop</value>
    111     <value key="Qt4ProjectManager.Qt4BuildConfiguration.QtVersionId" type="int">2</value>
    112     <value key="Qt4ProjectManager.Qt4BuildConfiguration.ToolChain" type="int">0</value>
    113     <value key="Qt4ProjectManager.Qt4BuildConfiguration.UseShadowBuild" type="bool">true</value>
    114    </valuemap>
    115    <value key="ProjectExplorer.Target.BuildConfigurationCount" type="int">2</value>
    116    <valuemap key="ProjectExplorer.Target.DeployConfiguration.0" type="QVariantMap">
    117     <valuemap key="ProjectExplorer.BuildConfiguration.BuildStepList.0" type="QVariantMap">
    118      <value key="ProjectExplorer.BuildStepList.StepsCount" type="int">0</value>
    119      <value key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName" type="QString">Deploy</value>
    120      <value key="ProjectExplorer.ProjectConfiguration.DisplayName" type="QString"></value>
    121      <value key="ProjectExplorer.ProjectConfiguration.Id" type="QString">ProjectExplorer.BuildSteps.Deploy</value>
    122     </valuemap>
    123     <value key="ProjectExplorer.BuildConfiguration.BuildStepListCount" type="int">1</value>
    124     <value key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName" type="QString">No deployment</value>
    125     <value key="ProjectExplorer.ProjectConfiguration.DisplayName" type="QString"></value>
    126     <value key="ProjectExplorer.ProjectConfiguration.Id" type="QString">ProjectExplorer.DefaultDeployConfiguration</value>
    127    </valuemap>
    128    <value key="ProjectExplorer.Target.DeployConfigurationCount" type="int">1</value>
    129    <valuemap key="ProjectExplorer.Target.RunConfiguration.0" type="QVariantMap">
    130     <valuelist key="ProjectExplorer.CustomExecutableRunConfiguration.Arguments" type="QVariantList">
    131      <value type="QString">test/uniform/</value>
    132     </valuelist>
    133     <value key="ProjectExplorer.CustomExecutableRunConfiguration.BaseEnvironmentBase" type="int">2</value>
    134     <value key="ProjectExplorer.CustomExecutableRunConfiguration.Executable" type="QString">main</value>
    135     <value key="ProjectExplorer.CustomExecutableRunConfiguration.UseTerminal" type="bool">false</value>
    136     <valuelist key="ProjectExplorer.CustomExecutableRunConfiguration.UserEnvironmentChanges" type="QVariantList"/>
    137     <value key="ProjectExplorer.CustomExecutableRunConfiguration.WorkingDirectory" type="QString">$BUILDDIR</value>
    138     <value key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName" type="QString">Run main</value>
    139     <value key="ProjectExplorer.ProjectConfiguration.DisplayName" type="QString">Custom Executable2</value>
    140     <value key="ProjectExplorer.ProjectConfiguration.Id" type="QString">ProjectExplorer.CustomExecutableRunConfiguration</value>
    141     <value key="RunConfiguration.QmlDebugServerPort" type="uint">3768</value>
    142     <value key="RunConfiguration.UseCppDebugger" type="bool">true</value>
    143     <value key="RunConfiguration.UseQmlDebugger" type="bool">false</value>
    144    </valuemap>
    145    <value key="ProjectExplorer.Target.RunConfigurationCount" type="int">1</value>
     68   <value key="ProjectExplorer.BuildConfiguration.DisplayName" type="QString">Release</value>
     69   <value key="QtVersionId" type="int">0</value>
     70   <value key="addQDumper" type=""></value>
     71   <value key="buildConfiguration" type="int">0</value>
    14672  </valuemap>
    14773 </data>
    14874 <data>
    149   <variable>ProjectExplorer.Project.TargetCount</variable>
    150   <value type="int">1</value>
     75  <variable>buildconfiguration-Debug-buildstep0</variable>
     76  <valuemap type="QVariantMap">
     77   <value key="ProjectExplorer.BuildConfiguration.DisplayName" type="QString">Debug</value>
     78  </valuemap>
    15179 </data>
    15280 <data>
    153   <variable>ProjectExplorer.Project.Updater.EnvironmentId</variable>
    154   <value type="QString">{3369d8a0-08d7-4ba0-929a-410d90a79a51}</value>
     81  <variable>buildconfiguration-Debug-buildstep1</variable>
     82  <valuemap type="QVariantMap">
     83   <value key="ProjectExplorer.BuildConfiguration.DisplayName" type="QString">Debug</value>
     84  </valuemap>
    15585 </data>
    15686 <data>
    157   <variable>ProjectExplorer.Project.Updater.FileVersion</variable>
    158   <value type="int">8</value>
     87  <variable>buildconfiguration-Debug-cleanstep0</variable>
     88  <valuemap type="QVariantMap">
     89   <value key="ProjectExplorer.BuildConfiguration.DisplayName" type="QString">Debug</value>
     90   <value key="cleanConfig" type="bool">true</value>
     91   <valuelist key="makeargs" type="QVariantList">
     92    <value type="QString">clean</value>
     93   </valuelist>
     94  </valuemap>
     95 </data>
     96 <data>
     97  <variable>buildconfiguration-Release-buildstep0</variable>
     98  <valuemap type="QVariantMap">
     99   <value key="ProjectExplorer.BuildConfiguration.DisplayName" type="QString">Release</value>
     100  </valuemap>
     101 </data>
     102 <data>
     103  <variable>buildconfiguration-Release-buildstep1</variable>
     104  <valuemap type="QVariantMap">
     105   <value key="ProjectExplorer.BuildConfiguration.DisplayName" type="QString">Release</value>
     106  </valuemap>
     107 </data>
     108 <data>
     109  <variable>buildconfiguration-Release-cleanstep0</variable>
     110  <valuemap type="QVariantMap">
     111   <value key="ProjectExplorer.BuildConfiguration.DisplayName" type="QString">Release</value>
     112  </valuemap>
     113 </data>
     114 <data>
     115  <variable>buildconfigurations</variable>
     116  <valuelist type="QVariantList">
     117   <value type="QString">Debug</value>
     118   <value type="QString">Release</value>
     119  </valuelist>
     120 </data>
     121 <data>
     122  <variable>buildstep0</variable>
     123  <valuemap type="QVariantMap">
     124   <value key="ProjectExplorer.BuildConfiguration.DisplayName" type="QString"></value>
     125   <value key="mkspec" type="QString"></value>
     126  </valuemap>
     127 </data>
     128 <data>
     129  <variable>buildstep1</variable>
     130  <valuemap type="QVariantMap">
     131   <value key="ProjectExplorer.BuildConfiguration.DisplayName" type="QString"></value>
     132  </valuemap>
     133 </data>
     134 <data>
     135  <variable>buildsteps</variable>
     136  <valuelist type="QVariantList">
     137   <value type="QString">trolltech.qt4projectmanager.qmake</value>
     138   <value type="QString">trolltech.qt4projectmanager.make</value>
     139  </valuelist>
     140 </data>
     141 <data>
     142  <variable>cleanstep0</variable>
     143  <valuemap type="QVariantMap">
     144   <value key="ProjectExplorer.BuildConfiguration.DisplayName" type="QString"></value>
     145   <value key="clean" type="bool">true</value>
     146  </valuemap>
     147 </data>
     148 <data>
     149  <variable>cleansteps</variable>
     150  <valuelist type="QVariantList">
     151   <value type="QString">trolltech.qt4projectmanager.make</value>
     152  </valuelist>
     153 </data>
     154 <data>
     155  <variable>defaultFileEncoding</variable>
     156  <value type="QByteArray">System</value>
     157 </data>
     158 <data>
     159  <variable>project</variable>
     160  <valuemap type="QVariantMap"/>
    159161 </data>
    160162</qtcreator>
Note: See TracChangeset for help on using the changeset viewer.