Skip to content

Commit 1e98ba9

Browse files
author
James Chen
committed
issue cocos2d#2823: comment some test codes.
1 parent b9b822c commit 1e98ba9

File tree

1 file changed

+125
-133
lines changed

1 file changed

+125
-133
lines changed

‎scripting/javascript/bindings/ScriptingCore.cpp‎

Lines changed: 125 additions & 133 deletions
Original file line numberDiff line numberDiff line change
@@ -1938,7 +1938,7 @@ void ScriptingCore::enableDebugger() {
19381938
JS_DefineFunction(cx_, debugGlobal_, "_unlockVM", JSBDebug_UnlockExecution, 0, JSPROP_READONLY | JSPROP_PERMANENT);
19391939

19401940
runScript("jsb_debugger.js", debugGlobal_);
1941-
runScript("SysTest/script.js", debugGlobal_);
1941+
// runScript("SysTest/script.js", debugGlobal_);
19421942

19431943
// prepare the debugger
19441944
jsval argv = OBJECT_TO_JSVAL(global_);
@@ -2254,142 +2254,134 @@ static void serverEntryPoint(void)
22542254
buf[readBytes] = '\0';
22552255
TRACE_DEBUGGER_SERVER("debug server : received command >%s", buf);
22562256

2257-
if (recieveIndex == 1)
2258-
{
2259-
replyToClient(clientSocket, "{ \"from\":\"root\", \"tabs\":[{ \"actor\":\"JSBTabActor\", \"title\":\"Hello cocos2d-x JSB\", \"url\":\"http://www.cocos2d-x.org\" }], \"selected\":0 }");
2260-
}
2261-
else if (recieveIndex == 2)
2262-
{
2263-
replyToClient(clientSocket, "{ \"from\":\"JSBTabActor\", \"type\":\"tabAttached\", \"threadActor\":\"tabThreadActor111\" }");
2264-
}
2265-
else if (recieveIndex == 3)
2266-
{
2267-
replyToClient(clientSocket, "{\
2268-
\"from\": \"tabThreadActor111\",\
2269-
\"type\": \"paused\",\
2270-
\"actor\": \"JSBTabActor\",\
2271-
\"poppedFrames\": [],\
2272-
\"why\": {\
2273-
\"type\": \"attached\"\
2274-
}\
2275-
}");
2276-
2277-
2278-
2279-
//replyToClient(clientSocket, "{ \"from\":\"JSBTabActor\", \"type\":\"tabNavigated\", \"state\":\"start\", \"url\":\"my_url.js\" }");
2280-
}
2281-
else if (recieveIndex == 4)
2282-
{
2283-
// replyToClient(clientSocket, "{\"from\": \"tabThreadActor111\",\
2257+
// if (recieveIndex == 1)
2258+
// {
2259+
// replyToClient(clientSocket, "{ \"from\":\"root\", \"tabs\":[{ \"actor\":\"JSBTabActor\", \"title\":\"Hello cocos2d-x JSB\", \"url\":\"http://www.cocos2d-x.org\" }], \"selected\":0 }");
2260+
// }
2261+
// else if (recieveIndex == 2)
2262+
// {
2263+
// replyToClient(clientSocket, "{ \"from\":\"JSBTabActor\", \"type\":\"tabAttached\", \"threadActor\":\"tabThreadActor111\" }");
2264+
// }
2265+
// else if (recieveIndex == 3)
2266+
// {
2267+
// replyToClient(clientSocket, "{\
2268+
// \"from\": \"tabThreadActor111\",\
2269+
// \"type\": \"paused\",\
2270+
// \"actor\": \"JSBTabActor\",\
2271+
// \"poppedFrames\": [],\
2272+
// \"why\": {\
2273+
// \"type\": \"attached\"\
2274+
// }\
2275+
// }");
2276+
//
2277+
//
2278+
//
2279+
// //replyToClient(clientSocket, "{ \"from\":\"JSBTabActor\", \"type\":\"tabNavigated\", \"state\":\"start\", \"url\":\"my_url.js\" }");
2280+
// }
2281+
// else if (recieveIndex == 4)
2282+
// {
2283+
// replyToClient(clientSocket, "{\
2284+
// \"from\": \"tabThreadActor111\",\
22842285
// \"type\": \"newSource\",\
22852286
// \"source\": {\
2286-
// \"actor\": \"source_actor2\",\
2287-
// \"url\": \"http://ajax.googleapis.com/ajax/libs/jquery/1.7.1/jquery.min.js\",\
2287+
// \"actor\": \"source_actor1\",\
2288+
// \"url\": \"file://~/Project/cocos2d-html5/cocos2d/CCDirector.js\",\
22882289
// \"isBlackBoxed\": false\
2289-
// }}");
2290-
2291-
replyToClient(clientSocket, "{\
2292-
\"from\": \"tabThreadActor111\",\
2293-
\"type\": \"newSource\",\
2294-
\"source\": {\
2295-
\"actor\": \"source_actor1\",\
2296-
\"url\": \"file://~/Project/cocos2d-html5/cocos2d/CCDirector.js\",\
2297-
\"isBlackBoxed\": false\
2298-
}\
2299-
}");
2300-
2301-
replyToClient(clientSocket,
2302-
"{\
2303-
\"sources\": [\
2304-
{\
2305-
\"actor\": \"source_actor1\",\
2306-
\"url\": \"file://~/Project/cocos2d-html5/cocos2d/CCDirector.js\",\
2307-
\"isBlackBoxed\": false\
2308-
}\
2309-
],\
2310-
\"from\": \"tabThreadActor111\"\
2311-
}");
2312-
}
2313-
else if (recieveIndex == 5)
2314-
{
2315-
replyToClient(clientSocket, "{\
2316-
\"from\": \"source_actor1\",\
2317-
\"source\": {\
2318-
\"type\": \"longString\",\
2319-
\"initial\": \"var cc = cc || {}; cc.Director = {};\",\
2320-
\"length\": 100,\
2321-
\"actor\": \"conn2.longString48\"\
2322-
}\
2323-
}");
2324-
}
2325-
else if (recieveIndex == 6)
2326-
{
2327-
replyToClient(clientSocket, "{\
2328-
\"from\": \"conn2.longString48\",\
2329-
\"substring\": \"var cc = cc || {}; cc.Director = {};\
2330-
\\ncc.Sprite = {};\"\
2331-
}");
2332-
2333-
2334-
replyToClient(clientSocket, "{\
2335-
\"from\": \"tabThreadActor111\",\
2336-
\"type\": \"resumed\"\
2337-
}");
2338-
}
2339-
else if (recieveIndex == 7)
2340-
{
2341-
replyToClient(clientSocket, "{\
2342-
\"from\": \"tabThreadActor111\",\
2343-
\"type\": \"resumed\"\
2344-
}");
2345-
}
2346-
else if (recieveIndex == 8)
2347-
{
2348-
replyToClient(clientSocket, "{ \"from\":\"tabThreadActor111\", \"actor\":\"breakActor\"}");//, \"actualLocation\":2 }");
2349-
}
2350-
else if (recieveIndex == 9)
2351-
{
2352-
replyToClient(clientSocket, "{ \"from\":\"breakActor\" }");
2353-
}
2354-
else if (recieveIndex == 10)
2355-
{
2356-
replyToClient(clientSocket, "{\
2357-
\"from\": \"tabThreadActor111\",\
2358-
\"type\": \"resumed\"\
2359-
}");
2360-
}
2361-
else
2362-
{
2363-
2364-
2365-
std::string recvBuf = buf;
2366-
auto found = recvBuf.find("setBreakpoint");
2367-
if (found != std::string::npos)
2368-
{
2369-
replyToClient(clientSocket, "{ \"from\":\"tabThreadActor111\", \"actor\":\"breakActor\"}");//, \"actualLocation\":2 }");
2370-
}
2371-
2372-
found = recvBuf.find("delete");
2373-
if (found != std::string::npos)
2374-
{
2375-
replyToClient(clientSocket, "{ \"from\":\"breakActor\" }");
2376-
}
2377-
2378-
found = recvBuf.find("interrupt");
2379-
if (found != std::string::npos)
2380-
{
2381-
replyToClient(clientSocket, "{\
2382-
\"from\": \"tabThreadActor111\",\
2383-
\"type\": \"resumed\"\
2384-
}");
2385-
}
2386-
2387-
}
2388-
++recieveIndex;
2290+
// }\
2291+
// }");
2292+
//
2293+
// replyToClient(clientSocket,
2294+
// "{\
2295+
// \"sources\": [\
2296+
// {\
2297+
// \"actor\": \"source_actor1\",\
2298+
// \"url\": \"file://~/Project/cocos2d-html5/cocos2d/CCDirector.js\",\
2299+
// \"isBlackBoxed\": false\
2300+
// }\
2301+
// ],\
2302+
// \"from\": \"tabThreadActor111\"\
2303+
// }");
2304+
// }
2305+
// else if (recieveIndex == 5)
2306+
// {
2307+
// replyToClient(clientSocket, "{\
2308+
// \"from\": \"source_actor1\",\
2309+
// \"source\": {\
2310+
// \"type\": \"longString\",\
2311+
// \"initial\": \"var cc = cc || {}; cc.Director = {};\",\
2312+
// \"length\": 100,\
2313+
// \"actor\": \"conn2.longString48\"\
2314+
// }\
2315+
// }");
2316+
// }
2317+
// else if (recieveIndex == 6)
2318+
// {
2319+
// replyToClient(clientSocket, "{\
2320+
// \"from\": \"conn2.longString48\",\
2321+
// \"substring\": \"var cc = cc || {}; cc.Director = {};\
2322+
//\\ncc.Sprite = {};\"\
2323+
// }");
2324+
//
2325+
//
2326+
// replyToClient(clientSocket, "{\
2327+
// \"from\": \"tabThreadActor111\",\
2328+
// \"type\": \"resumed\"\
2329+
// }");
2330+
// }
2331+
// else if (recieveIndex == 7)
2332+
// {
2333+
// replyToClient(clientSocket, "{\
2334+
// \"from\": \"tabThreadActor111\",\
2335+
// \"type\": \"resumed\"\
2336+
// }");
2337+
// }
2338+
// else if (recieveIndex == 8)
2339+
// {
2340+
// replyToClient(clientSocket, "{ \"from\":\"tabThreadActor111\", \"actor\":\"breakActor\"}");//, \"actualLocation\":2 }");
2341+
// }
2342+
// else if (recieveIndex == 9)
2343+
// {
2344+
// replyToClient(clientSocket, "{ \"from\":\"breakActor\" }");
2345+
// }
2346+
// else if (recieveIndex == 10)
2347+
// {
2348+
// replyToClient(clientSocket, "{\
2349+
// \"from\": \"tabThreadActor111\",\
2350+
// \"type\": \"resumed\"\
2351+
// }");
2352+
// }
2353+
// else
2354+
// {
2355+
//
2356+
//
2357+
// std::string recvBuf = buf;
2358+
// auto found = recvBuf.find("setBreakpoint");
2359+
// if (found != std::string::npos)
2360+
// {
2361+
// replyToClient(clientSocket, "{ \"from\":\"tabThreadActor111\", \"actor\":\"breakActor\"}");//, \"actualLocation\":2 }");
2362+
// }
2363+
//
2364+
// found = recvBuf.find("delete");
2365+
// if (found != std::string::npos)
2366+
// {
2367+
// replyToClient(clientSocket, "{ \"from\":\"breakActor\" }");
2368+
// }
2369+
//
2370+
// found = recvBuf.find("interrupt");
2371+
// if (found != std::string::npos)
2372+
// {
2373+
// replyToClient(clientSocket, "{\
2374+
// \"from\": \"tabThreadActor111\",\
2375+
// \"type\": \"resumed\"\
2376+
// }");
2377+
// }
2378+
//
2379+
// }
2380+
// ++recieveIndex;
23892381
// no other thread is using this
2390-
// inData.append(buf);
2391-
// // process any input, send any output
2392-
// clearBuffers();
2382+
inData.append(buf);
2383+
// process any input, send any output
2384+
clearBuffers();
23932385
} // while(read)
23942386

23952387
close(clientSocket);

0 commit comments

Comments
 (0)