<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" /><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fc0 solid; padding: 6px; }
#msg ul, pre { overflow: auto; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<title>[29847] users/rhwood/MacPorts.Framework</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.macosforge.org/projects/macports/changeset/29847">29847</a></dd>
<dt>Author</dt> <dd>rhwood@macports.org</dd>
<dt>Date</dt> <dd>2007-10-12 02:52:14 -0700 (Fri, 12 Oct 2007)</dd>
</dl>
<h3>Log Message</h3>
<pre>Change MPMacPorts into a single-instance-per-thread object, more tightly coupling it to MPInterpreter.
As a result of this, MPIndex no longer stores its own instance of MPMacPorts, but uses [MPMacPorts sharedInstance] to get an MPMacPorts object when it needs one.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#usersrhwoodMacPortsFrameworkMPIndexh">users/rhwood/MacPorts.Framework/MPIndex.h</a></li>
<li><a href="#usersrhwoodMacPortsFrameworkMPIndexm">users/rhwood/MacPorts.Framework/MPIndex.m</a></li>
<li><a href="#usersrhwoodMacPortsFrameworkMPMacPortsh">users/rhwood/MacPorts.Framework/MPMacPorts.h</a></li>
<li><a href="#usersrhwoodMacPortsFrameworkMPMacPortsm">users/rhwood/MacPorts.Framework/MPMacPorts.m</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="usersrhwoodMacPortsFrameworkMPIndexh"></a>
<div class="modfile"><h4>Modified: users/rhwood/MacPorts.Framework/MPIndex.h (29846 => 29847)</h4>
<pre class="diff"><span>
<span class="info">--- users/rhwood/MacPorts.Framework/MPIndex.h 2007-10-12 09:49:51 UTC (rev 29846)
+++ users/rhwood/MacPorts.Framework/MPIndex.h 2007-10-12 09:52:14 UTC (rev 29847)
</span><span class="lines">@@ -13,18 +13,10 @@
</span><span class="cx">
</span><span class="cx"> @interface MPIndex : NSMutableDictionary {
</span><span class="cx">
</span><del>- MPMacPorts *macPorts;
</del><span class="cx"> NSMutableDictionary *embeddedDictionary;
</span><span class="cx">
</span><span class="cx"> }
</span><span class="cx">
</span><del>-- (id)init;
-- (id)initWithCapacity:(unsigned)numItems;
-- (id)initWithMacPorts:(MPMacPorts *)macPortsInstance;
-- (id)initWithCapacity:(unsigned)numItems WithMacPorts:(MPMacPorts *)macPortsInstance;
-
-- (void)finishInitWithCapacity:(unsigned)numItems WithMacPorts:(MPMacPorts *)macPortsInstance;
-
</del><span class="cx"> - (NSArray *)ports;
</span><span class="cx"> - (NSArray *)portNames;
</span><span class="cx">
</span></span></pre></div>
<a id="usersrhwoodMacPortsFrameworkMPIndexm"></a>
<div class="modfile"><h4>Modified: users/rhwood/MacPorts.Framework/MPIndex.m (29846 => 29847)</h4>
<pre class="diff"><span>
<span class="info">--- users/rhwood/MacPorts.Framework/MPIndex.m 2007-10-12 09:49:51 UTC (rev 29846)
+++ users/rhwood/MacPorts.Framework/MPIndex.m 2007-10-12 09:52:14 UTC (rev 29847)
</span><span class="lines">@@ -14,7 +14,8 @@
</span><span class="cx"> - (id)init {
</span><span class="cx"> self = [super init];
</span><span class="cx"> if (self != nil) {
</span><del>- [self finishInitWithCapacity:0 WithMacPorts:[[MPMacPorts alloc] init]];
</del><ins>+ embeddedDictionary = [[NSMutableDictionary alloc] init];
+ [self setIndex];
</ins><span class="cx"> }
</span><span class="cx"> return self;
</span><span class="cx"> }
</span><span class="lines">@@ -22,41 +23,22 @@
</span><span class="cx"> - (id)initWithCapacity:(unsigned)numItems {
</span><span class="cx"> self = [super init];
</span><span class="cx"> if (self != nil) {
</span><del>- [self finishInitWithCapacity:(unsigned)numItems WithMacPorts:[[MPMacPorts alloc] init]];
</del><ins>+ embeddedDictionary = [[NSMutableDictionary alloc] initWithCapacity:numItems];
+ [self setIndex];
</ins><span class="cx"> }
</span><span class="cx"> return self;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-- (id)initWithMacPorts:(MPMacPorts *)macPortsInstance {
- self = [super init];
- if (self != nil) {
- [self finishInitWithCapacity:0 WithMacPorts:(MPMacPorts *)macPortsInstance];
- }
- return self;
-}
-
-- (id)initWithCapacity:(unsigned)numItems WithMacPorts:(MPMacPorts *)macPortsInstance {
- self = [super init];
- if (self != nil) {
- [self finishInitWithCapacity:(unsigned)numItems WithMacPorts:(MPMacPorts *)macPortsInstance];
- }
- return self;
-}
-
-- (void)finishInitWithCapacity:(unsigned)numItems WithMacPorts:(MPMacPorts *)macPortsInstance {
- embeddedDictionary = [[NSMutableDictionary alloc] initWithCapacity:numItems];
- macPorts = macPortsInstance;
- [self setIndex];
-}
-
</del><span class="cx"> - (void)dealloc {
</span><span class="cx"> [embeddedDictionary release];
</span><span class="cx"> [super dealloc];
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (void)setIndex {
</span><del>- NSEnumerator* portIndexEnumerator;
- NSString* portIndex;
</del><ins>+ NSEnumerator *portIndexEnumerator;
+ NSString *portIndex;
+ MPMacPorts *macPorts;
+ macPorts = [MPMacPorts sharedInstance];
</ins><span class="cx"> [self removeAllObjects];
</span><span class="cx"> portIndexEnumerator = [[macPorts sources] objectEnumerator];
</span><span class="cx"> while (portIndex = [portIndexEnumerator nextObject]) {
</span><span class="lines">@@ -69,6 +51,8 @@
</span><span class="cx"> NSArray* lines;
</span><span class="cx"> NSEnumerator* linesEnumerator;
</span><span class="cx"> id line;
</span><ins>+ MPMacPorts *macPorts;
+ macPorts = [MPMacPorts sharedInstance];
</ins><span class="cx"> file = [[NSString alloc] initWithContentsOfFile:[macPorts pathToPortIndex:portIndex]];
</span><span class="cx"> lines = [file componentsSeparatedByString:@"\n"];
</span><span class="cx"> linesEnumerator = [lines objectEnumerator];
</span></span></pre></div>
<a id="usersrhwoodMacPortsFrameworkMPMacPortsh"></a>
<div class="modfile"><h4>Modified: users/rhwood/MacPorts.Framework/MPMacPorts.h (29846 => 29847)</h4>
<pre class="diff"><span>
<span class="info">--- users/rhwood/MacPorts.Framework/MPMacPorts.h 2007-10-12 09:49:51 UTC (rev 29846)
+++ users/rhwood/MacPorts.Framework/MPMacPorts.h 2007-10-12 09:52:14 UTC (rev 29847)
</span><span class="lines">@@ -21,6 +21,8 @@
</span><span class="cx">
</span><span class="cx"> }
</span><span class="cx">
</span><ins>++ (MPMacPorts *)sharedInstance;
+
</ins><span class="cx"> - (NSDictionary *)search:(NSString *)query;
</span><span class="cx"> - (NSDictionary *)search:(NSString *)query caseSensitive:(BOOL)sensitivity;
</span><span class="cx"> - (NSDictionary *)search:(NSString *)query caseSensitive:(BOOL)sensitivity matchStyle:(NSString *)style;
</span></span></pre></div>
<a id="usersrhwoodMacPortsFrameworkMPMacPortsm"></a>
<div class="modfile"><h4>Modified: users/rhwood/MacPorts.Framework/MPMacPorts.m (29846 => 29847)</h4>
<pre class="diff"><span>
<span class="info">--- users/rhwood/MacPorts.Framework/MPMacPorts.m 2007-10-12 09:49:51 UTC (rev 29846)
+++ users/rhwood/MacPorts.Framework/MPMacPorts.m 2007-10-12 09:52:14 UTC (rev 29847)
</span><span class="lines">@@ -12,18 +12,51 @@
</span><span class="cx"> @implementation MPMacPorts
</span><span class="cx">
</span><span class="cx"> - (id) init {
</span><del>- self = [super init];
- if (self != nil) {
</del><ins>+ if (self = [super init]) {
</ins><span class="cx"> interpreter = [MPInterpreter sharedInterpreter];
</span><span class="cx"> }
</span><span class="cx"> return self;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-- (void) dealloc {
- [interpreter release];
- [super dealloc];
</del><ins>++ (MPMacPorts *)sharedInstance {
+ @synchronized(self) {
+ if ([[[NSThread currentThread] threadDictionary] objectForKey:@"sharedMPMacPorts"] == nil) {
+ [[self alloc] init]; // assignment not done here
+ }
+ }
+ return [[[NSThread currentThread] threadDictionary] objectForKey:@"sharedMPMacPorts"];
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>++ (id)allocWithZone:(NSZone*)zone {
+ @synchronized(self) {
+ if ([[[NSThread currentThread] threadDictionary] objectForKey:@"sharedMPMacPorts"] == nil) {
+ [[[NSThread currentThread] threadDictionary] setObject:[super allocWithZone:zone] forKey:@"sharedMPMacPorts"];
+ return [[[NSThread currentThread] threadDictionary] objectForKey:@"sharedMPMacPorts"]; // assignment and return on first allocation
+ }
+ }
+ return nil; // subsequent allocation attempts return nil
+}
+
+- (id)copyWithZone:(NSZone*)zone {
+ return self;
+}
+
+- (id)retain {
+ return self;
+}
+
+- (unsigned)retainCount {
+ return UINT_MAX; //denotes an object that cannot be released
+}
+
+- (void)release {
+ //do nothing
+}
+
+- (id)autorelease {
+ return self;
+}
+
</ins><span class="cx"> #pragma MacPorts API
</span><span class="cx">
</span><span class="cx"> - (NSDictionary *)search:(NSString *)query {
</span></span></pre>
</div>
</div>
</body>
</html>