head	1.2;
access;
symbols
	pkgsrc-2020Q1:1.1.0.4
	pkgsrc-2020Q1-base:1.1
	pkgsrc-2019Q4:1.1.0.6
	pkgsrc-2019Q4-base:1.1
	pkgsrc-2019Q3:1.1.0.2
	pkgsrc-2019Q3-base:1.1;
locks; strict;
comment	@// @;


1.2
date	2020.06.07.10.27.12;	author nia;	state dead;
branches;
next	1.1;
commitid	hX8vqmcpfsaonhbC;

1.1
date	2019.09.21.11.23.28;	author ryoon;	state Exp;
branches;
next	;
commitid	mY1wfmq9fOmp3SDB;


desc
@@


1.2
log
@mail: Remove thunderbird60 - EOL

Note: the release strategy of Thunderbird has changed and there
will be no more non-extended-support releases, so mail/thunderbird
contains the most recent extended support release, derived from firefox68
@
text
@$NetBSD: patch-ipc_glue_CrossProcessSemaphore__posix.cpp,v 1.1 2019/09/21 11:23:28 ryoon Exp $

--- ipc/glue/CrossProcessSemaphore_posix.cpp.orig	2019-02-13 14:19:38.000000000 +0000
+++ ipc/glue/CrossProcessSemaphore_posix.cpp
@@@@ -9,6 +9,11 @@@@
 #include "nsDebug.h"
 #include "nsISupportsImpl.h"
 #include <errno.h>
+#if defined(__NetBSD__)
+#include <iostream>
+#include <unistd.h>
+#include <limits>
+#endif
 
 static const uint64_t kNsPerMs = 1000000;
 static const uint64_t kNsPerSec = 1000000000;
@@@@ -16,7 +21,13 @@@@ static const uint64_t kNsPerSec = 100000
 namespace {
 
 struct SemaphoreData {
+#if defined(__NetBSD__)
+  pthread_mutex_t mMutex;
+  pthread_cond_t mNotZero;
+  uint32_t mValue;
+#else
   sem_t mSemaphore;
+#endif
   mozilla::Atomic<int32_t> mRefCount;
   uint32_t mInitialValue;
 };
@@@@ -42,13 +53,27 @@@@ namespace mozilla {
     return nullptr;
   }
 
+#if defined(__NetBSD__)
+  data->mValue = aInitialValue;
+  if (pthread_mutex_init(&data->mMutex, NULL) ||
+      pthread_cond_init(&data->mNotZero, NULL) ) {
+    return nullptr;
+  }
+#else
   if (sem_init(&data->mSemaphore, 1, aInitialValue)) {
     return nullptr;
   }
+#endif
 
   CrossProcessSemaphore* sem = new CrossProcessSemaphore;
   sem->mSharedBuffer = sharedBuffer;
+#if defined(__NetBSD__)
+  sem->mMutex = &data->mMutex;
+  sem->mNotZero = &data->mNotZero;
+  sem->mValue = &data->mValue;
+#else
   sem->mSemaphore = &data->mSemaphore;
+#endif
   sem->mRefCount = &data->mRefCount;
   *sem->mRefCount = 1;
 
@@@@ -83,23 +108,44 @@@@ namespace mozilla {
 
   int32_t oldCount = data->mRefCount++;
   if (oldCount == 0) {
+#if defined(__NetBSD__)
+    if (pthread_mutex_init(&data->mMutex, NULL) ||
+        pthread_cond_init(&data->mNotZero, NULL) ) {
+      data->mRefCount--;
+      return nullptr;
+    }
+#else
     // The other side has already let go of their CrossProcessSemaphore, so now
     // mSemaphore is garbage. We need to re-initialize it.
     if (sem_init(&data->mSemaphore, 1, data->mInitialValue)) {
       data->mRefCount--;
       return nullptr;
     }
+#endif
   }
 
   CrossProcessSemaphore* sem = new CrossProcessSemaphore;
   sem->mSharedBuffer = sharedBuffer;
+#if defined(__NetBSD__)
+  sem->mMutex = &data->mMutex;
+  sem->mNotZero = &data->mNotZero;
+  sem->mValue = &data->mValue;
+#else
   sem->mSemaphore = &data->mSemaphore;
+#endif
   sem->mRefCount = &data->mRefCount;
   return sem;
 }
 
 CrossProcessSemaphore::CrossProcessSemaphore()
-    : mSemaphore(nullptr), mRefCount(nullptr) {
+#if defined(__NetBSD__)
+    : mMutex (nullptr)
+    , mNotZero (nullptr)
+    , mValue (nullptr)
+#else
+    : mSemaphore(nullptr)
+#endif
+    , mRefCount(nullptr) {
   MOZ_COUNT_CTOR(CrossProcessSemaphore);
 }
 
@@@@ -108,16 +154,57 @@@@ CrossProcessSemaphore::~CrossProcessSema
 
   if (oldCount == 0) {
     // Nothing can be done if the destroy fails so ignore return code.
+#if defined(__NetBSD__)
+    (void)pthread_cond_destroy(mNotZero);
+    (void)pthread_mutex_destroy(mMutex);
+#else
     Unused << sem_destroy(mSemaphore);
+#endif
   }
 
   MOZ_COUNT_DTOR(CrossProcessSemaphore);
 }
 
+#if defined(__NetBSD__)
+static struct timespec
+makeAbsTime(const Maybe<TimeDuration>& aWaitTime) {
+  struct timespec ts;
+  if (aWaitTime.isSome()) {
+    clock_gettime(CLOCK_REALTIME, &ts);
+    ts.tv_nsec += (kNsPerMs * aWaitTime->ToMilliseconds());
+    ts.tv_sec += ts.tv_nsec / kNsPerSec;
+    ts.tv_nsec %= kNsPerSec;
+  }
+  else {
+    ts.tv_sec = std::numeric_limits<time_t>::max();
+    ts.tv_nsec = 0;
+  }
+  return ts;
+}
+#endif
+
 bool CrossProcessSemaphore::Wait(const Maybe<TimeDuration>& aWaitTime) {
   MOZ_ASSERT(*mRefCount > 0,
              "Attempting to wait on a semaphore with zero ref count");
   int ret;
+#if defined(__NetBSD__)
+  struct timespec ts = makeAbsTime(aWaitTime);
+
+  ret = pthread_mutex_lock(mMutex);
+
+  if (ret == 0) {
+    while (ret == 0 && mValue == 0) {
+      ret = pthread_cond_timedwait(mNotZero, mMutex, &ts);
+      while (ret == -1 && errno == EINTR) {
+        ret = pthread_cond_timedwait(mNotZero, mMutex, &ts);
+      }
+    }
+    if (ret == 0) {
+      --(*mValue);
+    }
+    pthread_mutex_unlock(mMutex);
+  }
+#else
   if (aWaitTime.isSome()) {
     struct timespec ts;
     if (clock_gettime(CLOCK_REALTIME, &ts) == -1) {
@@@@ -134,13 +221,24 @@@@ bool CrossProcessSemaphore::Wait(const M
     while ((ret = sem_wait(mSemaphore)) == -1 && errno == EINTR) {
     }
   }
+#endif
   return ret == 0;
 }
 
 void CrossProcessSemaphore::Signal() {
   MOZ_ASSERT(*mRefCount > 0,
              "Attempting to signal a semaphore with zero ref count");
+#if defined(__NetBSD__)
+  int ret;
+  ret = pthread_mutex_lock(mMutex);
+  if (ret == 0) {
+    ++(*mValue);
+    pthread_cond_signal(mNotZero);
+    pthread_mutex_unlock(mMutex);
+  }
+#else
   sem_post(mSemaphore);
+#endif
 }
 
 CrossProcessSemaphoreHandle CrossProcessSemaphore::ShareToProcess(
@


1.1
log
@mail/thunderbird60: import thunderbird60-60.9.0

Mozilla Thunderbird is a redesign of the Mozilla mail component. The
goal is to produce a cross platform stand alone mail application using
the XUL user interface language. This version uses the gtk2 toolkit.

This package provides Thunderbird 60 ESR.
@
text
@d1 1
a1 1
$NetBSD: patch-ipc_glue_CrossProcessSemaphore__posix.cpp,v 1.2 2019/02/26 11:32:13 ryoon Exp $
@