app_server: Rework ClonedAreaMemory to use ServerMemoryAllocator.

This takes advantage of the new reference (use)-counting logic
inside ServerMemoryAllocator to not re-clone areas needlessly.

Fixes #8501.

src/servers/app/ClientMemoryAllocator.cpp

@@ -26,6 +26,7 @@
 #include <Autolock.h>
 
 #include "ServerApp.h"
+#include "ServerMemoryAllocator.h"
 
 
 typedef block_list::Iterator block_iterator;
@@ -364,6 +365,10 @@ ClientMemory::AreaOffset()
 // #pragma mark -
 
 
+static BLocker sLocker("ClonedAreaMemory allocator");
+static BPrivate::ServerMemoryAllocator sClonedAreaMemoryAllocator;
+
+
 ClonedAreaMemory::ClonedAreaMemory()
 	:
 	fClonedArea(-1),
@@ -375,18 +380,18 @@ ClonedAreaMemory::ClonedAreaMemory()
 
 ClonedAreaMemory::~ClonedAreaMemory()
 {
-	if (fClonedArea >= 0)
+	BAutolock locker(sLocker);
-		delete_area(fClonedArea);
+	sClonedAreaMemoryAllocator.RemoveArea(fClonedArea);
 }
 
 
 void*
 ClonedAreaMemory::Clone(area_id area, uint32 offset)
 {
-	fClonedArea = clone_area("server_memory", (void**)&fBase, B_ANY_ADDRESS,
+	BAutolock locker(sLocker);
-		B_READ_AREA | B_WRITE_AREA, area);
+	if (sClonedAreaMemoryAllocator.AddArea(area, fClonedArea, fBase, 0, false) != B_OK)
-	if (fBase == NULL)
 		return NULL;
+
 	fOffset = offset;
 	return Address();
 }

src/servers/app/ClientMemoryAllocator.h

@@ -89,7 +89,7 @@ private:
 
 
 /*! Just clones an existing area. */
-class ClonedAreaMemory  : public AreaMemory{
+class ClonedAreaMemory : public AreaMemory {
 public:
 								ClonedAreaMemory();
 	virtual						~ClonedAreaMemory();