File tree 2 files changed +14
-14
lines changed
2 files changed +14
-14
lines changed Original file line number Diff line number Diff line change @@ -68,27 +68,28 @@ impl State {
68
68
Some ( offset) if num_threads > 1 => {
69
69
let start_of_extensions = & data[ offset..] ;
70
70
let index_offsets_table = extension:: index_entry_offset_table:: find ( start_of_extensions, object_hash) ;
71
- let ( entries_res, ( ext, data) ) = match index_offsets_table {
72
- Some ( entry_offsets ) => {
73
- dbg ! ( entry_offsets) ;
74
- todo ! ( "threaded entry loading if its worth it" )
75
- }
76
- None => {
77
- git_features :: parallel :: join (
71
+ let ( entries_res, ( ext, data) ) = git_features :: parallel :: threads ( |_scope| {
72
+ match index_offsets_table {
73
+ Some ( entry_offsets) => {
74
+ dbg ! ( entry_offsets ) ;
75
+ todo ! ( "threaded entry loading if its worth it" )
76
+ }
77
+ None => {
78
78
// TODO load all extensions in scoped, then get IEOT, then possibly multi-threaded entry parsing
79
- || {
79
+ (
80
80
entries:: load_all (
81
81
post_header_data,
82
82
num_entries,
83
83
path_backing_buffer_size,
84
84
object_hash,
85
85
version,
86
- )
87
- } ,
88
- || extension :: decode :: all ( start_of_extensions , object_hash ) ,
89
- )
86
+ ) ,
87
+ extension :: decode :: all ( start_of_extensions , object_hash ) ,
88
+ )
89
+ }
90
90
}
91
- } ;
91
+ } )
92
+ . unwrap ( ) ; // this unwrap is for panics - if these happened we are done anyway.
92
93
( entries_res?. 0 , ext, data)
93
94
}
94
95
None | Some ( _) => {
Original file line number Diff line number Diff line change @@ -36,7 +36,6 @@ mod init {
36
36
fn read_without_any_extension ( ) { }
37
37
38
38
#[ test]
39
- #[ ignore]
40
39
fn read_v4_with_delta_paths_and_ieot_ext ( ) {
41
40
let file = file ( "v4_more_files_IEOT" ) ;
42
41
assert_eq ! ( file. version( ) , Version :: V4 ) ;
You can’t perform that action at this time.
0 commit comments