3 files changed, 64 insertions, 20 deletions

diff --git a/lib/percept/src/egd.erl b/lib/percept/src/egd.erl
index 4fb5b6c46a..1b26d96728 100644
--- a/lib/percept/src/egd.erl
+++ b/lib/percept/src/egd.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2010. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2011. All Rights Reserved.
 %%
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -42,6 +42,7 @@
 %%==========================================================================
 
 %% @type egd_image()
+%% @type font()
 %% @type point() = {integer(), integer()}
 %% @type color()  
 %% @type render_option() = {render_engine, opaque} | {render_engine, alpha}
diff --git a/lib/percept/src/percept.erl b/lib/percept/src/percept.erl
index f5e0f7e469..3a2d9f7601 100644
--- a/lib/percept/src/percept.erl
+++ b/lib/percept/src/percept.erl
@@ -185,10 +185,27 @@ stop_webserver() ->
     	undefined -> 
 	    {error, not_started};
 	Pid ->
-	    Pid ! {self(), get_port},
-	    receive Port -> ok end,
-	    Pid ! quit,
-	    stop_webserver(Port)
+            do_stop([], Pid)
+    end.
+
+do_stop([], Pid)->
+    Pid ! {self(), get_port},
+    Port = receive P -> P end,
+    do_stop(Port, Pid);
+do_stop(Port, [])->
+    case whereis(percept_httpd) of
+        undefined ->
+            {error, not_started};
+        Pid ->
+            do_stop(Port, Pid)
+    end;
+do_stop(Port, Pid)->
+    case find_service_pid_from_port(inets:services_info(), Port) of
+        undefined ->
+            {error, not_started};
+        Pid2 ->
+            Pid ! quit,
+            inets:stop(httpd, Pid2)
     end.
 
 %% @spec stop_webserver(integer()) -> ok | {error, not_started}
@@ -196,12 +213,7 @@ stop_webserver() ->
 %% @hidden
 
 stop_webserver(Port) ->
-    case find_service_pid_from_port(inets:services_info(), Port) of
-	undefined ->
-	    {error, not_started};
-	Pid ->
-	    inets:stop(httpd, Pid)
-    end. 
+    do_stop(Port,[]).
 
 %%==========================================================================
 %%
diff --git a/lib/percept/src/percept_db.erl b/lib/percept/src/percept_db.erl
index edb0d79a29..52e9afb78f 100644
--- a/lib/percept/src/percept_db.erl
+++ b/lib/percept/src/percept_db.erl
@@ -33,7 +33,7 @@
 	]).
 
 -include("percept.hrl").
-
+-define(STOP_TIMEOUT, 1000).
 %%==========================================================================
 %%
 %% 		Type definitions 
@@ -77,17 +77,32 @@
 start() ->
     case erlang:whereis(percept_db) of
     	undefined ->
-	    Pid = spawn( fun() -> init_percept_db() end),
-	    erlang:register(percept_db, Pid),
-	    {started, Pid};
+	    {started, do_start()};
 	PerceptDB ->
-	    erlang:unregister(percept_db),
-	    PerceptDB ! {action, stop},
-	    Pid = spawn( fun() -> init_percept_db() end),
-	    erlang:register(percept_db, Pid),
-	    {restarted, Pid}
+	    {restarted, restart(PerceptDB)}
     end.
 
+%% @spec restart(pid()) -> pid()
+%% @private
+%% @doc restarts the percept database.
+
+-spec restart(pid())-> pid().
+
+restart(PerceptDB)->
+        stop_sync(PerceptDB),
+        do_start().
+
+%% @spec do_start(pid()) -> pid()
+%% @private
+%% @doc starts the percept database.
+
+-spec do_start()-> pid().
+
+do_start()->
+    Pid = spawn( fun() -> init_percept_db() end),
+    erlang:register(percept_db, Pid),
+    Pid.
+
 %% @spec stop() -> not_started | {stopped, Pid}
 %%	Pid = pid()
 %% @doc Stops the percept database.
@@ -103,6 +118,22 @@ stop() ->
 	    {stopped, Pid}
     end.
 
+%% @spec stop_sync(pid()) -> true
+%% @private
+%% @doc Stops the percept database, with a synchronous call.
+
+-spec stop_sync(pid())-> true.
+
+stop_sync(Pid)->
+    MonitorRef = erlang:monitor(process, Pid),
+    stop(),
+    receive
+        {'DOWN', MonitorRef, _Type, Pid, _Info}->
+            true
+    after ?STOP_TIMEOUT->
+            exit(Pid, kill)
+    end.
+
 %% @spec insert(tuple()) -> ok
 %% @doc Inserts a trace or profile message to the database.