Allow profiling usage of Database::sections_ in -[Database mappedSectionForPointer:].

[cydia.git] / MobileCydia.mm

diff --git a/MobileCydia.mm b/MobileCydia.mm
index 6e2b190adf944bf8d82d72d5d56a464540b78ed1..b7050fc6d3dafbded0ce1e5468f64f2a1b8bd902 100644 (file)
--- a/MobileCydia.mm
+++ b/MobileCydia.mm
@@ -1830,7 +1830,8 @@ struct ParsedPackage {
 };
 
 @interface Package : NSObject {
 };
 
 @interface Package : NSObject {

-    uint32_t era_ : 29;
+    uint32_t era_ : 26;
+    uint32_t role_ : 3;

     uint32_t essential_ : 1;
     uint32_t obsolete_ : 1;
     uint32_t ignored_ : 1;
     uint32_t essential_ : 1;
     uint32_t obsolete_ : 1;
     uint32_t ignored_ : 1;


@@ -1858,7 +1859,6 @@ struct ParsedPackage {
     ParsedPackage *parsed_;
 
     NSMutableArray *tags_;
     ParsedPackage *parsed_;
 
     NSMutableArray *tags_;

-    NSString *role_;

 }
 
 - (Package *) initWithVersion:(pkgCache::VerIterator)version withZone:(NSZone *)zone inPool:(apr_pool_t *)pool database:(Database *)database;
 }
 
 - (Package *) initWithVersion:(pkgCache::VerIterator)version withZone:(NSZone *)zone inPool:(apr_pool_t *)pool database:(Database *)database;


@@ -1920,7 +1920,6 @@ struct ParsedPackage {
 - (NSArray *) applications;
 
 - (Source *) source;
 - (NSArray *) applications;
 
 - (Source *) source;

-- (NSString *) role;

 
 - (BOOL) matches:(NSString *)text;
 
 
 - (BOOL) matches:(NSString *)text;
 


@@ -2081,15 +2080,10 @@ struct PackageNameOrdering :
 - (void) dealloc {
     if (parsed_ != NULL)
         delete parsed_;
 - (void) dealloc {
     if (parsed_ != NULL)
         delete parsed_;

-

     if (source_ != nil)
         [source_ release];
     if (source_ != nil)
         [source_ release];

-

     if (tags_ != nil)
         [tags_ release];
     if (tags_ != nil)
         [tags_ release];

-    if (role_ != nil)
-        [role_ release];
-

     [super dealloc];
 }
 
     [super dealloc];
 }
 


@@ -2223,8 +2217,18 @@ struct PackageNameOrdering :
                     const char *name(tag.Name());
                     [tags_ addObject:[(NSString *)CYStringCreate(name) autorelease]];
 
                     const char *name(tag.Name());
                     [tags_ addObject:[(NSString *)CYStringCreate(name) autorelease]];
 

-                    if (role_ == nil && strncmp(name, "role::", 6) == 0 /*&& strcmp(name, "role::leaper") != 0*/)
-                        role_ = (NSString *) CYStringCreate(name + 6);
+                    if (role_ == 0 && strncmp(name, "role::", 6) == 0 /*&& strcmp(name, "role::leaper") != 0*/) {
+                        if (strcmp(name + 6, "enduser") == 0)
+                            role_ = 1;
+                        else if (strcmp(name + 6, "hacker") == 0)
+                            role_ = 2;
+                        else if (strcmp(name + 6, "developer") == 0)
+                            role_ = 3;
+                        else if (strcmp(name + 6, "cydia") == 0)
+                            role_ = 7;
+                        else
+                            role_ = 4;
+                    }

 
                     if (strncmp(name, "cydia::", 7) == 0) {
                         if (strcmp(name + 7, "essential") == 0)
 
                     if (strncmp(name, "cydia::", 7) == 0) {
                         if (strcmp(name + 7, "essential") == 0)


@@ -2474,12 +2478,12 @@ struct PackageNameOrdering :
 
 - (BOOL) unfiltered {
     _profile(Package$unfiltered$obsolete)
 
 - (BOOL) unfiltered {
     _profile(Package$unfiltered$obsolete)

-        if (obsolete_)
+        if (_unlikely(obsolete_))

             return false;
     _end
 
     _profile(Package$unfiltered$hasSupportingRole)
             return false;
     _end
 
     _profile(Package$unfiltered$hasSupportingRole)

-        if (![self hasSupportingRole])
+        if (_unlikely(![self hasSupportingRole]))

             return false;
     _end
 
             return false;
     _end
 


@@ -2717,10 +2721,6 @@ struct PackageNameOrdering :
     return source_ == (Source *) [NSNull null] ? nil : source_;
 }
 
     return source_ == (Source *) [NSNull null] ? nil : source_;
 }
 

-- (NSString *) role {
-    return role_;
-}
-

 - (BOOL) matches:(NSString *)text {
     if (text == nil)
         return NO;
 - (BOOL) matches:(NSString *)text {
     if (text == nil)
         return NO;


@@ -2743,17 +2743,17 @@ struct PackageNameOrdering :
 }
 
 - (bool) hasSupportingRole {
 }
 
 - (bool) hasSupportingRole {

-    if (role_ == nil)
+    if (role_ == 0)

         return true;
         return true;

-    if ([role_ isEqualToString:@"enduser"])
+    if (role_ == 1)

         return true;
     if ([Role_ isEqualToString:@"User"])
         return false;
         return true;
     if ([Role_ isEqualToString:@"User"])
         return false;

-    if ([role_ isEqualToString:@"hacker"])
+    if (role_ == 2)

         return true;
     if ([Role_ isEqualToString:@"Hacker"])
         return false;
         return true;
     if ([Role_ isEqualToString:@"Hacker"])
         return false;

-    if ([role_ isEqualToString:@"developer"])
+    if (role_ == 3)

         return true;
     if ([Role_ isEqualToString:@"Developer"])
         return false;
         return true;
     if ([Role_ isEqualToString:@"Developer"])
         return false;


@@ -2875,7 +2875,7 @@ struct PackageNameOrdering :
 }
 
 - (bool) isInstalledAndUnfiltered:(NSNumber *)number {
 }
 
 - (bool) isInstalledAndUnfiltered:(NSNumber *)number {

-    return ![self uninstalled] && (![number boolValue] && ![role_ isEqualToString:@"cydia"] || [self unfiltered]);
+    return ![self uninstalled] && (![number boolValue] && role_ != 7 || [self unfiltered]);

 }
 
 - (bool) isVisibleInSection:(NSString *)name {
 }
 
 - (bool) isVisibleInSection:(NSString *)name {


@@ -3685,9 +3685,13 @@ static NSString *Warning_;
 }
 
 - (NSString *) mappedSectionForPointer:(const char *)section {
 }
 
 - (NSString *) mappedSectionForPointer:(const char *)section {

-    _H<NSString> &mapped(sections_[section]);
+    _H<NSString> *mapped;
+
+    _profile(Database$mappedSectionForPointer$Cache)
+        mapped = &sections_[section];
+    _end

 
 

-    if (mapped == NULL) {
+    if (*mapped == NULL) {

         size_t length(strlen(section));
         char spaced[length + 1];
 
         size_t length(strlen(section));
         char spaced[length + 1];
 


@@ -3704,9 +3708,11 @@ static NSString *Warning_;
         _end
 
         _profile(Database$mappedSectionForPointer$Map)
         _end
 
         _profile(Database$mappedSectionForPointer$Map)

-            mapped = [SectionMap_ objectForKey:string] ?: string;
+            string = [SectionMap_ objectForKey:string] ?: string;

         _end
         _end

-    } return mapped;
+
+        *mapped = string;
+    } return *mapped;

 }
 
 @end
 }
 
 @end


@@ -5176,7 +5182,7 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
 }
 
 - (void) drawContentRect:(CGRect)rect {
 }
 
 - (void) drawContentRect:(CGRect)rect {

-    bool highlighted(highlighted_);
+    bool highlighted(highlighted_ && !editing_);

 
     [icon_ drawInRect:CGRectMake(8, 7, 32, 32)];
 
 
     [icon_ drawInRect:CGRectMake(8, 7, 32, 32)];