summaryrefslogtreecommitdiff
path: root/toolkit/xre
diff options
context:
space:
mode:
Diffstat (limited to 'toolkit/xre')
-rw-r--r--toolkit/xre/EventTracer.cpp35
-rw-r--r--toolkit/xre/nsEmbedFunctions.cpp2
-rw-r--r--toolkit/xre/nsUpdateDriver.cpp144
-rw-r--r--toolkit/xre/nsXREDirProvider.cpp12
4 files changed, 5 insertions, 188 deletions
diff --git a/toolkit/xre/EventTracer.cpp b/toolkit/xre/EventTracer.cpp
index cb0d88524d..f1118f1b27 100644
--- a/toolkit/xre/EventTracer.cpp
+++ b/toolkit/xre/EventTracer.cpp
@@ -65,12 +65,6 @@
#include <prthread.h>
#include <prtime.h>
-#ifdef MOZ_WIDGET_GONK
-#include "nsThreadUtils.h"
-#include "nsIObserverService.h"
-#include "mozilla/Services.h"
-#endif
-
using mozilla::TimeDuration;
using mozilla::TimeStamp;
using mozilla::FireAndWaitForTracerEvent;
@@ -85,31 +79,6 @@ struct TracerStartClosure {
int32_t mThresholdInterval;
};
-#ifdef MOZ_WIDGET_GONK
-class EventLoopLagDispatcher : public Runnable
-{
- public:
- explicit EventLoopLagDispatcher(int aLag)
- : mLag(aLag) {}
-
- NS_IMETHOD Run() override
- {
- nsCOMPtr<nsIObserverService> obsService =
- mozilla::services::GetObserverService();
- if (!obsService) {
- return NS_ERROR_FAILURE;
- }
-
- nsAutoString value;
- value.AppendInt(mLag);
- return obsService->NotifyObservers(nullptr, "event-loop-lag", value.get());
- }
-
- private:
- int mLag;
-};
-#endif
-
/*
* The tracer thread fires events at the native event loop roughly
* every kMeasureInterval. It will sleep to attempt not to send them
@@ -180,10 +149,6 @@ void TracerThread(void *arg)
fprintf(log, "MOZ_EVENT_TRACE sample %llu %lf\n",
now,
duration.ToMilliseconds());
-#ifdef MOZ_WIDGET_GONK
- NS_DispatchToMainThread(
- new EventLoopLagDispatcher(int(duration.ToSecondsSigDigits() * 1000)));
-#endif
}
if (next_sleep > duration.ToMilliseconds()) {
diff --git a/toolkit/xre/nsEmbedFunctions.cpp b/toolkit/xre/nsEmbedFunctions.cpp
index a59299c8bc..f62dbdd6dd 100644
--- a/toolkit/xre/nsEmbedFunctions.cpp
+++ b/toolkit/xre/nsEmbedFunctions.cpp
@@ -255,7 +255,7 @@ XRE_InitChildProcess(int aArgc,
setupProfilingStuff();
#endif
-#if !defined(MOZ_WIDGET_ANDROID) && !defined(MOZ_WIDGET_GONK)
+#if !defined(MOZ_WIDGET_ANDROID)
// On non-Fennec Gecko, the GMPLoader code resides in plugin-container,
// and we must forward it through to the GMP code here.
GMPProcessChild::SetGMPLoader(aChildData->gmpLoader.get());
diff --git a/toolkit/xre/nsUpdateDriver.cpp b/toolkit/xre/nsUpdateDriver.cpp
index 54a7110000..ab0bdf005a 100644
--- a/toolkit/xre/nsUpdateDriver.cpp
+++ b/toolkit/xre/nsUpdateDriver.cpp
@@ -74,23 +74,6 @@ GetUpdateLog()
#define UPDATER_PNG "updater.png"
#endif
-#if defined(MOZ_WIDGET_GONK)
-#include <linux/ioprio.h>
-
-static const int kB2GServiceArgc = 2;
-static const char *kB2GServiceArgv[] = { "/system/bin/start", "b2g" };
-
-static const char kAppUpdaterPrio[] = "app.update.updater.prio";
-static const char kAppUpdaterOomScoreAdj[] = "app.update.updater.oom_score_adj";
-static const char kAppUpdaterIOPrioClass[] = "app.update.updater.ioprio.class";
-static const char kAppUpdaterIOPrioLevel[] = "app.update.updater.ioprio.level";
-
-static const int kAppUpdaterPrioDefault = 19; // -20..19 where 19 = lowest priority
-static const int kAppUpdaterOomScoreAdjDefault = -1000; // -1000 = Never kill
-static const int kAppUpdaterIOPrioClassDefault = IOPRIO_CLASS_IDLE;
-static const int kAppUpdaterIOPrioLevelDefault = 0; // Doesn't matter for CLASS IDLE
-#endif
-
static nsresult
GetCurrentWorkingDir(char *buf, size_t size)
{
@@ -387,7 +370,7 @@ CopyUpdaterIntoUpdateDir(nsIFile *greDir, nsIFile *appDir, nsIFile *updateDir,
* @param pathToAppend A new library path to prepend to LD_LIBRARY_PATH
*/
#if defined(MOZ_VERIFY_MAR_SIGNATURE) && !defined(XP_WIN) && \
- !defined(XP_MACOSX) && !defined(MOZ_WIDGET_GONK)
+ !defined(XP_MACOSX)
#include "prprf.h"
#define PATH_SEPARATOR ":"
#define LD_LIBRARY_PATH_ENVVAR_NAME "LD_LIBRARY_PATH"
@@ -503,15 +486,9 @@ SwitchToUpdatedApp(nsIFile *greDir, nsIFile *updateDir,
#else
nsAutoCString appFilePath;
-#if defined(MOZ_WIDGET_GONK)
- appFilePath.Assign(kB2GServiceArgv[0]);
- appArgc = kB2GServiceArgc;
- appArgv = const_cast<char**>(kB2GServiceArgv);
-#else
rv = appFile->GetNativePath(appFilePath);
if (NS_FAILED(rv))
return;
-#endif
nsAutoCString updaterPath;
rv = updater->GetNativePath(updaterPath);
@@ -617,19 +594,13 @@ SwitchToUpdatedApp(nsIFile *greDir, nsIFile *updateDir,
PR_SetEnv("MOZ_SAFE_MODE_RESTART=1");
}
#if defined(MOZ_VERIFY_MAR_SIGNATURE) && !defined(XP_WIN) && \
- !defined(XP_MACOSX) && !defined(MOZ_WIDGET_GONK)
+ !defined(XP_MACOSX)
AppendToLibPath(installDirPath.get());
#endif
LOG(("spawning updater process for replacing [%s]\n", updaterPath.get()));
#if defined(XP_UNIX) & !defined(XP_MACOSX)
-# if defined(MOZ_WIDGET_GONK)
- // In Gonk, we preload libmozglue, which the updater process doesn't need.
- // Since the updater will move and delete libmozglue.so, this can actually
- // stop the /system mount from correctly being remounted as read-only.
- unsetenv("LD_PRELOAD");
-# endif
exit(execv(updaterPath.get(), argv));
#elif defined(XP_WIN)
// Switch the application using updater.exe
@@ -647,46 +618,6 @@ SwitchToUpdatedApp(nsIFile *greDir, nsIFile *updateDir,
#endif
}
-#if defined(MOZ_WIDGET_GONK)
-static nsresult
-GetOSApplyToDir(nsACString& applyToDir)
-{
- nsCOMPtr<nsIProperties> ds =
- do_GetService(NS_DIRECTORY_SERVICE_CONTRACTID);
- NS_ASSERTION(ds, "Can't get directory service");
-
- nsCOMPtr<nsIFile> osApplyToDir;
- nsresult rv = ds->Get(XRE_OS_UPDATE_APPLY_TO_DIR, NS_GET_IID(nsIFile),
- getter_AddRefs(osApplyToDir));
- if (NS_FAILED(rv)) {
- LOG(("Can't get the OS applyTo dir"));
- return rv;
- }
-
- return osApplyToDir->GetNativePath(applyToDir);
-}
-
-static void
-SetOSApplyToDir(nsIUpdate* update, const nsACString& osApplyToDir)
-{
- nsresult rv;
- nsCOMPtr<nsIWritablePropertyBag> updateProperties =
- do_QueryInterface(update, &rv);
-
- if (NS_FAILED(rv)) {
- return;
- }
-
- RefPtr<nsVariant> variant = new nsVariant();
- rv = variant->SetAsACString(osApplyToDir);
- if (NS_FAILED(rv)) {
- return;
- }
-
- updateProperties->SetProperty(NS_LITERAL_STRING("osApplyToDir"), variant);
-}
-#endif
-
/**
* Apply an update. This applies to both normal and staged updates.
*
@@ -780,13 +711,9 @@ ApplyUpdate(nsIFile *greDir, nsIFile *updateDir, nsIFile *statusFile,
if (NS_FAILED(rv))
return;
- // Get the directory where the update was staged for replace and GONK OS
- // Updates or where it will be applied.
-#ifndef MOZ_WIDGET_GONK
- // OS Updates are only supported on GONK so force it to false on everything
+ // OS Updates were only supported on GONK so force it to false on everything
// but GONK to simplify the following logic.
isOSUpdate = false;
-#endif
nsAutoCString applyToDir;
nsCOMPtr<nsIFile> updatedDir;
if (restart && !isOSUpdate) {
@@ -806,15 +733,6 @@ ApplyUpdate(nsIFile *greDir, nsIFile *updateDir, nsIFile *statusFile,
return;
}
applyToDir = NS_ConvertUTF16toUTF8(applyToDirW);
-#elif MOZ_WIDGET_GONK
- if (isOSUpdate) {
- if (!osApplyToDir) {
- return;
- }
- rv = osApplyToDir->GetNativePath(applyToDir);
- } else {
- rv = updatedDir->GetNativePath(applyToDir);
- }
#else
rv = updatedDir->GetNativePath(applyToDir);
#endif
@@ -900,33 +818,13 @@ ApplyUpdate(nsIFile *greDir, nsIFile *updateDir, nsIFile *statusFile,
PR_SetEnv("MOZ_SAFE_MODE_RESTART=1");
}
#if defined(MOZ_VERIFY_MAR_SIGNATURE) && !defined(XP_WIN) && \
- !defined(XP_MACOSX) && !defined(MOZ_WIDGET_GONK)
+ !defined(XP_MACOSX)
AppendToLibPath(installDirPath.get());
#endif
if (isOSUpdate) {
PR_SetEnv("MOZ_OS_UPDATE=1");
}
-#if defined(MOZ_WIDGET_GONK)
- // We want the updater to be CPU friendly and not subject to being killed by
- // the low memory killer, so we pass in some preferences to allow it to
- // adjust its priority.
-
- int32_t prioVal = Preferences::GetInt(kAppUpdaterPrio,
- kAppUpdaterPrioDefault);
- int32_t oomScoreAdj = Preferences::GetInt(kAppUpdaterOomScoreAdj,
- kAppUpdaterOomScoreAdjDefault);
- int32_t ioprioClass = Preferences::GetInt(kAppUpdaterIOPrioClass,
- kAppUpdaterIOPrioClassDefault);
- int32_t ioprioLevel = Preferences::GetInt(kAppUpdaterIOPrioLevel,
- kAppUpdaterIOPrioLevelDefault);
- nsPrintfCString prioEnv("MOZ_UPDATER_PRIO=%d/%d/%d/%d",
- prioVal, oomScoreAdj, ioprioClass, ioprioLevel);
- // Note: we allocate a new string on heap and pass that to PR_SetEnv, since
- // the string can be used after this function returns. This means that we
- // will intentionally leak this buffer.
- PR_SetEnv(ToNewCString(prioEnv));
-#endif
LOG(("spawning updater process [%s]\n", updaterPath.get()));
@@ -1122,12 +1020,6 @@ nsUpdateProcessor::ProcessUpdate(nsIUpdate* aUpdate)
// Check for and process any available updates
bool persistent;
nsresult rv = NS_ERROR_FAILURE; // Take the NS_FAILED path when non-GONK
-#ifdef MOZ_WIDGET_GONK
- // Check in the sdcard for updates first, since that's our preferred
- // download location.
- rv = dirProvider->GetFile(XRE_UPDATE_ARCHIVE_DIR, &persistent,
- getter_AddRefs(updRoot));
-#endif
if (NS_FAILED(rv)) {
rv = dirProvider->GetFile(XRE_UPDATE_ROOT_DIR, &persistent,
getter_AddRefs(updRoot));
@@ -1217,34 +1109,6 @@ nsUpdateProcessor::ProcessUpdate(nsIUpdate* aUpdate)
}
mInfo.mAppVersion = appVersion;
-#if defined(MOZ_WIDGET_GONK)
- NS_ENSURE_ARG_POINTER(aUpdate);
-
- bool isOSUpdate;
- if (NS_SUCCEEDED(aUpdate->GetIsOSUpdate(&isOSUpdate)) &&
- isOSUpdate) {
- nsAutoCString osApplyToDir;
-
- // This needs to be done on the main thread, so we pass it along in
- // BackgroundThreadInfo
- nsresult rv = GetOSApplyToDir(osApplyToDir);
- if (NS_FAILED(rv)) {
- LOG(("Can't get the OS apply to dir"));
- return rv;
- }
-
- SetOSApplyToDir(aUpdate, osApplyToDir);
-
- mInfo.mIsOSUpdate = true;
- rv = NS_NewNativeLocalFile(osApplyToDir, false,
- getter_AddRefs(mInfo.mOSApplyToDir));
- if (NS_FAILED(rv)) {
- LOG(("Can't create nsIFile for OS apply to dir"));
- return rv;
- }
- }
-#endif
-
MOZ_ASSERT(NS_IsMainThread(), "not main thread");
nsCOMPtr<nsIRunnable> r = NewRunnableMethod(this, &nsUpdateProcessor::StartStagedUpdate);
return NS_NewThread(getter_AddRefs(mProcessWatcher), r);
diff --git a/toolkit/xre/nsXREDirProvider.cpp b/toolkit/xre/nsXREDirProvider.cpp
index f2d0b1b0f2..d904cb83a9 100644
--- a/toolkit/xre/nsXREDirProvider.cpp
+++ b/toolkit/xre/nsXREDirProvider.cpp
@@ -1122,14 +1122,6 @@ nsresult
nsXREDirProvider::GetUpdateRootDir(nsIFile* *aResult)
{
nsCOMPtr<nsIFile> updRoot;
-#if defined(MOZ_WIDGET_GONK)
-
- nsresult rv = NS_NewNativeLocalFile(nsDependentCString("/data/local"),
- true,
- getter_AddRefs(updRoot));
- NS_ENSURE_SUCCESS(rv, rv);
-
-#else
nsCOMPtr<nsIFile> appFile;
bool per = false;
nsresult rv = GetFile(XRE_EXECUTABLE_FILE, &per, getter_AddRefs(appFile));
@@ -1261,7 +1253,6 @@ nsXREDirProvider::GetUpdateRootDir(nsIFile* *aResult)
NS_ENSURE_SUCCESS(rv, rv);
#endif // XP_WIN
-#endif
updRoot.forget(aResult);
return NS_OK;
}
@@ -1365,9 +1356,6 @@ nsXREDirProvider::GetUserDataDirectoryHome(nsIFile** aFile, bool aLocal)
NS_ENSURE_SUCCESS(rv, rv);
rv = NS_NewLocalFile(path, true, getter_AddRefs(localDir));
-#elif defined(MOZ_WIDGET_GONK)
- rv = NS_NewNativeLocalFile(NS_LITERAL_CSTRING("/data/b2g"), true,
- getter_AddRefs(localDir));
#elif defined(XP_UNIX)
const char* homeDir = getenv("HOME");
if (!homeDir || !*homeDir)
generated by cgit v1.2.3 (git 2.26.2) at 2024-11-10 06:32:33 +0000