зеркало из https://github.com/mozilla/gecko-dev.git
Initial check-in of Photon timers that support the new features
like priority and repeatability.
This commit is contained in:
Jerry.Kirk%Nexwarecorp.com
Родитель
52b312047c
Коммит
96fe780ab2
|
|
@ -0,0 +1,54 @@
|
|||
#
|
||||
# The contents of this file are subject to the Netscape Public
|
||||
# License Version 1.1 (the "License"); you may not use this file
|
||||
# except in compliance with the License. You may obtain a copy of
|
||||
# the License at http://www.mozilla.org/NPL/
|
||||
#
|
||||
# Software distributed under the License is distributed on an "AS
|
||||
# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
|
||||
# implied. See the License for the specific language governing
|
||||
# rights and limitations under the License.
|
||||
#
|
||||
# The Original Code is mozilla.org code.
|
||||
#
|
||||
# The Initial Developer of the Original Code is Netscape
|
||||
# Communications Corporation. Portions created by Netscape are
|
||||
# Copyright (C) 1998 Netscape Communications Corporation. All
|
||||
# Rights Reserved.
|
||||
#
|
||||
# Contributor(s):
|
||||
#
|
||||
|
||||
DEPTH = ../../../../..
|
||||
topsrcdir = @top_srcdir@
|
||||
srcdir = @srcdir@
|
||||
VPATH = @srcdir@
|
||||
|
||||
include $(DEPTH)/config/autoconf.mk
|
||||
|
||||
LIBRARY_NAME = timer_$(TIMER_SUFFIX)
|
||||
|
||||
REQUIRES = xpcom
|
||||
|
||||
CPPSRCS = nsTimerPh.cpp
|
||||
|
||||
ifndef MOZ_MONOLITHIC_TOOLKIT
|
||||
TIMER_SUFFIX = photon
|
||||
IS_COMPONENT = 1
|
||||
CPPSRCS += nsTimerPhFactory.cpp
|
||||
EXTRA_DSO_LDOPTS = $(MOZ_COMPONENT_LIBS)
|
||||
else
|
||||
TIMER_SUFFIX = s
|
||||
override NO_SHARED_LIB=1
|
||||
override NO_STATIC_LIB=
|
||||
endif
|
||||
|
||||
include $(topsrcdir)/config/rules.mk
|
||||
|
||||
ifndef MOZ_MONOLITHIC_TOOLKIT
|
||||
INCLUDES += $(MOZ_PH_CFLAGS) -I$(srcdir)/..
|
||||
else
|
||||
CXXFLAGS += $(TK_CFLAGS) -DDEBUG -gdwarf-2
|
||||
INCLUDES += $(TK_CFLAGS) -I$(srcdir)/..
|
||||
endif
|
||||
|
||||
|
|
@ -0,0 +1,355 @@
|
|||
/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
|
||||
*
|
||||
* The contents of this file are subject to the Netscape Public
|
||||
* License Version 1.1 (the "License"); you may not use this file
|
||||
* except in compliance with the License. You may obtain a copy of
|
||||
* the License at http://www.mozilla.org/NPL/
|
||||
*
|
||||
* Software distributed under the License is distributed on an "AS
|
||||
* IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
|
||||
* implied. See the License for the specific language governing
|
||||
* rights and limitations under the License.
|
||||
*
|
||||
* The Original Code is mozilla.org code.
|
||||
*
|
||||
* The Initial Developer of the Original Code is Netscape
|
||||
* Communications Corporation. Portions created by Netscape are
|
||||
* Copyright (C) 1998 Netscape Communications Corporation. All
|
||||
* Rights Reserved.
|
||||
*
|
||||
* Contributor(s):
|
||||
* Alexander Larsson (alla@lysator.liu.se)
|
||||
* Jerry L. Kirk (Jerry.Kirk@Nexwarecorp.com)
|
||||
*/
|
||||
|
||||
#include "nsTimerPh.h"
|
||||
|
||||
/* Use the Widget Debug log */
|
||||
#include "prlog.h"
|
||||
#include <errno.h>
|
||||
struct PRLogModuleInfo *PhTimLog = nsnull;
|
||||
|
||||
static NS_DEFINE_IID(kITimerIID, NS_ITIMER_IID);
|
||||
|
||||
|
||||
PRBool nsTimerPh::FireTimeout()
|
||||
{
|
||||
PR_LOG(PhTimLog, PR_LOG_DEBUG, ("nsTimerPh::FireTimeout this=<%p>\n", this));
|
||||
|
||||
if (mFunc != NULL) {
|
||||
(*mFunc)(this, mClosure);
|
||||
}
|
||||
else if (mCallback != NULL) {
|
||||
mCallback->Notify(this); // Fire the timer
|
||||
}
|
||||
|
||||
return (mType == NS_TYPE_REPEATING_SLACK);
|
||||
}
|
||||
|
||||
void nsTimerPh::SetDelay(PRUint32 aDelay)
|
||||
{
|
||||
PR_LOG(PhTimLog, PR_LOG_DEBUG, ("nsTimerPh::SetDelay this=<%p> aDelay=<%d>\n", this, aDelay));
|
||||
|
||||
if (aDelay!=mDelay)
|
||||
{
|
||||
int err;
|
||||
Cancel();
|
||||
mDelay=aDelay;
|
||||
err=SetupTimer();
|
||||
}
|
||||
};
|
||||
|
||||
void nsTimerPh::SetPriority(PRUint32 aPriority)
|
||||
{
|
||||
PR_LOG(PhTimLog, PR_LOG_DEBUG, ("nsTimerPh::SetPriority this=<%p> aPriority=<%d>\n", this, aPriority));
|
||||
|
||||
if (aPriority!=mPriority)
|
||||
{
|
||||
int err;
|
||||
Cancel();
|
||||
mPriority = aPriority;
|
||||
err=SetupTimer();
|
||||
}
|
||||
}
|
||||
|
||||
void nsTimerPh::SetType(PRUint32 aType)
|
||||
{
|
||||
PR_LOG(PhTimLog, PR_LOG_DEBUG, ("nsTimerPh::SetType this=<%p> aType=<%d>\n", this, aType));
|
||||
|
||||
if (aType!=mType)
|
||||
{
|
||||
int err;
|
||||
Cancel();
|
||||
mType = aType;
|
||||
err=SetupTimer();
|
||||
}
|
||||
}
|
||||
|
||||
nsTimerPh::nsTimerPh()
|
||||
{
|
||||
|
||||
#ifdef DEBUG
|
||||
if (!PhTimLog)
|
||||
{
|
||||
PhTimLog = PR_NewLogModule("PhTimLog");
|
||||
}
|
||||
#endif
|
||||
|
||||
PR_LOG(PhTimLog, PR_LOG_DEBUG, ("nsTimerPh::nsTimerPh this=<%p>\n", this));
|
||||
|
||||
NS_INIT_REFCNT();
|
||||
mFunc = NULL;
|
||||
mCallback = NULL;
|
||||
mNext = NULL;
|
||||
mTimerId = -1;
|
||||
mDelay = 0;
|
||||
mClosure = NULL;
|
||||
mPriority = 0;
|
||||
mType = NS_TYPE_ONE_SHOT;
|
||||
mPulsePid = 0;
|
||||
mPulseMsgId = NULL;
|
||||
mInputId = NULL;
|
||||
}
|
||||
|
||||
nsTimerPh::~nsTimerPh()
|
||||
{
|
||||
PR_LOG(PhTimLog, PR_LOG_DEBUG, ("nsTimerPh::~nsTimerPh this=<%p>\n", this));
|
||||
|
||||
Cancel();
|
||||
NS_IF_RELEASE(mCallback);
|
||||
}
|
||||
|
||||
nsresult
|
||||
nsTimerPh::Init(nsTimerCallbackFunc aFunc,
|
||||
void *aClosure,
|
||||
PRUint32 aDelay,
|
||||
PRUint32 aPriority,
|
||||
PRUint32 aType
|
||||
)
|
||||
{
|
||||
PR_LOG(PhTimLog, PR_LOG_DEBUG, ("nsTimerPh::Init this=<%p> aClosure=<%p> aDelay=<%d> aPriority=<%d> aType=<%d>\n", this, aClosure,
|
||||
aDelay, aPriority, aType));
|
||||
int err;
|
||||
|
||||
mFunc = aFunc;
|
||||
mClosure = aClosure;
|
||||
mPriority = aPriority;
|
||||
mType = aType;
|
||||
mDelay = aDelay;
|
||||
|
||||
err = SetupTimer();
|
||||
//mTimerId = g_timeout_add_full(calc_priority(mPriority),mDelay, nsTimerExpired, this, NULL);
|
||||
|
||||
return err;
|
||||
}
|
||||
|
||||
nsresult
|
||||
nsTimerPh::Init(nsITimerCallback *aCallback,
|
||||
PRUint32 aDelay,
|
||||
PRUint32 aPriority,
|
||||
PRUint32 aType
|
||||
)
|
||||
{
|
||||
PR_LOG(PhTimLog, PR_LOG_DEBUG, ("nsTimerPh::Init this=<%p> aDelay=<%d> aPriority=<%d> aType=<%d>\n", this,
|
||||
aDelay, aPriority, aType));
|
||||
|
||||
int err;
|
||||
mCallback = aCallback;
|
||||
NS_ADDREF(mCallback);
|
||||
mPriority = aPriority;
|
||||
mType = aType;
|
||||
mDelay = aDelay;
|
||||
|
||||
err = SetupTimer();
|
||||
//mTimerId = g_timeout_add_full(calc_priority(mPriority), mDelay, nsTimerExpired, this, NULL);
|
||||
|
||||
return err;
|
||||
}
|
||||
|
||||
NS_IMPL_ISUPPORTS(nsTimerPh, kITimerIID)
|
||||
|
||||
void
|
||||
nsTimerPh::Cancel()
|
||||
{
|
||||
PR_LOG(PhTimLog, PR_LOG_DEBUG, ("nsTimerPh::Cancel this=<%p>\n", this));
|
||||
int err;
|
||||
|
||||
if( mTimerId >= 0)
|
||||
{
|
||||
err = timer_delete( mTimerId );
|
||||
if (err < 0)
|
||||
{
|
||||
char buf[256];
|
||||
sprintf(buf, "TimerImpl::Cancel Failed in timer_delete mTimerId=<%d> err=<%d> errno=<%d>", mTimerId, err, errno);
|
||||
//NS_ASSERTION(0,"TimerImpl::Cancel Failed in timer_delete");
|
||||
NS_ASSERTION(0,buf);
|
||||
return;
|
||||
}
|
||||
|
||||
mTimerId = -1;
|
||||
}
|
||||
|
||||
if( mInputId )
|
||||
{
|
||||
PtAppRemoveInput( NULL, mInputId );
|
||||
mInputId = NULL;
|
||||
}
|
||||
|
||||
if( mPulseMsgId )
|
||||
{
|
||||
PtPulseDisarm( mPulseMsgId );
|
||||
mPulseMsgId = NULL;
|
||||
}
|
||||
|
||||
if( mPulsePid )
|
||||
{
|
||||
PtAppDeletePulse( NULL, mPulsePid );
|
||||
mPulsePid = 0;
|
||||
}
|
||||
}
|
||||
|
||||
// This is the timer handler that gets called by the Photon
|
||||
// input proc
|
||||
|
||||
int nsTimerPh::TimerEventHandler( void *aData, pid_t aRcvId, void *aMsg, size_t aMsgLen )
|
||||
{
|
||||
int localTimerId;
|
||||
|
||||
nsTimerPh* timer = (nsTimerPh *)aData;
|
||||
if( timer )
|
||||
{
|
||||
localTimerId = timer->mTimerId;
|
||||
|
||||
if( timer->mFunc != NULL )
|
||||
{
|
||||
(*timer->mFunc)( timer, timer->mClosure );
|
||||
}
|
||||
else if ( timer->mCallback != NULL )
|
||||
{
|
||||
timer->mCallback->Notify( timer );
|
||||
}
|
||||
|
||||
/* These stupid people destroy this object inside the callback */
|
||||
/* so don't do anything with it from here on */
|
||||
}
|
||||
|
||||
return Pt_CONTINUE;
|
||||
}
|
||||
|
||||
|
||||
|
||||
NS_METHOD nsTimerPh::SetupTimer()
|
||||
{
|
||||
PR_LOG(PhTimLog, PR_LOG_DEBUG, ("nsTimerPh::SetupTimer this=<%p>\n", this));
|
||||
|
||||
struct itimerspec tv;
|
||||
int err;
|
||||
|
||||
if( mPulsePid )
|
||||
{
|
||||
NS_ASSERTION(0,"TimerImpl::SetupTimer - reuse of timer not allowed!");
|
||||
return NS_ERROR_FAILURE;
|
||||
}
|
||||
int CurrentPriority = 10; /* How Do I get this?? */
|
||||
int NewPriority;
|
||||
|
||||
switch(mPriority)
|
||||
{
|
||||
case NS_PRIORITY_LOWEST:
|
||||
NewPriority = CurrentPriority - 2;
|
||||
break;
|
||||
case NS_PRIORITY_LOW:
|
||||
NewPriority = CurrentPriority - 1;
|
||||
break;
|
||||
case NS_PRIORITY_NORMAL:
|
||||
NewPriority = CurrentPriority;
|
||||
break;
|
||||
case NS_PRIORITY_HIGH:
|
||||
NewPriority = CurrentPriority +1;
|
||||
break;
|
||||
case NS_PRIORITY_HIGHEST:
|
||||
NewPriority = CurrentPriority + 2;
|
||||
break;
|
||||
}
|
||||
|
||||
if(( mPulsePid = PtAppCreatePulse( NULL, NewPriority )) > -2 )
|
||||
{
|
||||
NS_ASSERTION(0,"TimerImpl::SetupTimer - failed to create pulse");
|
||||
return NS_ERROR_FAILURE;
|
||||
}
|
||||
if(( mPulseMsgId = PtPulseArmPid( NULL, mPulsePid, getpid(), &mPulseMsg )) == NULL )
|
||||
{
|
||||
NS_ASSERTION(0,"TimerImpl::SetupTimer - failed to arm pulse!");
|
||||
return NS_ERROR_FAILURE;
|
||||
}
|
||||
if(( mInputId = PtAppAddInput( NULL, mPulsePid, TimerEventHandler, this )) == NULL )
|
||||
{
|
||||
NS_ASSERTION(0,"TimerImpl::SetupTimer - failed to add input handler!");
|
||||
return NS_ERROR_FAILURE;
|
||||
}
|
||||
|
||||
mTimerId = -1;
|
||||
err = timer_create( CLOCK_SOFTTIME, &mPulseMsg, &mTimerId );
|
||||
if( err != 0 )
|
||||
{
|
||||
NS_ASSERTION(0,"TimerImpl::SetupTimer - timer_create error");
|
||||
return NS_ERROR_FAILURE;
|
||||
}
|
||||
|
||||
switch(mType)
|
||||
{
|
||||
case NS_TYPE_ONE_SHOT:
|
||||
tv.it_interval.tv_sec = 0;
|
||||
tv.it_interval.tv_nsec = 0;
|
||||
break;
|
||||
case NS_TYPE_REPEATING_SLACK: /* HACK WRONG! */
|
||||
case NS_TYPE_REPEATING_PRECISE:
|
||||
tv.it_interval.tv_sec = ( mDelay / 1000 );
|
||||
tv.it_interval.tv_nsec = ( mDelay % 1000 ) * 1000000L;
|
||||
break;
|
||||
}
|
||||
tv.it_value.tv_sec = ( mDelay / 1000 );
|
||||
tv.it_value.tv_nsec = ( mDelay % 1000 ) * 1000000L;
|
||||
|
||||
/* If delay is set to 0 seconds then change it to 1 nsec. */
|
||||
if ( (tv.it_value.tv_sec == 0) && (tv.it_value.tv_nsec == 0))
|
||||
{
|
||||
tv.it_value.tv_nsec = 1;
|
||||
}
|
||||
|
||||
err = timer_settime( mTimerId, 0, &tv, 0 );
|
||||
if( err != 0 )
|
||||
{
|
||||
NS_ASSERTION(0,"TimerImpl::SetupTimer timer_settime");
|
||||
return NS_ERROR_FAILURE;
|
||||
}
|
||||
|
||||
return NS_OK;
|
||||
}
|
||||
|
||||
|
||||
#ifdef MOZ_MONOLITHIC_TOOLKIT
|
||||
nsresult NS_NewTimer(nsITimer** aInstancePtrResult)
|
||||
{
|
||||
NS_PRECONDITION(nsnull != aInstancePtrResult, "null ptr");
|
||||
if (nsnull == aInstancePtrResult) {
|
||||
return NS_ERROR_NULL_POINTER;
|
||||
}
|
||||
|
||||
nsTimerPh *timer = new nsTimerPh();
|
||||
if (nsnull == timer) {
|
||||
return NS_ERROR_OUT_OF_MEMORY;
|
||||
}
|
||||
|
||||
return timer->QueryInterface(kITimerIID, (void **) aInstancePtrResult);
|
||||
}
|
||||
|
||||
int NS_TimeToNextTimeout(struct timeval *aTimer)
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
|
||||
void NS_ProcessTimeouts(void)
|
||||
{
|
||||
}
|
||||
#endif /* MOZ_MONOLITHIC_TOOLKIT */
|
||||
|
|
@ -0,0 +1,92 @@
|
|||
/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
|
||||
*
|
||||
* The contents of this file are subject to the Netscape Public
|
||||
* License Version 1.1 (the "License"); you may not use this file
|
||||
* except in compliance with the License. You may obtain a copy of
|
||||
* the License at http://www.mozilla.org/NPL/
|
||||
*
|
||||
* Software distributed under the License is distributed on an "AS
|
||||
* IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
|
||||
* implied. See the License for the specific language governing
|
||||
* rights and limitations under the License.
|
||||
*
|
||||
* The Original Code is mozilla.org code.
|
||||
*
|
||||
* The Initial Developer of the Original Code is Netscape
|
||||
* Communications Corporation. Portions created by Netscape are
|
||||
* Copyright (C) 1998 Netscape Communications Corporation. All
|
||||
* Rights Reserved.
|
||||
*
|
||||
* Contributor(s):
|
||||
*/
|
||||
|
||||
#ifndef __nsTimerPh_h
|
||||
#define __nsTimerPh_h
|
||||
|
||||
#include "nsITimer.h"
|
||||
#include "nsITimerCallback.h"
|
||||
|
||||
#include <Pt.h>
|
||||
|
||||
/*
|
||||
* Implementation of timers using Photon timer facility
|
||||
*/
|
||||
class nsTimerPh : public nsITimer
|
||||
{
|
||||
public:
|
||||
|
||||
nsTimerPh();
|
||||
virtual ~nsTimerPh();
|
||||
|
||||
virtual nsresult Init(nsTimerCallbackFunc aFunc,
|
||||
void *aClosure,
|
||||
PRUint32 aDelay,
|
||||
PRUint32 aPriority = NS_PRIORITY_NORMAL,
|
||||
PRUint32 aType = NS_TYPE_ONE_SHOT
|
||||
);
|
||||
|
||||
virtual nsresult Init(nsITimerCallback *aCallback,
|
||||
PRUint32 aDelay,
|
||||
PRUint32 aPriority = NS_PRIORITY_NORMAL,
|
||||
PRUint32 aType = NS_TYPE_ONE_SHOT
|
||||
);
|
||||
|
||||
NS_DECL_ISUPPORTS
|
||||
|
||||
virtual void Cancel();
|
||||
|
||||
virtual PRUint32 GetDelay() { return mDelay; }
|
||||
virtual void SetDelay(PRUint32 aDelay);
|
||||
|
||||
virtual PRUint32 GetPriority() { return mPriority; }
|
||||
virtual void SetPriority(PRUint32 aPriority);
|
||||
|
||||
virtual PRUint32 GetType() { return mType; }
|
||||
virtual void SetType(PRUint32 aType);
|
||||
|
||||
virtual void* GetClosure() { return mClosure; }
|
||||
|
||||
PRBool FireTimeout();
|
||||
|
||||
static int TimerEventHandler( void *aData, pid_t aRcvId, void *aMsg, size_t aMsgLen );
|
||||
|
||||
private:
|
||||
nsresult SetupTimer();
|
||||
|
||||
PRUint32 mDelay;
|
||||
PRUint32 mPriority;
|
||||
PRUint32 mType;
|
||||
nsTimerCallbackFunc mFunc;
|
||||
void * mClosure;
|
||||
nsITimerCallback * mCallback;
|
||||
nsTimerPh * mNext;
|
||||
timer_t mTimerId;
|
||||
|
||||
/* Photon Specific Data Members */
|
||||
pid_t mPulsePid;
|
||||
PtPulseMsg_t mPulseMsg;
|
||||
PtPulseMsgId_t * mPulseMsgId;
|
||||
PtInputId_t * mInputId;
|
||||
};
|
||||
|
||||
#endif // __nsTimerPh_h
|
||||
|
|
@ -0,0 +1,40 @@
|
|||
/* -*- Mode: C++; tab-width: 2; indentT-tabs-mode: nil; c-basic-offset: 2 -*-
|
||||
*
|
||||
* The contents of this file are subject to the Netscape Public
|
||||
* License Version 1.1 (the "License"); you may not use this file
|
||||
* except in compliance with the License. You may obtain a copy of
|
||||
* the License at http://www.mozilla.org/NPL/
|
||||
*
|
||||
* Software distributed under the License is distributed on an "AS
|
||||
* IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
|
||||
* implied. See the License for the specific language governing
|
||||
* rights and limitations under the License.
|
||||
*
|
||||
* The Original Code is mozilla.org code.
|
||||
*
|
||||
* The Initial Developer of the Original Code is Netscape
|
||||
* Communications Corporation. Portions created by Netscape are
|
||||
* Copyright (C) 1998 Netscape Communications Corporation. All
|
||||
* Rights Reserved.
|
||||
*
|
||||
* Contributor(s):
|
||||
*/
|
||||
|
||||
#include "nsIGenericFactory.h"
|
||||
#include "nsIModule.h"
|
||||
#include "nsCOMPtr.h"
|
||||
|
||||
#include "nsUnixTimerCIID.h"
|
||||
#include "nsTimerPh.h"
|
||||
|
||||
NS_GENERIC_FACTORY_CONSTRUCTOR(nsTimerPh)
|
||||
|
||||
static nsModuleComponentInfo components[] =
|
||||
{
|
||||
{ "Photon timer",
|
||||
NS_TIMER_PH_CID,
|
||||
"component://netscape/timer/unix/ph",
|
||||
nsTimerPhConstructor }
|
||||
};
|
||||
|
||||
NS_IMPL_NSGETMODULE("nsPhTimerModule", components)
|
||||
Загрузка…
Ссылка в новой задаче