forks
/
DCD
mirror of https://github.com/dlang-community/DCD.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed spaces -> tabs and a 32/64 bit issue

This commit is contained in:
Hackerpilot 2013-08-18 16:53:29 +00:00
parent 796919294a
commit ec0f7ff79f
2 changed files with 57 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
client.d
View File

@ -70,8 +70,8 @@ int main(string[] args)
ubyte[] message = msgpack.pack(request);
ubyte[] messageBuffer = new ubyte[message.length + message.length.sizeof];
auto messageLength = message.length;
messageBuffer[0 .. 8] = (cast(ubyte*) &messageLength)[0 .. 8];
messageBuffer[8 .. $] = message[];
messageBuffer[0 .. size_t.sizeof] = (cast(ubyte*) &messageLength)[0 .. size_t.sizeof];
messageBuffer[size_t.sizeof .. $] = message[];
return socket.send(messageBuffer) == messageBuffer.length ? 0 : 1;
}
else if (importPaths.length > 0)
@ -87,8 +87,8 @@ int main(string[] args)
ubyte[] message = msgpack.pack(request);
ubyte[] messageBuffer = new ubyte[message.length + message.length.sizeof];
auto messageLength = message.length;
messageBuffer[0 .. 8] = (cast(ubyte*) &messageLength)[0 .. 8];
messageBuffer[8 .. $] = message[];
messageBuffer[0 .. size_t.sizeof] = (cast(ubyte*) &messageLength)[0 .. size_t.sizeof];
messageBuffer[size_t.sizeof .. $] = message[];
return socket.send(messageBuffer) == messageBuffer.length ? 0 : 1;
}
else if (cursorPos == size_t.max)
@ -141,8 +141,8 @@ int main(string[] args)
socket.blocking = true;
ubyte[] messageBuffer = new ubyte[message.length + message.length.sizeof];
auto messageLength = message.length;
messageBuffer[0 .. 8] = (cast(ubyte*) &messageLength)[0 .. 8];
messageBuffer[8 .. $] = message[];
messageBuffer[0 .. size_t.sizeof] = (cast(ubyte*) &messageLength)[0 .. size_t.sizeof];
messageBuffer[size_t.sizeof .. $] = message[];
auto bytesSent = socket.send(messageBuffer);
// Get response and write it out

102
server.d
View File

@ -37,29 +37,29 @@ enum CONFIG_FILE_PATH = "~/.config/dcd";
int main(string[] args)
{
ushort port = 9166;
bool help;
string[] importPaths;
ushort port = 9166;
bool help;
string[] importPaths;
try
{
getopt(args, "port|p", &port, "I", &importPaths, "help|h", &help);
}
catch (Exception e)
{
stderr.writeln(e.msg);
printHelp(args[0]);
return 1;
}
try
{
getopt(args, "port|p", &port, "I", &importPaths, "help|h", &help);
}
catch (Exception e)
{
stderr.writeln(e.msg);
printHelp(args[0]);
return 1;
}
importPaths ~= loadConfiguredImportDirs();
auto socket = new TcpSocket(AddressFamily.INET);
socket.blocking = true;
auto socket = new TcpSocket(AddressFamily.INET);
socket.blocking = true;
socket.setOption(SocketOptionLevel.SOCKET, SocketOption.REUSEADDR, true);
socket.bind(new InternetAddress("127.0.0.1", port));
socket.listen(0);
scope (exit)
socket.bind(new InternetAddress("127.0.0.1", port));
socket.listen(0);
scope (exit)
{
writeln("Shutting down sockets...");
socket.shutdown(SocketShutdown.BOTH);
@ -71,42 +71,42 @@ int main(string[] args)
ModuleCache.addImportPath(path);
writeln("Import directories: ", ModuleCache.getImportPaths());
ubyte[1024 * 1024 * 4] buffer = void; // 4 megabytes should be enough for anybody...
ubyte[] buffer = new ubyte[1024 * 1024 * 4]; // 4 megabytes should be enough for anybody...
writeln("Startup complete");
while (true)
{
auto s = socket.accept();
s.blocking = true;
scope (exit)
while (true)
{
auto s = socket.accept();
s.blocking = true;
scope (exit)
{
s.shutdown(SocketShutdown.BOTH);
s.close();
}
ptrdiff_t bytesReceived = s.receive(buffer);
size_t messageLength;
// bit magic!
(cast(ubyte*) &messageLength)[0..8] = buffer[0..8];
while (bytesReceived < messageLength + 8)
{
auto b = s.receive(buffer[bytesReceived .. $]);
if (b == Socket.ERROR)
{
bytesReceived = Socket.ERROR;
break;
}
bytesReceived += b;
}
ptrdiff_t bytesReceived = s.receive(buffer);
size_t messageLength;
// bit magic!
(cast(ubyte*) &messageLength)[0..size_t.sizeof] = buffer[0..size_t.sizeof];
while (bytesReceived < messageLength + size_t.sizeof)
{
auto b = s.receive(buffer[bytesReceived .. $]);
if (b == Socket.ERROR)
{
bytesReceived = Socket.ERROR;
break;
}
bytesReceived += b;
}
if (bytesReceived == Socket.ERROR)
{
writeln("Socket recieve failed");
break;
}
if (bytesReceived == Socket.ERROR)
{
writeln("Socket recieve failed");
break;
}
AutocompleteRequest request;
msgpack.unpack(buffer[8 .. bytesReceived], request);
msgpack.unpack(buffer[size_t.sizeof .. bytesReceived], request);
if (request.kind == RequestKind.addImport)
{
foreach (path; request.importPaths)
@ -115,7 +115,7 @@ int main(string[] args)
}
}
else if (request.kind == RequestKind.clearCache)
else if (request.kind == RequestKind.clearCache)
{
writeln("Clearing cache.");
ModuleCache.clear();
@ -126,12 +126,12 @@ int main(string[] args)
break;
}
else
{
AutocompleteResponse response = complete(request, importPaths);
ubyte[] responseBytes = msgpack.pack(response);
assert(s.send(responseBytes) == responseBytes.length);
}
}
{
AutocompleteResponse response = complete(request, importPaths);
ubyte[] responseBytes = msgpack.pack(response);
assert(s.send(responseBytes) == responseBytes.length);
}
}
return 0;
}