generic-library/libupnp
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Forward port of svn revision 505:

Browse Source 
SF Patch Tracker [ 2836704 ] Patch for Solaris10 compilation and usage.
	Submitted By: zephyrus ( zephyrus00jp )



git-svn-id: https://pupnp.svn.sourceforge.net/svnroot/pupnp/trunk@506 119443c7-1b9e-41f8-b6fc-b9c35fce742c
This commit is contained in:
Marcelo Roberto Jimenez
2010-03-21 11:50:26 +00:00
parent cbbbb14e21
commit f6a30b842c
3 changed files with 146 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files

57
ChangeLog
View File

@@ -2,6 +2,11 @@
Version 1.8.0 Version 1.8.0
******************************************************************************* *******************************************************************************
2010-03-21 Marcelo Jimenez <mroberto(at)users.sourceforge.net>
* Forward port of svn revision 505:
SF Patch Tracker [ 2836704 ] Patch for Solaris10 compilation and usage.
Submitted By: zephyrus ( zephyrus00jp )
2010-03-20 Marcelo Jimenez <mroberto(at)users.sourceforge.net> 2010-03-20 Marcelo Jimenez <mroberto(at)users.sourceforge.net>
* SF Patch Tracker [ 2969188 ] 1.8.0: patch for FreeBSD compilation * SF Patch Tracker [ 2969188 ] 1.8.0: patch for FreeBSD compilation
Submitted By: Nick Leverton (leveret) Submitted By: Nick Leverton (leveret)
@@ -188,6 +193,58 @@ Version 1.8.0
Version 1.6.7 Version 1.6.7
******************************************************************************* *******************************************************************************
2010-03-21 Marcelo Jimenez <mroberto(at)users.sourceforge.net>
* SF Patch Tracker [ 2836704 ] Patch for Solaris10 compilation and usage.
Submitted By: zephyrus ( zephyrus00jp )
Obs by Marcelo: The issue with linking with -lsocket -lnsl -lrt is not
covered in this changeset beacuse I don't have solaris to test. I will
need some help from zephyrus in this regard. The issue will be addressed
in a future changeset.
Compilation for solaris
I have used gcc3.x and gcc4.x under solaris 10 for x86 / 64 bits.
A couple of Source file fixes were necessary for successful compilation
and runtime behavior.
threadutil/src/ThreadPool.c
POSIX
sched_setschduler() returns non-negative value for success.
Without the fix, UpnpInit() fails immediately.
upnpp/src/api/upnpai.c
There is a typo of a macro name "__sun" in one of the
CPP conditional.
Without the fix, the compilation aborts due to unknown constant
in socket ioctl call.
A few structs and an array is not properly initialized.
Well, I think it may be safe as is, but when I checked it
using purify evaluation version, it was reported that
uninitizlied iszBuffer may cause read of uninitialized memory.
So play it safe.
Configure issue.
This has to be more of a configure magic.
To link a program successfully using network, we need
-lsocket and -lnsl library specifications on the link line.
We also need -lrt for programs that use thread scheduling features.
The sample program under upnp/sample requires
-lsocket -lnsl -lrt
for successful linking.
I added -lsocket -lnsl -lrt to Makefile.in.
configure probably needs to take care of these.
I don't know much about configure, automake, etc., so
I am just raising a flag here.
TIA
2010-03-20 Marcelo Jimenez <mroberto(at)users.sourceforge.net> 2010-03-20 Marcelo Jimenez <mroberto(at)users.sourceforge.net>
* SF Patch Tracker [ 2836704 ] Search for nested serviceList (not * SF Patch Tracker [ 2836704 ] Search for nested serviceList (not
stopping at the first lis stopping at the first lis

133
threadutil/src/ThreadPool.c
View File

@@ -48,6 +48,7 @@
#include <assert.h> #include <assert.h>
#include <stdlib.h> #include <stdlib.h>
#include <stdio.h> #include <stdio.h>
#include <string.h> /* for memset()*/
/**************************************************************************** /****************************************************************************
@@ -63,12 +64,12 @@
* Returns: * Returns:
* the difference in milliseconds, time1-time2. * the difference in milliseconds, time1-time2.
*****************************************************************************/ *****************************************************************************/
static unsigned long DiffMillis( struct timeval *time1, struct timeval *time2 ) static unsigned long DiffMillis(struct timeval *time1, struct timeval *time2)
{ {
double temp = 0; double temp = 0;
assert( time1 != NULL ); assert(time1 != NULL);
assert( time2 != NULL ); assert(time2 != NULL);
temp = time1->tv_sec - time2->tv_sec; temp = time1->tv_sec - time2->tv_sec;
/* convert to milliseconds */ /* convert to milliseconds */
@@ -91,9 +92,9 @@ static unsigned long DiffMillis( struct timeval *time1, struct timeval *time2 )
* Parameters: * Parameters:
* ThreadPoolStats *stats must be valid non null stats structure * ThreadPoolStats *stats must be valid non null stats structure
*****************************************************************************/ *****************************************************************************/
static void StatsInit( ThreadPoolStats *stats ) static void StatsInit(ThreadPoolStats *stats)
{ {
assert( stats != NULL ); assert(stats != NULL);
stats->totalIdleTime = 0; stats->totalIdleTime = 0;
stats->totalJobsHQ = 0; stats->totalJobsHQ = 0;
@@ -113,19 +114,19 @@ static void StatsInit( ThreadPoolStats *stats )
stats->maxThreads = 0; stats->totalThreads = 0; stats->maxThreads = 0; stats->totalThreads = 0;
} }
static void StatsAccountLQ( ThreadPool *tp, unsigned long diffTime ) static void StatsAccountLQ(ThreadPool *tp, unsigned long diffTime)
{ {
tp->stats.totalJobsLQ++; tp->stats.totalJobsLQ++;
tp->stats.totalTimeLQ += diffTime; tp->stats.totalTimeLQ += diffTime;
} }
static void StatsAccountMQ( ThreadPool *tp, unsigned long diffTime ) static void StatsAccountMQ(ThreadPool *tp, unsigned long diffTime)
{ {
tp->stats.totalJobsMQ++; tp->stats.totalJobsMQ++;
tp->stats.totalTimeMQ += diffTime; tp->stats.totalTimeMQ += diffTime;
} }
static void StatsAccountHQ( ThreadPool *tp, unsigned long diffTime ) static void StatsAccountHQ(ThreadPool *tp, unsigned long diffTime)
{ {
tp->stats.totalJobsHQ++; tp->stats.totalJobsHQ++;
tp->stats.totalTimeHQ += diffTime; tp->stats.totalTimeHQ += diffTime;
@@ -145,36 +146,36 @@ static void StatsAccountHQ( ThreadPool *tp, unsigned long diffTime )
* ThreadPriority p * ThreadPriority p
* ThreadPoolJob *job * ThreadPoolJob *job
*****************************************************************************/ *****************************************************************************/
static void CalcWaitTime( ThreadPool *tp, ThreadPriority p, ThreadPoolJob *job ) static void CalcWaitTime(ThreadPool *tp, ThreadPriority p, ThreadPoolJob *job)
{ {
struct timeval now; struct timeval now;
unsigned long diff; unsigned long diff;
assert( tp != NULL ); assert(tp != NULL);
assert( job != NULL ); assert(job != NULL);
gettimeofday( &now, NULL ); gettimeofday(&now, NULL);
diff = DiffMillis( &now, &job->requestTime ); diff = DiffMillis(&now, &job->requestTime);
switch ( p ) { switch (p) {
case LOW_PRIORITY: case LOW_PRIORITY:
StatsAccountLQ( tp, diff ); StatsAccountLQ(tp, diff);
break; break;
case MED_PRIORITY: case MED_PRIORITY:
StatsAccountMQ( tp, diff ); StatsAccountMQ(tp, diff);
break; break;
case HIGH_PRIORITY: case HIGH_PRIORITY:
StatsAccountHQ( tp, diff ); StatsAccountHQ(tp, diff);
break; break;
default: default:
assert( 0 ); assert(0);
} }
} }
static time_t StatsTime( time_t *t ) static time_t StatsTime(time_t *t)
{ {
struct timeval tv; struct timeval tv;
gettimeofday( &tv, NULL ); gettimeofday(&tv, NULL);
if (t) { if (t) {
*t = tv.tv_sec; *t = tv.tv_sec;
} }
@@ -182,12 +183,12 @@ static time_t StatsTime( time_t *t )
return tv.tv_sec; return tv.tv_sec;
} }
#else /* STATS */ #else /* STATS */
static UPNP_INLINE void StatsInit( ThreadPoolStats *stats ) {} static UPNP_INLINE void StatsInit(ThreadPoolStats *stats) {}
static UPNP_INLINE void StatsAccountLQ( ThreadPool *tp, unsigned long diffTime ) {} static UPNP_INLINE void StatsAccountLQ(ThreadPool *tp, unsigned long diffTime) {}
static UPNP_INLINE void StatsAccountMQ( ThreadPool *tp, unsigned long diffTime ) {} static UPNP_INLINE void StatsAccountMQ(ThreadPool *tp, unsigned long diffTime) {}
static UPNP_INLINE void StatsAccountHQ( ThreadPool *tp, unsigned long diffTime ) {} static UPNP_INLINE void StatsAccountHQ(ThreadPool *tp, unsigned long diffTime) {}
static UPNP_INLINE void CalcWaitTime( ThreadPool *tp, ThreadPriority p, ThreadPoolJob *job ) {} static UPNP_INLINE void CalcWaitTime(ThreadPool *tp, ThreadPriority p, ThreadPoolJob *job) {}
static UPNP_INLINE time_t StatsTime( time_t *t ) { return 0; } static UPNP_INLINE time_t StatsTime(time_t *t) { return 0; }
#endif /* STATS */ #endif /* STATS */
/**************************************************************************** /****************************************************************************
@@ -199,15 +200,15 @@ static UPNP_INLINE time_t StatsTime( time_t *t ) { return 0; }
* void * - job A * void * - job A
* void * - job B * void * - job B
*****************************************************************************/ *****************************************************************************/
static int CmpThreadPoolJob( void *jobA, void *jobB ) static int CmpThreadPoolJob(void *jobA, void *jobB)
{ {
ThreadPoolJob *a = ( ThreadPoolJob *) jobA; ThreadPoolJob *a = (ThreadPoolJob *) jobA;
ThreadPoolJob *b = ( ThreadPoolJob *) jobB; ThreadPoolJob *b = (ThreadPoolJob *) jobB;
assert( jobA != NULL ); assert(jobA != NULL);
assert( jobB != NULL ); assert(jobB != NULL);
return ( a->jobId == b->jobId ); return a->jobId == b->jobId;
} }
/**************************************************************************** /****************************************************************************
@@ -250,12 +251,20 @@ static int SetPolicyType(PolicyType in)
return sched_setscheduler(0, in); return sched_setscheduler(0, in);
#elif defined(_POSIX_PRIORITY_SCHEDULING) && _POSIX_PRIORITY_SCHEDULING > 0 #elif defined(_POSIX_PRIORITY_SCHEDULING) && _POSIX_PRIORITY_SCHEDULING > 0
struct sched_param current; struct sched_param current;
int sched_result; int rc;
memset(&current, 0, sizeof(current)); /* purify? */
sched_getparam(0, &current); sched_getparam(0, &current);
current.sched_priority = DEFAULT_SCHED_PARAM; current.sched_priority = DEFAULT_SCHED_PARAM;
sched_result = sched_setscheduler(0, in, &current);
return (-1 != sched_result || EPERM == errno) ? 0 : -1; /* Solaris returns -1 if failure ..., but can return
* non-zero values for 0, ..., 5 [former scheduling values.] */
rc = sched_setscheduler(0, in, &current);
if (rc == -1) {
return rc;
} else {
return 0;
}
#else #else
return 0; return 0;
#endif #endif
@@ -286,11 +295,11 @@ static int SetPriority(ThreadPriority priority)
struct sched_param newPriority; struct sched_param newPriority;
int sched_result; int sched_result;
pthread_getschedparam( ithread_self(), &currentPolicy, &newPriority ); pthread_getschedparam(ithread_self(), &currentPolicy, &newPriority);
minPriority = sched_get_priority_min( currentPolicy ); minPriority = sched_get_priority_min(currentPolicy);
maxPriority = sched_get_priority_max( currentPolicy ); maxPriority = sched_get_priority_max(currentPolicy);
midPriority = ( maxPriority - minPriority ) / 2; midPriority = (maxPriority - minPriority) / 2;
switch ( priority ) { switch (priority) {
case LOW_PRIORITY: case LOW_PRIORITY:
actPriority = minPriority; actPriority = minPriority;
break; break;
@@ -325,39 +334,38 @@ static int SetPriority(ThreadPriority priority)
* Parameters: * Parameters:
* ThreadPool *tp * ThreadPool *tp
*****************************************************************************/ *****************************************************************************/
static void BumpPriority( ThreadPool *tp ) static void BumpPriority(ThreadPool *tp)
{ {
int done = 0; int done = 0;
struct timeval now; struct timeval now;
unsigned long diffTime = 0; unsigned long diffTime = 0;
ThreadPoolJob *tempJob = NULL; ThreadPoolJob *tempJob = NULL;
assert( tp != NULL ); assert(tp != NULL);
gettimeofday(&now, NULL); gettimeofday(&now, NULL);
while (!done) {
while( !done ) { if (tp->medJobQ.size) {
if( tp->medJobQ.size ) { tempJob = (ThreadPoolJob *)tp->medJobQ.head.next->item;
tempJob = ( ThreadPoolJob *) tp->medJobQ.head.next->item; diffTime = DiffMillis(&now, &tempJob->requestTime);
diffTime = DiffMillis( &now, &tempJob->requestTime ); if (diffTime >= tp->attr.starvationTime) {
if( diffTime >= ( tp->attr.starvationTime ) ) { /* If job has waited longer than the starvation time
// If job has waited longer than the starvation time * bump priority (add to higher priority Q) */
// bump priority (add to higher priority Q) StatsAccountMQ(tp, diffTime);
StatsAccountMQ( tp, diffTime ); ListDelNode(&tp->medJobQ, tp->medJobQ.head.next, 0);
ListDelNode( &tp->medJobQ, tp->medJobQ.head.next, 0 ); ListAddTail(&tp->highJobQ, tempJob);
ListAddTail( &tp->highJobQ, tempJob );
continue; continue;
} }
} }
if( tp->lowJobQ.size ) { if (tp->lowJobQ.size) {
tempJob = ( ThreadPoolJob *) tp->lowJobQ.head.next->item; tempJob = (ThreadPoolJob *)tp->lowJobQ.head.next->item;
diffTime = DiffMillis( &now, &tempJob->requestTime ); diffTime = DiffMillis(&now, &tempJob->requestTime);
if( diffTime >= ( tp->attr.maxIdleTime ) ) { if (diffTime >= tp->attr.maxIdleTime) {
// If job has waited longer than the starvation time /* If job has waited longer than the starvation time
// bump priority (add to higher priority Q) * bump priority (add to higher priority Q) */
StatsAccountLQ( tp, diffTime ); StatsAccountLQ(tp, diffTime);
ListDelNode( &tp->lowJobQ, tp->lowJobQ.head.next, 0 ); ListDelNode(&tp->lowJobQ, tp->lowJobQ.head.next, 0);
ListAddTail( &tp->medJobQ, tempJob ); ListAddTail(&tp->medJobQ, tempJob);
continue; continue;
} }
} }
@@ -1657,4 +1665,3 @@ int gettimeofday(struct timeval *tv, struct timezone *tz)
return 0; return 0;
} }
#endif /* WIN32 */ #endif /* WIN32 */

7
upnp/src/api/upnpapi.c
View File

@@ -51,7 +51,7 @@
/* Do not include these files */ /* Do not include these files */
#else #else
#include <sys/param.h> #include <sys/param.h>
#if defined(_sun) #if defined(__sun)
#include <fcntl.h> #include <fcntl.h>
#include <sys/sockio.h> #include <sys/sockio.h>
#elif defined(BSD) && BSD >= 199306 #elif defined(BSD) && BSD >= 199306
@@ -3545,6 +3545,11 @@ int getlocalhostname(char *out, const int out_len)
struct sockaddr_in LocalAddr; struct sockaddr_in LocalAddr;
int j = 0; int j = 0;
/* purify */
memset(&ifConf, 0, sizeof(ifConf));
memset(&ifReq, 0, sizeof(ifReq));
memset(szBuffer, 0, sizeof(szBuffer));
/* Create an unbound datagram socket to do the SIOCGIFADDR ioctl on. */ /* Create an unbound datagram socket to do the SIOCGIFADDR ioctl on. */
LocalSock = socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP); LocalSock = socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP);
if (LocalSock < 0) { if (LocalSock < 0) {