Changeset 35100

Timestamp:

08/27/09 22:29:06 (4 years ago)

Author:

saturday06

Message:

afdjaiodfj

Location:

lang/objective-cplusplus/i3/trunk

Files:

• configure.ac (modified) (1 diff)
• src/Test1.cpp (modified) (2 diffs)
• src/Test2.cpp (modified) (2 diffs)
• src/gui-windows/InputWindowPlatform.cpp (modified) (3 diffs)
• src/mil/include/mil/Memory.h (modified) (8 diffs)
• src/mil/include/mil/StaticData.cpp (modified) (1 diff)
• src/mil/src/Profile1.cpp (added)
• src/mil/src/Test1.cpp (modified) (1 diff)
• src/mil/src/Test11.cpp (modified) (3 diffs)
• src/os-windows/Os.cpp (modified) (1 diff)
• windows/fakecygpty.exe.xz (modified) (previous)
• windows/mil_profile.vcproj (added)

lang/objective-cplusplus/i3/trunk/configure.ac

@@ -12 +12 @@
 
 AC_CONFIG_AUX_DIR([build-aux])
-#AM_INIT_AUTOMAKE([gnu no-define check-news std-options filename-length-max=99])
-AM_INIT_AUTOMAKE([gnu no-define check-news std-options])
+#AM_INIT_AUTOMAKE([gnu no-define check-news std-options filename-length-max=99 color-tests])
+AM_INIT_AUTOMAKE([foreign no-define std-options color-tests])
 AC_CONFIG_SRCDIR([src/Main.cpp])
 AC_CONFIG_HEADER([config.h])

lang/objective-cplusplus/i3/trunk/src/Test1.cpp

@@ -11 +11 @@
 using namespace std;
 using namespace boost;
+using namespace i3;
 
 namespace ns_intrusrangaaaaaaaaa {
@@ -116 +117 @@
 #if defined(_UNICODE) && defined(UNICODE)
 #define JA_ENCODING ".UTF-16LE"
-    WCHAR hello_world_ja[] = {
+    WCHAR hello_world_ja1[] = {
         0x4E16, 0x754C, 0x3088, 0x002C,
         0x0020, 0x3053, 0x3093, 0x306B,
-        0x3061, 0x306F, 0x0021, 0x0000,
+        0x3061, 0x306F, 0x0021, 0
     };
+        char hello_world_ja2[] = {
+                0x16, 0x4e, 0x4c, 0x75, 0x88, 0x30, 0x01, 0x30, 
+                0x53, 0x30, 0x93, 0x30, 0x6b, 0x30, 0x61, 0x30, 
+                0x8f, 0x30, 0x28, 0x00, 0x60, 0x00, 0xfb, 0x30, 
+                0xc9, 0x03, 0xfb, 0x30, 0xb4, 0x00, 0x29, 0x00, 
+                0, 0
+        };
+        WCHAR* hello_world_ja = (WCHAR*)hello_world_ja2;
 #else
 #define JA_ENCODING ".Shift_JIS"
-    CHAR hello_world_ja[] = {
+    CHAR hello_world_ja1[] = {
         0x90, 0xA2, 0x8A, 0x45, 0x82, 0xE6, 0x2C,
         0x20, 0x82, 0xB1, 0x82, 0xF1, 0x82, 0xC9,
-        0x82, 0xBF, 0x82, 0xCD, 0x21, 0x00,
+        0x82, 0xBF, 0x82, 0xCD, 0x21, 0
     };
+        CHAR hello_world_ja[] = {
+        0x90, 0xa2, 0x8a, 0x45, 0x82, 0xe6, 0x81, 
+                0x41, 0x82, 0xb1, 0x82, 0xf1, 0x82, 0xc9, 
+                0x82, 0xbf, 0x82, 0xed, 0x28, 0x60, 0x81, 
+                0x45, 0x83, 0xd6, 0x81, 0x45, 0x81, 0x4c, 
+                0x29, 0
+        };
 #endif
 

lang/objective-cplusplus/i3/trunk/src/Test2.cpp

@@ -6 +6 @@
 #include <quicktest/quicktest.h>
 
+using namespace mil;
 using namespace i3;
 
@@ -22 +23 @@
 
 QT_TEST(test_basic_tcscat_s) {
-    QT_CHECK(get_config_dir() == NULL);
-
-    init_config_dir();
-
-    TCHAR temp[MAX_PATH] = {};
-
+    TCHAR temp[STACKABLE_MAX_PATH] = {};
 
     QT_CHECK(_tcscpy_s(temp, get_config_dir()) == 0);

lang/objective-cplusplus/i3/trunk/src/gui-windows/InputWindowPlatform.cpp

@@ -11 +11 @@
 
 struct ExecuteEvent {
+        TCHAR* command;
 };
 
+struct AutoFree {
+        void* ptr;
+        AutoFree(void* ptr) : ptr(ptr) {
+        }
+        ~AutoFree() {
+                free(ptr);
+        }
+};
+
 template <>
 void Delegate::execute(ExecuteEvent& e) {
-    TCHAR prog[200] = {};
-    //GetWindowText(e.hEdit, prog, _countof(prog));
-//     if (_tcscmp(prog, _T("hello")) == 0) {
-//         alert(_("Hello, world!"));
-//         return;
-//     } else if (_tcscmp(prog, _T("exit")) == 0) {
-//         ExitEvent e;
-//         mediator.getInputWindow().post(e, *this);
-//         return;
-//     }
-
-    /*
-    TCHAR cwd_buf[MAX_PATH] = {};
-    TCHAR* cwd = cwd_buf;
-    DWORD required = GetCurrentDirectory(_countof(cwd_buf), cwd_buf);
-    if (!required) {
-        return; // error
-    } else if (required > _countof(cwd_buf)) {
-        const size_t BUFFER_CHARS = 33000;
-        cwd = (TCHAR*)malloc(BUFFER_CHARS * sizeof(TCHAR));
-        if (!cwd) {
-            return; // error
-        }
-        if (!GetCurrentDirectory(BUFFER_CHARS, cwd)) {
-            free(cwd);
-            return; // error
-        }
-    }
-
+        //std::tr1::shared_ptr<TCHAR> command_auto_free(e.command, free);
+        AutoFree command_auto_free(e.command);
+
+        if (_tcscmp(e.command, _T("hello")) == 0) {
+                alert(_("Hello, world!"));
+                return;
+    } else if (_tcscmp(e.command, _T("exit")) == 0) {
+        ExitEvent e;
+        mediator.getInputWindow().post(e, *this);
+        return;
+    }
 
     HINSTANCE ins = ShellExecute(
         NULL,       // �e�E�B���h�E�̃n���h��
-        _T("open"),       // ����        prog,       // �����ۂ̃t�@�C��
-        NULL,     // �����p�����[�^
-        cwd,      // ���f�B���N�g��
-        SW_SHOW    // �\����
+        _T("open"), // ����        e.command,  // �����ۂ̃t�@�C��
+        NULL,       // �����p�����[�^
+        NULL,       // ���f�B���N�g��
+        SW_SHOW     // �\����
         );
 
-    if (cwd != cwd_buf) {
-        free(cwd);
-    }
     if ((INT)ins <= 32) {
-        alert(_T("failure"));
-    }
-    */
+        alert(_T("execute failure"));
+    }
 }
 
@@ -70 +58 @@
 
 struct EditChangedEvent {
-    HWND hEdit;
+    int serial;
 };
 
@@ -367 +355 @@
             } else if (filter->wParam == VK_RETURN) {
                 ExecuteEvent e;
+                                e.command = _tcsdup(&(getChild().local_input_cache[0]));
+                                if (unlikely(!e.command)) {
+                                        return;
+                                }
                 getChild().mediator.getDelegate().post(e, *this);
             }

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

@@ -86 +86 @@
 
 #define MIL_MALLOC_PRODUCERooo
-#define MIL_TBB_PRODUCER
+#define MIL_TBB_PRODUCERuuu
 
 #ifdef MIL_MALLOC_PRODUCER
@@ -124 +124 @@
 #elif defined(MIL_TBB_PRODUCER)
 #include <tbb/scalable_allocator.h>
+#include <tbb/tbb_allocator.h>
 namespace mil {
 namespace pool {
@@ -129 +130 @@
         char data[BLOCK_SIZE];
 };
-extern tbb::scalable_allocator<TbbMemoryUnit> tbb_allocator;
+//extern tbb::scalable_allocator<TbbMemoryUnit> tbb_a;
+extern tbb::tbb_allocator<TbbMemoryUnit> tbb_a;
 class Producer {
 public:
@@ -142 +144 @@
             return ::malloc(BYTES);
         } else {
-            return tbb_allocator.allocate(blocks);
+            return tbb_a.allocate(blocks);
         }
     }
@@ -165 +167 @@
             ::free((void*)mem);
         } else {
-                        tbb_allocator.deallocate((mil::pool::TbbMemoryUnit*)mem, blocks);
+                        tbb_a.deallocate((mil::pool::TbbMemoryUnit*)mem, blocks);
         }
     }
@@ -270 +272 @@
 
     enum {
-        MAX_STORES = 30,
+        MAX_STORES = 50,
     };
 
@@ -291 +293 @@
     template <class T>
     void store(T* memory) {
-        int owner_id = memory->owner_id;
-        MemoryList* l = (MemoryList*)memory;
         size_t blocks = pool::bytes_to_blocks(return_memory_considered_sizeof<T>());
-        l->blocks = blocks;
-
         if (blocks > (size_t)MALLOC_BLOCKS_THESHOLD) {
 #ifdef MIL_DEBUG_PRODUCER
@@ -304 +302 @@
         }
 
+        int owner_id = memory->owner_id;
+        MemoryList* l = (MemoryList*)memory;
+        l->blocks = blocks;
         l->next = heads[owner_id];
         heads[owner_id] = l;

lang/objective-cplusplus/i3/trunk/src/mil/include/mil/StaticData.cpp

@@ -18 +18 @@
 namespace mil {
 #ifdef MIL_TBB_PRODUCER
+#ifdef _MSC_VER
+#ifdef _DEBUG
+#pragma comment(lib, "ix86/tbb_debug.lib")
+#else
+#pragma comment(lib, "ix86/tbb.lib")
+#endif
+#endif
 namespace pool {
-tbb::scalable_allocator<TbbMemoryUnit> tbb_allocator;
+//tbb::scalable_allocator<TbbMemoryUnit> tbb_a;
+tbb::tbb_allocator<TbbMemoryUnit> tbb_a;
 }
 #endif

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

@@ -3 +3 @@
 #include <mil/GuiModule.h>
 #include <mil/Thread.h>
-
-#if defined(MIL_GUI_WINDOWS)
-#  include <mil/gui-windows/GuiModule.h>
-#elif defined(MIL_GUI_COCOA)
-#  include <mil/gui-cocoa/GuiModule.h>
-#else
-#  include <mil/gui-cocoa/GuiModule.h>
-#endif
-
 #include <quicktest/quicktest.h>
 #include "Test.h"

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

@@ -6 +6 @@
 
 #include "Test.h"
-
-#define MIL_PROFILE
 
 using namespace mil;
@@ -38 +36 @@
 
 // bench class
-const unsigned int POST_MAX = 9000000;
+const unsigned int POST_MAX = 90000;
 const unsigned int NUM_THREADS = 19;
 
@@ -152 +150 @@
 #endif
     }
+        //while (true) {
+        //      Sleep(100000);
+        //}
 }
 

lang/objective-cplusplus/i3/trunk/src/os-windows/Os.cpp

@@ -206 +206 @@
 const TCHAR* get_config_dir() {
     if (_tcsnlen(config_dir, _countof(config_dir)) == 0) {
-        return NULL;
+                init_config_dir();
+            if (_tcsnlen(config_dir, _countof(config_dir)) == 0) {
+                return NULL;
+                }
     }
     return config_dir;