X-Git-Url: https://git.saurik.com/cydia.git/blobdiff_plain/567e3972565737fe38a24e6ba7df047fb7f44386..8e8fca7f589f3be7ca96926dbef9c62ca12dd3eb:/MobileCydia.mm diff --git a/MobileCydia.mm b/MobileCydia.mm index cb9cda33..1fad558c 100644 --- a/MobileCydia.mm +++ b/MobileCydia.mm @@ -197,6 +197,13 @@ void PrintTimes() { #define _pooled _H _pool([[NSAutoreleasePool alloc] init], true); +#define CYPoolStart() \ + NSAutoreleasePool *_pool([[NSAutoreleasePool alloc] init]); \ + do +#define CYPoolEnd() \ + while (false); \ + [_pool release]; + static const NSUInteger UIViewAutoresizingFlexibleBoth(UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight); void NSLogPoint(const char *fix, const CGPoint &point) { @@ -377,7 +384,7 @@ static const CFStringCompareFlags LaxCompareFlags_ = kCFCompareCaseInsensitive | #define ForRelease 1 #define TraceLogging (1 && !ForRelease) -#define HistogramInsertionSort (0 && !ForRelease) +#define HistogramInsertionSort (!ForRelease ? 0 : 0) #define ProfileTimes (0 && !ForRelease) #define ForSaurik (0 && !ForRelease) #define LogBrowser (0 && !ForRelease) @@ -404,7 +411,6 @@ static const CFStringCompareFlags LaxCompareFlags_ = kCFCompareCaseInsensitive | typedef uint32_t (*SKRadixFunction)(id, void *); @interface NSMutableArray (Radix) -- (void) radixSortUsingSelector:(SEL)selector withObject:(id)object; - (void) radixSortUsingFunction:(SKRadixFunction)function withContext:(void *)argument; @end @@ -413,7 +419,20 @@ struct RadixItem_ { uint32_t key; }; -static void RadixSort_(NSMutableArray *self, size_t count, struct RadixItem_ *swap) { +@implementation NSMutableArray (Radix) + +- (void) radixSortUsingFunction:(SKRadixFunction)function withContext:(void *)argument { + size_t count([self count]); + struct RadixItem_ *swap(new RadixItem_[count * 2]); + + for (size_t i(0); i != count; ++i) { + RadixItem_ &item(swap[i]); + item.index = i; + + id object([self objectAtIndex:i]); + item.key = function(object, argument); + } + struct RadixItem_ *lhs(swap), *rhs(swap + count); static const size_t width = 32; @@ -454,68 +473,15 @@ static void RadixSort_(NSMutableArray *self, size_t count, struct RadixItem_ *sw delete [] hist; - NSMutableArray *values([NSMutableArray arrayWithCapacity:count]); + const void **values(new const void *[count]); for (size_t i(0); i != count; ++i) - [values addObject:[self objectAtIndex:lhs[i].index]]; - [self setArray:values]; + values[i] = [self objectAtIndex:lhs[i].index]; + CFArrayReplaceValues((CFMutableArrayRef) self, CFRangeMake(0, count), values, count); + delete [] values; delete [] swap; } -@implementation NSMutableArray (Radix) - -- (void) radixSortUsingSelector:(SEL)selector withObject:(id)object { - size_t count([self count]); - if (count == 0) - return; - -#if 0 - NSInvocation *invocation([NSInvocation invocationWithMethodSignature:[NSMethodSignature signatureWithObjCTypes:"L12@0:4@8"]]); - [invocation setSelector:selector]; - [invocation setArgument:&object atIndex:2]; -#else - /* XXX: this is an unsafe optimization of doomy hell */ - Method method(class_getInstanceMethod([[self objectAtIndex:0] class], selector)); - _assert(method != NULL); - uint32_t (*imp)(id, SEL, id) = reinterpret_cast(method_getImplementation(method)); - _assert(imp != NULL); -#endif - - struct RadixItem_ *swap(new RadixItem_[count * 2]); - - for (size_t i(0); i != count; ++i) { - RadixItem_ &item(swap[i]); - item.index = i; - - id object([self objectAtIndex:i]); - -#if 0 - [invocation setTarget:object]; - [invocation invoke]; - [invocation getReturnValue:&item.key]; -#else - item.key = imp(object, selector, object); -#endif - } - - RadixSort_(self, count, swap); -} - -- (void) radixSortUsingFunction:(SKRadixFunction)function withContext:(void *)argument { - size_t count([self count]); - struct RadixItem_ *swap(new RadixItem_[count * 2]); - - for (size_t i(0); i != count; ++i) { - RadixItem_ &item(swap[i]); - item.index = i; - - id object([self objectAtIndex:i]); - item.key = function(object, argument); - } - - RadixSort_(self, count, swap); -} - @end /* }}} */ /* Insertion Sort {{{ */ @@ -552,7 +518,7 @@ void CFArrayInsertionSortValues(CFMutableArrayRef array, CFRange range, CFCompar const void **values(new const void *[range.length]); CFArrayGetValues(array, range, values); -#if HistogramInsertionSort +#if HistogramInsertionSort > 0 uint32_t total(0), *offsets(new uint32_t[range.length]); #endif @@ -560,9 +526,13 @@ void CFArrayInsertionSortValues(CFMutableArrayRef array, CFRange range, CFCompar const void *value(values[index]); //CFIndex correct(SKBSearch_(&value, sizeof(const void *), values, index, comparator, context)); CFIndex correct(index); - while (comparator(value, values[correct - 1], context) == kCFCompareLessThan) + while (comparator(value, values[correct - 1], context) == kCFCompareLessThan) { +#if HistogramInsertionSort > 1 + NSLog(@"%@ < %@", value, values[correct - 1]); +#endif if (--correct == 0) break; + } if (correct != index) { size_t offset(index - correct); #if HistogramInsertionSort @@ -579,7 +549,7 @@ void CFArrayInsertionSortValues(CFMutableArrayRef array, CFRange range, CFCompar CFArrayReplaceValues(array, range, values, range.length); delete [] values; -#if HistogramInsertionSort +#if HistogramInsertionSort > 0 for (CFIndex index(0); index != range.length; ++index) if (offsets[index] != 0) NSLog(@"Insertion Displacement [%u]: %u", index, offsets[index]); @@ -725,6 +695,16 @@ NSUInteger DOMNodeList$countByEnumeratingWithState$objects$count$(DOMNodeList *s /* }}} */ /* C++ NSString Wrapper Cache {{{ */ +static _finline CFStringRef CYStringCreate(const char *data, size_t size) { + return size == 0 ? NULL : + CFStringCreateWithBytesNoCopy(kCFAllocatorDefault, reinterpret_cast(data), size, kCFStringEncodingUTF8, NO, kCFAllocatorNull) ?: + CFStringCreateWithBytesNoCopy(kCFAllocatorDefault, reinterpret_cast(data), size, kCFStringEncodingISOLatin1, NO, kCFAllocatorNull); +} + +static _finline CFStringRef CYStringCreate(const char *data) { + return CYStringCreate(data, strlen(data)); +} + class CYString { private: char *data_; @@ -803,14 +783,10 @@ class CYString { return size_ == rhs.size_ && memcmp(data_, rhs.data_, size_) == 0; } - operator CFStringRef() { - if (cache_ == NULL) { - if (size_ == 0) - return nil; - cache_ = CFStringCreateWithBytesNoCopy(kCFAllocatorDefault, reinterpret_cast(data_), size_, kCFStringEncodingUTF8, NO, kCFAllocatorNull); - if (cache_ == NULL) - cache_ = CFStringCreateWithBytesNoCopy(kCFAllocatorDefault, reinterpret_cast(data_), size_, kCFStringEncodingISOLatin1, NO, kCFAllocatorNull); - } return cache_; + _finline operator CFStringRef() { + if (cache_ == NULL) + cache_ = CYStringCreate(data_, size_); + return cache_; } _finline operator id() { @@ -1099,10 +1075,6 @@ NSString *SizeString(double size) { return [NSString stringWithFormat:@"%s%.1f %s", (negative ? "-" : ""), size, powers_[power]]; } -static _finline CFStringRef CFCString(const char *value) { - return CFStringCreateWithBytesNoCopy(kCFAllocatorDefault, reinterpret_cast(value), strlen(value), kCFStringEncodingUTF8, NO, kCFAllocatorNull); -} - const char *StripVersion_(const char *version) { const char *colon(strchr(version, ':')); if (colon != NULL) @@ -1116,7 +1088,7 @@ CFStringRef StripVersion(const char *version) { version = colon + 1; return CFStringCreateWithBytes(kCFAllocatorDefault, reinterpret_cast(version), strlen(version), kCFStringEncodingUTF8, NO); // XXX: performance - return CFCString(version); + return CYStringCreate(version); } NSString *LocalizeSection(NSString *section) { @@ -1360,7 +1332,7 @@ typedef std::map< unsigned long, _H > SourceMap; pkgSourceList *list_; SourceMap sources_; - NSMutableArray *packages_; + CFMutableArrayRef packages_; _transient NSObject *delegate_; Status status_; @@ -1937,11 +1909,14 @@ uint32_t PackagePrefixRadix(Package *self, void *context) { for (size_t i(0); i != 4; ++i) if (isalpha(data[i])) - data[i] &= 0xdf; + data[i] |= 0x20; } if (offset == 0) - data[0] = (data[0] & 0x3f) | "\x80\x00\xc0\x40"[data[0] >> 6]; + if (data[0] == '@') + data[0] = 0x7f; + else + data[0] = (data[0] & 0x1f) | "\x80\x00\xc0\x40"[data[0] >> 6]; /* XXX: ntohl may be more honest */ return OSSwapInt32(*reinterpret_cast(data)); @@ -2116,7 +2091,6 @@ struct PackageNameOrdering : - (Package *) initWithVersion:(pkgCache::VerIterator)version withZone:(NSZone *)zone inPool:(apr_pool_t *)pool database:(Database *)database { if ((self = [super init]) != nil) { _profile(Package$initWithVersion) - @synchronized (database) { era_ = [database era]; pool_ = pool; @@ -2147,6 +2121,13 @@ struct PackageNameOrdering : name_.set(pool, iterator_.Display()); _end + _profile(Package$lowercaseString) + char *data(id_.data()); + for (size_t i(0), e(id_.size()); i != e; ++i) + // XXX: do not use tolower() as this is not locale-specific? :( + data[i] |= 0x20; + _end + if (!file_.end()) { _profile(Package$initWithVersion$Source) source_ = [database_ getSource:file_.File()]; @@ -2164,9 +2145,9 @@ struct PackageNameOrdering : tags_ = [[NSMutableArray alloc] initWithCapacity:8]; do { const char *name(tag.Name()); - [tags_ addObject:(NSString *)CFCString(name)]; + [tags_ addObject:(NSString *)CYStringCreate(name)]; if (role_ == nil && strncmp(name, "role::", 6) == 0 /*&& strcmp(name, "role::leaper") != 0*/) - role_ = (NSString *) CFCString(name + 6); + role_ = (NSString *) CYStringCreate(name + 6); if (required_ && strncmp(name, "require::", 9) == 0 && ( true )) @@ -2177,10 +2158,9 @@ struct PackageNameOrdering : _end bool changed(false); - NSString *key([static_cast(id_) lowercaseString]); _profile(Package$initWithVersion$Metadata) - metadata_ = [Packages_ objectForKey:key]; + metadata_ = [Packages_ objectForKey:id_]; if (metadata_ == nil) { firstSeen_ = now_; @@ -2220,7 +2200,7 @@ struct PackageNameOrdering : metadata_ = [metadata_ retain]; if (changed) { - [Packages_ setObject:metadata_ forKey:key]; + [Packages_ setObject:metadata_ forKey:id_]; Changed_ = true; } _end @@ -2232,11 +2212,10 @@ struct PackageNameOrdering : obsolete_ = [self hasTag:@"cydia::obsolete"]; essential_ = ((iterator_->Flags & pkgCache::Flag::Essential) == 0 ? NO : YES) || [self hasTag:@"cydia::essential"]; [self setVisible]; - } _end } return self; + _end } return self; } + (Package *) packageWithIterator:(pkgCache::PkgIterator)iterator withZone:(NSZone *)zone inPool:(apr_pool_t *)pool database:(Database *)database { -@synchronized ([Database class]) { pkgCache::VerIterator version; _profile(Package$packageWithIterator$GetCandidateVer) @@ -2252,7 +2231,7 @@ struct PackageNameOrdering : inPool:pool database:database ] autorelease]; -} } +} - (pkgCache::PkgIterator) iterator { return iterator_; @@ -2318,8 +2297,10 @@ struct PackageNameOrdering : } - (NSString *) longDescription { - if (file_.end()) +@synchronized (database_) { + if ([database_ era] != era_ || file_.end()) return nil; + pkgRecords::Parser *parser = &[database_ records]->Lookup(file_); NSString *description([NSString stringWithUTF8String:parser->LongDesc().c_str()]); @@ -2335,7 +2316,7 @@ struct PackageNameOrdering : } return [trimmed componentsJoinedByString:@"\n"]; -} +} } - (NSString *) shortDescription { return tagline_; @@ -3066,7 +3047,7 @@ static NSString *Warning_; } - (Package *) packageWithName:(NSString *)name { -@synchronized ([Database class]) { +@synchronized (self) { if (static_cast(cache_) == NULL) return nil; pkgCache::PkgIterator iterator(cache_->FindPkg([name UTF8String])); @@ -3084,7 +3065,7 @@ static NSString *Warning_; zone_ = NSCreateZone(1024 * 1024, 256 * 1024, NO); apr_pool_create(&pool_, NULL); - packages_ = [[NSMutableArray alloc] init]; + packages_ = CFArrayCreateMutable(kCFAllocatorDefault, 0, NULL); int fds[2]; @@ -3152,7 +3133,7 @@ static NSString *Warning_; } - (NSArray *) packages { - return packages_; + return (NSArray *) packages_; } - (NSArray *) sources { @@ -3168,7 +3149,7 @@ static NSString *Warning_; NSMutableArray *issues([NSMutableArray arrayWithCapacity:4]); - for (Package *package in packages_) { + for (Package *package in [self packages]) { if (![package broken]) continue; pkgCache::PkgIterator pkg([package iterator]); @@ -3260,13 +3241,13 @@ static NSString *Warning_; return [self popErrorWithTitle:title] || !success; } -- (void) reloadData { _pooled -@synchronized ([Database class]) { - @synchronized (self) { - ++era_; - } +- (void) reloadData { CYPoolStart() { +@synchronized (self) { + ++era_; + + CFArrayApplyFunction(packages_, CFRangeMake(0, CFArrayGetCount(packages_)), reinterpret_cast(&CFRelease), NULL); + CFArrayRemoveAllValues(packages_); - [packages_ removeAllObjects]; sources_.clear(); _error->Discard(); @@ -3359,8 +3340,6 @@ static NSString *Warning_; return; } - _trace(); - for (pkgSourceList::const_iterator source = list_->begin(); source != list_->end(); ++source) { std::vector *indices = (*source)->GetIndexFiles(); for (std::vector::const_iterator index = indices->begin(); index != indices->end(); ++index) @@ -3372,8 +3351,6 @@ static NSString *Warning_; } } - _trace(); - { /*std::vector packages; packages.reserve(std::max(10000U, [packages_ count] + 1000)); @@ -3385,7 +3362,7 @@ static NSString *Warning_; for (pkgCache::PkgIterator iterator = cache_->PkgBegin(); !iterator.end(); ++iterator) if (Package *package = [Package packageWithIterator:iterator withZone:zone_ inPool:pool_ database:self]) //packages.push_back(package); - [packages_ addObject:package]; + CFArrayAppendValue(packages_, [package retain]); _trace(); @@ -3395,9 +3372,9 @@ static NSString *Warning_; packages_ = [[NSArray alloc] initWithObjects:&packages.front() count:packages.size()]; _trace();*/ - [packages_ radixSortUsingFunction:reinterpret_cast(&PackagePrefixRadix) withContext:reinterpret_cast(16)]; - [packages_ radixSortUsingFunction:reinterpret_cast(&PackagePrefixRadix) withContext:reinterpret_cast(4)]; - [packages_ radixSortUsingFunction:reinterpret_cast(&PackagePrefixRadix) withContext:reinterpret_cast(0)]; + [(NSMutableArray *) packages_ radixSortUsingFunction:reinterpret_cast(&PackagePrefixRadix) withContext:reinterpret_cast(16)]; + [(NSMutableArray *) packages_ radixSortUsingFunction:reinterpret_cast(&PackagePrefixRadix) withContext:reinterpret_cast(4)]; + [(NSMutableArray *) packages_ radixSortUsingFunction:reinterpret_cast(&PackagePrefixRadix) withContext:reinterpret_cast(0)]; /*_trace(); PrintTimes(); @@ -3411,13 +3388,13 @@ static NSString *Warning_; //CFArraySortValues((CFMutableArrayRef) packages_, CFRangeMake(0, [packages_ count]), reinterpret_cast(&PackageNameCompare), NULL); - CFArrayInsertionSortValues((CFMutableArrayRef) packages_, CFRangeMake(0, [packages_ count]), reinterpret_cast(&PackageNameCompare), NULL); + CFArrayInsertionSortValues(packages_, CFRangeMake(0, CFArrayGetCount(packages_)), reinterpret_cast(&PackageNameCompare), NULL); //[packages_ sortUsingFunction:reinterpret_cast(&PackageNameCompare) context:NULL]; _trace(); } -} } +} } CYPoolEnd() _trace(); } - (void) configure { NSString *dpkg = [NSString stringWithFormat:@"dpkg --configure -a --status-fd %u", statusfd_]; @@ -3563,7 +3540,7 @@ static NSString *Warning_; } - (void) setVisible { - for (Package *package in packages_) + for (Package *package in [self packages]) [package setVisible]; } @@ -6949,7 +6926,7 @@ freeing the view controllers on tab change */ UITableViewDelegate > { _transient Database *database_; - NSMutableArray *packages_; + CFMutableArrayRef packages_; NSMutableArray *sections_; UITableView *list_; unsigned upgrades_; @@ -6967,7 +6944,8 @@ freeing the view controllers on tab change */ [list_ setDelegate:nil]; [list_ setDataSource:nil]; - [packages_ release]; + CFRelease(packages_); + [sections_ release]; [list_ release]; [super dealloc]; @@ -7000,10 +6978,14 @@ freeing the view controllers on tab change */ return [[sections_ objectAtIndex:section] count]; } +- (Package *) packageAtIndex:(NSUInteger)index { + return (Package *) CFArrayGetValueAtIndex(packages_, index); +} + - (Package *) packageAtIndexPath:(NSIndexPath *)path { Section *section([sections_ objectAtIndex:[path section]]); NSInteger row([path row]); - return [packages_ objectAtIndex:([section row] + row)]; + return [self packageAtIndex:([section row] + row)]; } - (UITableViewCell *) tableView:(UITableView *)table cellForRowAtIndexPath:(NSIndexPath *)path { @@ -7043,7 +7025,8 @@ freeing the view controllers on tab change */ database_ = database; [[self navigationItem] setTitle:UCLocalize("CHANGES")]; - packages_ = [[NSMutableArray arrayWithCapacity:16] retain]; + packages_ = CFArrayCreateMutable(kCFAllocatorDefault, 0, NULL); + sections_ = [[NSMutableArray arrayWithCapacity:16] retain]; list_ = [[UITableView alloc] initWithFrame:[[self view] bounds] style:UITableViewStylePlain]; @@ -7065,25 +7048,30 @@ freeing the view controllers on tab change */ [package uninstalled] && [package valid] && [package visible] || [package upgradableAndEssential:YES] ) - [packages_ addObject:package]; + CFArrayAppendValue(packages_, package); _trace(); - [packages_ radixSortUsingFunction:reinterpret_cast(&PackageChangesRadix) withContext:NULL]; + [(NSMutableArray *) packages_ radixSortUsingFunction:reinterpret_cast(&PackageChangesRadix) withContext:NULL]; _trace(); } - (void) reloadData { NSArray *packages = [database_ packages]; - [packages_ removeAllObjects]; + CFArrayRemoveAllValues(packages_); + [sections_ removeAllObjects]; +#if 0 UIProgressHUD *hud([delegate_ addProgressHUD]); // XXX: localize [hud setText:@"Loading Changes"]; //NSLog(@"HUD:%@::%@", delegate_, hud); [self yieldToSelector:@selector(_reloadPackages:) withObject:packages]; [delegate_ removeProgressHUD:hud]; +#else + [self _reloadPackages:packages]; +#endif Section *upgradable = [[[Section alloc] initWithName:UCLocalize("AVAILABLE_UPGRADES") localize:NO] autorelease]; Section *ignored = [[[Section alloc] initWithName:UCLocalize("IGNORED_UPGRADES") localize:NO] autorelease]; @@ -7095,8 +7083,8 @@ freeing the view controllers on tab change */ CFDateFormatterRef formatter(CFDateFormatterCreate(NULL, Locale_, kCFDateFormatterMediumStyle, kCFDateFormatterMediumStyle)); - for (size_t offset = 0, count = [packages_ count]; offset != count; ++offset) { - Package *package = [packages_ objectAtIndex:offset]; + for (size_t offset = 0, count = CFArrayGetCount(packages_); offset != count; ++offset) { + Package *package = [self packageAtIndex:offset]; BOOL uae = [package upgradableAndEssential:YES]; @@ -7141,7 +7129,7 @@ freeing the view controllers on tab change */ if (unseens) { Section *last = [sections_ lastObject]; size_t count = [last count]; - [packages_ removeObjectsInRange:NSMakeRange([packages_ count] - count, count)]; + CFArrayReplaceValues(packages_, CFRangeMake(CFArrayGetCount(packages_) - count, count), NULL, 0); [sections_ removeLastObject]; } @@ -8115,7 +8103,6 @@ static _finline void _setHomePage(Cydia *self) { [hud setText:UCLocalize("RELOADING_DATA")]; [database_ yieldToSelector:@selector(reloadData) withObject:nil]; - _trace(); if (hud) [self removeProgressHUD:hud]; @@ -8684,7 +8671,6 @@ static _finline void _setHomePage(Cydia *self) { } [tabbar_ setViewControllers:controllers]; - [tabbar_ setSelectedIndex:0]; } - (void) applicationDidFinishLaunching:(id)unused { @@ -8737,19 +8723,19 @@ static _finline void _setHomePage(Cydia *self) { [window_ addSubview:[container_ view]]; // Show pinstripes while loading data. - [[container_ view] setBackgroundColor:[UIColor performSelector:@selector(pinStripeColor)]]; + [[container_ view] setBackgroundColor:[UIColor pinStripeColor]]; [self performSelector:@selector(loadData) withObject:nil afterDelay:0]; +_trace(); } - (void) loadData { +_trace(); if (Role_ == nil) { [self showSettings]; return; } - [UIKeyboard initImplementationNow]; - [window_ setUserInteractionEnabled:NO]; UIView *container = [[UIView alloc] init]; @@ -8798,6 +8784,7 @@ static _finline void _setHomePage(Cydia *self) { PrintTimes(); // Show the home page + [tabbar_ setSelectedIndex:0]; _setHomePage(self); [window_ setUserInteractionEnabled:YES]; @@ -9027,7 +9014,6 @@ int main(int argc, char *argv[]) { _pooled Metadata_ = [[[NSMutableDictionary alloc] initWithContentsOfFile:@"/var/lib/cydia/metadata.plist"] autorelease]; _trace(); SectionMap_ = [[[NSDictionary alloc] initWithContentsOfFile:[[NSBundle mainBundle] pathForResource:@"Sections" ofType:@"plist"]] autorelease]; - _trace(); if (Metadata_ == NULL) Metadata_ = [NSMutableDictionary dictionaryWithCapacity:2]; @@ -9101,7 +9087,10 @@ int main(int argc, char *argv[]) { _pooled if (lang != NULL) _config->Set("APT::Acquire::Translation", lang); - _config->Set("Acquire::http::Timeout", 15); + + // XXX: this timeout might be important :( + //_config->Set("Acquire::http::Timeout", 15); + _config->Set("Acquire::http::MaxParallel", 3); /* }}} */ /* Color Choices {{{ */