Attachment #140204 for bug #91526




SET(OPENTHREADS_MAJOR_VERSION 2)
SET(OPENTHREADS_MINOR_VERSION 2)
SET(OPENTHREADS_PATCH_VERSION 0)
IF(NOT DEFINED OPENTHREADS_SOVERSION)
SET(OPENTHREADS_SOVERSION 9)
ENDIF(NOT DEFINED OPENTHREADS_SOVERSION)

IF(NOT DEFINED OPENTHREADS_VERSION)
SET(OPENTHREADS_VERSION ${OPENTHREADS_MAJOR_VERSION}.${OPENTHREADS_MINOR_VERSION}.${OPENTHREADS_PATCH_VERSION})
ENDIF(NOT DEFINED OPENTHREADS_VERSION)

SET(HEADER_PATH ${OpenThreads_SOURCE_DIR}/include/OpenThreads)
SET(OpenThreads_PUBLIC_HEADERS




	../common/Version.cpp
)

IF(OPENTHREADS_SONAMES)
  SET_TARGET_PROPERTIES(${LIB_NAME} PROPERTIES VERSION ${OPENTHREADS_VERSION} SOVERSION ${OPENTHREADS_SOVERSION})
ENDIF(OPENTHREADS_SONAMES)

SET(CMAKE_REQUIRED_LIBRARIES_SAFE "${CMAKE_REQUIRED_LIBRARIES}")
SET(CMAKE_REQUIRED_LIBRARIES "${CMAKE_REQUIRED_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT}")


	${CMAKE_CURRENT_BINARY_DIR}
)

IF(OPENTHREADS_SONAMES)
  SET_TARGET_PROPERTIES(${LIB_NAME} PROPERTIES VERSION ${OPENTHREADS_VERSION} SOVERSION ${OPENTHREADS_SOVERSION})
ENDIF(OPENTHREADS_SONAMES)

INSTALL(
	TARGETS OpenThreads
	ARCHIVE DESTINATION lib${LIB_POSTFIX}





    PThreadPrivateData *pd = static_cast<PThreadPrivateData *> (_prvData);

    size_t defaultStackSize = 0;
    pthread_attr_getstacksize( &thread_attr, &defaultStackSize);
    if(status != 0) {
	return status;
    }

    if(defaultStackSize < pd->stackSize) {

	pthread_attr_setstacksize( &thread_attr, pd->stackSize);
	if(status != 0) {
	    return status;
	}
    }

    //-------------------------------------------------------------------------
    // Now get what we actually have...
    //
    pthread_attr_getstacksize( &thread_attr, &defaultStackSize);
    if(status != 0) {
	return status;
    }

    pd->stackSize = defaultStackSize;


Lines 40-46 Link Here

(-)./src/OpenThreads/pthreads/PThreadPrivateData.h.org (-1 / +1 lines)
40		40
41	private:	41	private:
42		42
43	PThreadPrivateData() {};	43	PThreadPrivateData() : stackSize(0), stackSizeLocked(false), isRunning(false), isCanceled(false), idSet(false), tid(0), uniqueId(0), cpunum(0) {};
44		44
45	virtual ~PThreadPrivateData() {};	45	virtual ~PThreadPrivateData() {};
46		46

Return to bug 91526

Lines 22-31 Link Here

(-)./src/OpenThreads/pthreads/CMakeLists.txt.org (-4 / +4 lines)
22	../common/Version.cpp	22	../common/Version.cpp
23	)	23	)
24		24
25	IF(OPENTHREADS_SONAMES)
26	SET_TARGET_PROPERTIES(${LIB_NAME} PROPERTIES VERSION ${OPENTHREADS_VERSION} SOVERSION ${OPENTHREADS_SOVERSION})
27	ENDIF(OPENTHREADS_SONAMES)
28
29	SET(CMAKE_REQUIRED_LIBRARIES_SAFE "${CMAKE_REQUIRED_LIBRARIES}")	25	SET(CMAKE_REQUIRED_LIBRARIES_SAFE "${CMAKE_REQUIRED_LIBRARIES}")
30	SET(CMAKE_REQUIRED_LIBRARIES "${CMAKE_REQUIRED_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT}")	26	SET(CMAKE_REQUIRED_LIBRARIES "${CMAKE_REQUIRED_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT}")
31		27
Lines 102-107 Link Here
102	${CMAKE_CURRENT_BINARY_DIR}	98	${CMAKE_CURRENT_BINARY_DIR}
103	)	99	)
104		100
		101	IF(OPENTHREADS_SONAMES)
		102	SET_TARGET_PROPERTIES(${LIB_NAME} PROPERTIES VERSION ${OPENTHREADS_VERSION} SOVERSION ${OPENTHREADS_SOVERSION})
		103	ENDIF(OPENTHREADS_SONAMES)
		104
105	INSTALL(	105	INSTALL(
106	TARGETS OpenThreads	106	TARGETS OpenThreads
107	ARCHIVE DESTINATION lib${LIB_POSTFIX}	107	ARCHIVE DESTINATION lib${LIB_POSTFIX}

Lines 590-616 Link Here

(-)./src/OpenThreads/pthreads/PThread.c++.org (-10 / +1 lines)
590		590
591	PThreadPrivateData pd = static_cast<PThreadPrivateData > (_prvData);	591	PThreadPrivateData pd = static_cast<PThreadPrivateData > (_prvData);
592		592
593	size_t defaultStackSize;	593	size_t defaultStackSize = 0;
594	pthread_attr_getstacksize( &thread_attr, &defaultStackSize);	594	pthread_attr_getstacksize( &thread_attr, &defaultStackSize);
595	if(status != 0) {
596	return status;
597	}
598		595
599	if(defaultStackSize < pd->stackSize) {	596	if(defaultStackSize < pd->stackSize) {
600		597
601	pthread_attr_setstacksize( &thread_attr, pd->stackSize);	598	pthread_attr_setstacksize( &thread_attr, pd->stackSize);
602	if(status != 0) {
603	return status;
604	}
605	}	599	}
606		600
607	//-------------------------------------------------------------------------	601	//-------------------------------------------------------------------------
608	// Now get what we actually have...	602	// Now get what we actually have...
609	//	603	//
610	pthread_attr_getstacksize( &thread_attr, &defaultStackSize);	604	pthread_attr_getstacksize( &thread_attr, &defaultStackSize);
611	if(status != 0) {
612	return status;
613	}
614		605
615	pd->stackSize = defaultStackSize;	606	pd->stackSize = defaultStackSize;
616		607

Lines 5-13 Link Here

(-)./src/OpenThreads/CMakeLists.txt.org (+4 lines)
5	SET(OPENTHREADS_MAJOR_VERSION 2)	5	SET(OPENTHREADS_MAJOR_VERSION 2)
6	SET(OPENTHREADS_MINOR_VERSION 2)	6	SET(OPENTHREADS_MINOR_VERSION 2)
7	SET(OPENTHREADS_PATCH_VERSION 0)	7	SET(OPENTHREADS_PATCH_VERSION 0)
		8	IF(NOT DEFINED OPENTHREADS_SOVERSION)
8	SET(OPENTHREADS_SOVERSION 9)	9	SET(OPENTHREADS_SOVERSION 9)
		10	ENDIF(NOT DEFINED OPENTHREADS_SOVERSION)
9		11
		12	IF(NOT DEFINED OPENTHREADS_VERSION)
10	SET(OPENTHREADS_VERSION ${OPENTHREADS_MAJOR_VERSION}.${OPENTHREADS_MINOR_VERSION}.${OPENTHREADS_PATCH_VERSION})	13	SET(OPENTHREADS_VERSION ${OPENTHREADS_MAJOR_VERSION}.${OPENTHREADS_MINOR_VERSION}.${OPENTHREADS_PATCH_VERSION})
		14	ENDIF(NOT DEFINED OPENTHREADS_VERSION)
11		15
12	SET(HEADER_PATH ${OpenThreads_SOURCE_DIR}/include/OpenThreads)	16	SET(HEADER_PATH ${OpenThreads_SOURCE_DIR}/include/OpenThreads)
13	SET(OpenThreads_PUBLIC_HEADERS	17	SET(OpenThreads_PUBLIC_HEADERS