Changeset 34812 for lang/objective-cplusplus

Timestamp:

08/07/09 19:58:16 (4 years ago)

Author:

saturday06

Message:

asdf

Location:

lang/objective-cplusplus/i3/trunk

Files:

• am/mil_test.am (modified) (2 diffs)
• src/mil/include/mil/Memory.h (modified) (5 diffs)
• src/mil/src/Test11.cpp (modified) (2 diffs)
• src/mil/src/TestMain.cpp (modified) (1 diff)

lang/objective-cplusplus/i3/trunk/am/mil_test.am

@@ -24 +24 @@
 mil_test_CXXFLAGS = ${i3_CXXFLAGS} \
                     ${WARNING_OPTIONS} \
-                    -I${top_srcdir}/src/mil/include -DMIL_PRODUCER_MALLOC
+                    -I${top_srcdir}/src/mil/include
 
 mil_test_LDFLAGS  = ${PTHREAD_LIBS} ${BOOST_LDFLAGS}
-mil_test_LDADD    = #${BOOST_UNIT_TEST_FRAMEWORK_LIB}
+mil_test_LDADD    = 
 
 if WITH_OS_WINDOWS
@@ -36 +36 @@
 
 if WITH_GUI_WINDOWS
-mil_test_SOURCES  += src/mil/src/windows/WindowProcedureTest.cpp
+#mil_test_SOURCES  += src/mil/src/windows/WindowProcedureTest.cpp
 mil_test_LDADD    += -lgdi32 -luser32 -lpsapi -lshlwapi
 endif

lang/objective-cplusplus/i3/trunk/src/mil/include/mil/Memory.h

@@ -83 +83 @@
 }
 
-#define MIL_PRODUCER_MALLOCuiuiu
+#define MIL_PRODUCER_MALLOCasdf
 #ifdef MIL_PRODUCER_MALLOC
 
@@ -119 +119 @@
 #else
 
-#define MIL_DEBUG_PRODUCERooo
+#define MIL_DEBUG_PRODUCER
 
 class Producer {
@@ -157 +157 @@
         if (blocks > MALLOC_BLOCKS_THESHOLD) {
             return ::malloc(BYTES);
+        } else if (blocks == 1) {
+            return p.malloc();
         } else {
             return p.ordered_malloc(blocks);
@@ -184 +186 @@
 #else
     {
-        if (blocks > MALLOC_BLOCKS_THESHOLD) {
+        if (blocks > (size_t)MALLOC_BLOCKS_THESHOLD) {
             ::free((void*)memory);
+        } else if (blocks == 1) {
+            p.free(memory);
         } else {
             p.free(memory, blocks);
@@ -236 +240 @@
         l->blocks = blocks;
 
-        if (blocks > MALLOC_BLOCKS_THESHOLD) {
+        if (blocks > (size_t)MALLOC_BLOCKS_THESHOLD) {
 #ifdef MIL_DEBUG_PRODUCER
             mem = (T*)((char*)mem - sizeof(Producer::DebugInfo));

lang/objective-cplusplus/i3/trunk/src/mil/src/Test11.cpp

@@ -14 +14 @@
 namespace Test11 {
 
-atomic<int> global = 0;
+atomic<int> global;
 atomic<int> spin_status;
 
@@ -37 +37 @@
 
 // bench class
-const unsigned int POST_MAX = 20000;
-const unsigned int NUM_THREADS = 8;
+const unsigned int POST_MAX = 200000;
+const unsigned int NUM_THREADS = 18;
 
 struct Bencher : mil::Module<Bencher> {

lang/objective-cplusplus/i3/trunk/src/mil/src/TestMain.cpp

@@ -9 +9 @@
 }
 
-int main(int argc, char* argv[]) {
+int main(int, char**) {
     QT_RUN_TESTS;