* removed tokens are no longer put on a stack and reused - every token is only

used once now. If tokens were reused, you could eventually target the wrong
  (but valid again) messenger.
* removed unused stuff (like GetList()).
* some cleanup.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@15028 a95241bf-73f2-0310-859d-f6bbb57e9c96

headers/private/app/TokenSpace.h

@@ -40,41 +40,23 @@ class BTokenSpace : public BLocker {
 		~BTokenSpace();
 
 		int32		NewToken(int16 type, void* object,
-							 new_token_callback callback = NULL);
+						new_token_callback callback = NULL);
 		bool		RemoveToken(int32 token, remove_token_callback callback = NULL);
 		bool		CheckToken(int32 token, int16 type) const;
 		status_t	GetToken(int32 token, int16 type, void** object,
-							 get_token_callback callback = NULL) const;
+						get_token_callback callback = NULL) const;
-
-		status_t	GetList(int32*& tokens, int32& count) const;
-
-// Possible expansion
-//		void Dump(BDataIO&, bool) const;
-//		int32 NewToken(void*, BDirectMessageTarget*, void (*)(short, void*));
-//		bool SetTokenTarget(uint32, BDirectMessageTarget*);
-//		BDirectMessageTarget* TokenTarget(uint32 token, int16 type);
 
 	private:
-		struct TTokenInfo {
+		struct token_info {
 			int16	type;
 			void*	object;
 		};
+		typedef std::map<int32, token_info> TokenMap;
 
-		typedef std::map<int32, TTokenInfo>	TTokenMap;
+		TokenMap	fTokenMap;
-
+		int32		fTokenCount;
-		TTokenMap			fTokenMap;
-		std::stack<int32>	fTokenBin;
-		int32				fTokenCount;
 };
 
-// Possible expansion
-//_delete_tokens_();
-//_init_tokens_();
-//get_handler_token(short, void*);
-//get_token_list(long, long*);
-//new_handler_token(short, void*);
-//remove_handler_token(short, void*);
-
 extern _IMPEXP_BE BTokenSpace gDefaultTokens;
 
 }	// namespace BPrivate

src/kits/app/TokenSpace.cpp

@@ -19,10 +19,12 @@
 namespace BPrivate {
 
 BTokenSpace gDefaultTokens;
-	// the one and only token space object per team
+	// the default token space - all handlers will go into that one
 
 
 BTokenSpace::BTokenSpace()
+	:
+	fTokenCount(1)
 {
 }
 
@@ -38,16 +40,8 @@ BTokenSpace::NewToken(int16 type, void* object,
 {
 	BAutolock locker(this);
 
-	TTokenInfo tokenInfo = { type, object };
+	token_info tokenInfo = { type, object };
-	int32 token;
+	int32 token = fTokenCount++;
-
-	if (fTokenBin.empty()) {
-		token = fTokenCount;
-		++fTokenCount;
-	} else {
-		token = fTokenBin.top();
-		fTokenBin.pop();
-	}
 
 	fTokenMap[token] = tokenInfo;
 
@@ -63,16 +57,14 @@ BTokenSpace::RemoveToken(int32 token, remove_token_callback callback)
 {
 	BAutolock locker(this);
 
-	TTokenMap::iterator iter = fTokenMap.find(token);
+	TokenMap::iterator iterator = fTokenMap.find(token);
-	if (iter == fTokenMap.end())
+	if (iterator == fTokenMap.end())
 		return false;
 
 	if (callback)
-		callback(iter->second.type, iter->second.object);
+		callback(iterator->second.type, iterator->second.object);
-
-	fTokenMap.erase(iter);
-	fTokenBin.push(token);
 
+	fTokenMap.erase(iterator);
 	return true;
 }
 
@@ -86,8 +78,8 @@ BTokenSpace::CheckToken(int32 token, int16 type) const
 {
 	BAutolock locker(const_cast<BTokenSpace&>(*this));
 
-	TTokenMap::const_iterator iter = fTokenMap.find(token);
+	TokenMap::const_iterator iterator = fTokenMap.find(token);
-	if (iter != fTokenMap.end() && iter->second.type == type)
+	if (iterator != fTokenMap.end() && iterator->second.type == type)
 		return true;
 
 	return false;
@@ -95,44 +87,27 @@ BTokenSpace::CheckToken(int32 token, int16 type) const
 
 
 status_t
-BTokenSpace::GetToken(int32 token, int16 type, void** object,
+BTokenSpace::GetToken(int32 token, int16 type, void** _object,
 	get_token_callback callback) const
 {
 	BAutolock locker(const_cast<BTokenSpace&>(*this));
 
-	TTokenMap::const_iterator iter = fTokenMap.find(token);
+	if (token < 1)
-	if (iter == fTokenMap.end() || iter->second.type != type) {
+		return B_ENTRY_NOT_FOUND;
-		*object = NULL;
+
+	TokenMap::const_iterator iterator = fTokenMap.find(token);
+
+	if (iterator == fTokenMap.end() || iterator->second.type != type) {
+		*_object = NULL;
 		return B_ERROR;
 	}
 
-	if (callback && !callback(iter->second.type, iter->second.object)) {
+	if (callback && !callback(iterator->second.type, iterator->second.object)) {
-		*object = NULL;
+		*_object = NULL;
 		return B_ERROR;
 	}
 
-	*object = iter->second.object;
+	*_object = iterator->second.object;
-
-	return B_OK;
-}
-
-
-status_t
-BTokenSpace::GetList(int32*& tokens, int32& count) const
-{
-	BAutolock locker(const_cast<BTokenSpace&>(*this));
-
-	count = fTokenMap.size();
-	tokens = (int32*)malloc(count * sizeof(int32));
-	if (tokens == NULL)
-		return B_NO_MEMORY;
-
-	TTokenMap::const_iterator iterator = fTokenMap.begin();
-	for (int32 i = 0; iterator != fTokenMap.end(); i++) {
-		tokens[i] = iterator->first;
-		iterator++;
-	}
-
 	return B_OK;
 }