19
19
#include "split-index.h"
20
20
#include "utf8.h"
21
21
22
+ #ifndef NO_PTHREADS
23
+ #include <pthread.h>
24
+ #endif
25
+
22
26
/* Mask for the name length in ce_flags in the on-disk index */
23
27
24
28
#define CE_NAMEMASK (0x0fff)
@@ -1390,6 +1394,34 @@ static int verify_hdr(struct cache_header *hdr, unsigned long size)
1390
1394
return 0 ;
1391
1395
}
1392
1396
1397
+ #ifndef NO_PTHREADS
1398
+ /*
1399
+ * Require index file to be larger than this threshold before
1400
+ * we bother using a thread to verify the SHA.
1401
+ * This value was arbitrarily chosen.
1402
+ */
1403
+ #define VERIFY_HDR_THRESHOLD 10*1024*1024
1404
+
1405
+ struct verify_hdr_thread_data
1406
+ {
1407
+ pthread_t thread_id ;
1408
+ struct cache_header * hdr ;
1409
+ size_t size ;
1410
+ int result ;
1411
+ };
1412
+
1413
+ /*
1414
+ * A thread proc to run the verify_hdr() computation
1415
+ * in a background thread.
1416
+ */
1417
+ static void * verify_hdr_thread (void * _data )
1418
+ {
1419
+ struct verify_hdr_thread_data * p = _data ;
1420
+ p -> result = verify_hdr (p -> hdr , (unsigned long )p -> size );
1421
+ return NULL ;
1422
+ }
1423
+ #endif
1424
+
1393
1425
static int read_index_extension (struct index_state * istate ,
1394
1426
const char * ext , void * data , unsigned long sz )
1395
1427
{
@@ -1591,6 +1623,9 @@ int do_read_index(struct index_state *istate, const char *path, int must_exist)
1591
1623
void * mmap ;
1592
1624
size_t mmap_size ;
1593
1625
struct strbuf previous_name_buf = STRBUF_INIT , * previous_name ;
1626
+ #ifndef NO_PTHREADS
1627
+ struct verify_hdr_thread_data verify_hdr_thread_data ;
1628
+ #endif
1594
1629
1595
1630
if (istate -> initialized )
1596
1631
return istate -> cache_nr ;
@@ -1617,8 +1652,23 @@ int do_read_index(struct index_state *istate, const char *path, int must_exist)
1617
1652
close (fd );
1618
1653
1619
1654
hdr = mmap ;
1655
+ #ifdef NO_PTHREADS
1620
1656
if (verify_hdr (hdr , mmap_size ) < 0 )
1621
1657
goto unmap ;
1658
+ #else
1659
+ if (mmap_size < VERIFY_HDR_THRESHOLD ) {
1660
+ if (verify_hdr (hdr , mmap_size ) < 0 )
1661
+ goto unmap ;
1662
+ } else {
1663
+ verify_hdr_thread_data .hdr = hdr ;
1664
+ verify_hdr_thread_data .size = mmap_size ;
1665
+ verify_hdr_thread_data .result = -1 ;
1666
+ if (pthread_create (
1667
+ & verify_hdr_thread_data .thread_id , NULL ,
1668
+ verify_hdr_thread , & verify_hdr_thread_data ))
1669
+ die_errno ("unable to start verify_hdr_thread" );
1670
+ }
1671
+ #endif
1622
1672
1623
1673
hashcpy (istate -> sha1 , (const unsigned char * )hdr + mmap_size - 20 );
1624
1674
istate -> version = ntohl (hdr -> hdr_version );
@@ -1666,6 +1716,16 @@ int do_read_index(struct index_state *istate, const char *path, int must_exist)
1666
1716
src_offset += 8 ;
1667
1717
src_offset += extsize ;
1668
1718
}
1719
+
1720
+ #ifndef NO_PTHREADS
1721
+ if (mmap_size >= VERIFY_HDR_THRESHOLD ) {
1722
+ if (pthread_join (verify_hdr_thread_data .thread_id , NULL ))
1723
+ die_errno ("unable to join verify_hdr_thread" );
1724
+ if (verify_hdr_thread_data .result < 0 )
1725
+ goto unmap ;
1726
+ }
1727
+ #endif
1728
+
1669
1729
munmap (mmap , mmap_size );
1670
1730
return istate -> cache_nr ;
1671
1731
0 commit comments