History

otf fix, caution to wind reenable

Ge Wang committed 9 years ago

Commit e060f611 parent 6fe13cf5 files · +16 −11Browse files

Showing the changes to src/core/chuck.cpp (1 of 5 files). Show all

Unified · Split

src/core/chuck.cpp+6−5
@@ -71,9 +71,9 @@ · 70 unmodified lines
7171
7272
7373 // chuck statics
74−// version
7574 const char ChucK::VERSION[] = "1.3.6.0-rc1 (numchuck)";
7675 t_CKUINT ChucK::o_numVMs = 0;
76+t_CKBOOL ChucK::enableSystemCall = FALSE;
7777
7878
7979
@@ -557,8 +557,8 @@ bool ChucK::initOTF() · 477 unmodified lines
557557 // start tcp server
558558 m_carrier->otf_socket = ck_tcp_create( 1 );
559559 if( !m_carrier->otf_socket ||
560− !ck_bind( m_carrier->otf_socket, m_carrier->otf_port ) ||
561− !ck_listen( m_carrier->otf_socket, 10 ) )
560+ !ck_bind( m_carrier->otf_socket, m_carrier->otf_port ) ||
561+ !ck_listen( m_carrier->otf_socket, 10 ) )
562562 {
563563 CK_FPRINTF_STDERR( "[chuck]: cannot bind to tcp port %li...\n", m_carrier->otf_port );
564564 ck_close( m_carrier->otf_socket );
@@ -567,10 +567,11 @@ bool ChucK::initOTF() · 2 unmodified lines
567567 else
568568 {
569569 #if !defined(__PLATFORM_WIN32__) || defined(__WINDOWS_PTHREAD__)
570− pthread_create( &m_carrier->otf_thread, NULL, otf_cb, NULL );
570+ pthread_create( &m_carrier->otf_thread, NULL, otf_cb, m_carrier );
571571 #else
572572 m_carrier->otf_thread = CreateThread( NULL, 0,
573− (LPTHREAD_START_ROUTINE)otf_cb, NULL, 0, 0 );
573+ (LPTHREAD_START_ROUTINE)otf_cb,
574+ m_carrier, 0, 0 );
574575 #endif
575576 }
576577 }

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t