Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

major unix cleanup:

Browse Source 
1) introduce /tmp/.mozilla-ipc-$USER/ directory for socket and lock file
2) cleaned up daemon startup and shutdown sequences


git-svn-id: svn://10.0.0.236/trunk@133024 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
darin%netscape.com
2002-11-05 19:42:22 +00:00
parent 0b5a1690a7
commit cf4102aedd
10 changed files with 311 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
mozilla/modules/ipc/src/ipcService.cpp
View File

@@ -35,9 +35,18 @@
*
* ***** END LICENSE BLOCK ***** */
#ifdef XP_UNIX
#include <pwd.h>
#include <unistd.h>
#include <sys/types.h>
#endif
#include "plstr.h"
#include "nsIFile.h"
#include "nsIServiceManager.h"
#include "nsDirectoryServiceUtils.h"
#include "nsDirectoryServiceDefs.h"
#include "nsIPrefService.h"
#include "nsIPrefBranch.h"
@@ -144,10 +153,12 @@ ipcService::Init()
if (appName.IsEmpty())
appName = NS_LITERAL_CSTRING("test-app");
// XXX use directory service to locate socket
rv = mTransport->Init(appName,
NS_LITERAL_CSTRING(IPC_DEFAULT_SOCKET_PATH),
this);
// get socket path from directory service
nsCAutoString socketPath;
if (NS_FAILED(GetSocketPath(socketPath)))
socketPath = NS_LITERAL_CSTRING(IPC_DEFAULT_SOCKET_PATH);
rv = mTransport->Init(appName, socketPath, this);
if (NS_FAILED(rv)) return rv;
return NS_OK;
@@ -180,12 +191,34 @@ ipcService::HandleQueryResult(const ipcMessage *rawMsg, PRBool succeeded)
info = nsnull;
}
query->mObserver->OnClientStatus(query->mReqToken, info, cStatus);
query->mObserver->OnClientStatus(query->mReqToken, cStatus, info);
NS_IF_RELEASE(info);
mQueryQ.DeleteFirst();
}
nsresult
ipcService::GetSocketPath(nsACString &socketPath)
{
nsCOMPtr<nsIFile> file;
NS_GetSpecialDirectory(NS_OS_TEMP_DIR, getter_AddRefs(file));
if (!file)
return NS_ERROR_FAILURE;
#ifdef XP_UNIX
// XXX may want to use getpwuid_r when available
struct passwd *pw = getpwuid(geteuid());
if (!pw)
return NS_ERROR_UNEXPECTED;
nsCAutoString leaf;
leaf = NS_LITERAL_CSTRING(".mozilla-ipc-")
+ nsDependentCString(pw->pw_name);
file->AppendNative(leaf);
#endif
file->AppendNative(NS_LITERAL_CSTRING("ipcd"));
file->GetNativePath(socketPath);
return NS_OK;
}
//-----------------------------------------------------------------------------
// interface impl
//-----------------------------------------------------------------------------