From 814a7d11cc08c787bf70ff3f23b920181b16fa2f Mon Sep 17 00:00:00 2001
From: Christophe Geuzaine <cgeuzaine@ulg.ac.be>
Date: Sun, 1 Nov 2009 20:55:52 +0000
Subject: [PATCH] prepare byte swapping on socket
---
Common/GmshRemote.cpp | 4 ++--
Common/GmshSocket.h | 8 ++++----
Common/VertexArray.cpp | 7 +++----
Common/VertexArray.h | 2 +-
Fltk/solverWindow.cpp | 6 +++---
Post/PView.h | 2 +-
Post/PViewVertexArrays.cpp | 16 +++++++++++-----
utils/solvers/c++/GmshSocket.h | 9 +++++----
8 files changed, 30 insertions(+), 24 deletions(-)
diff --git a/Common/GmshRemote.cpp b/Common/GmshRemote.cpp
index 0a320a8430..b1935478ea 100644
--- a/Common/GmshRemote.cpp
+++ b/Common/GmshRemote.cpp
@@ -66,8 +66,8 @@ int GmshRemote()
break;
}
- int type, length;
- if(!client->ReceiveHeader(&type, &length)){
+ int type, length, swap;
+ if(!client->ReceiveHeader(&type, &length, &swap)){
client->Error("Did not receive message header: stopping remote Gmsh...");
break;
}
diff --git a/Common/GmshSocket.h b/Common/GmshSocket.h
index f513a56758..a112d4043e 100644
--- a/Common/GmshSocket.h
+++ b/Common/GmshSocket.h
@@ -185,20 +185,20 @@ class GmshSocket{
if(num > 5) num = 5;
SendString(GMSH_OPTION_1 + num - 1, str);
}
- int ReceiveHeader(int *type, int *len)
+ int ReceiveHeader(int *type, int *len, int *swap)
{
- bool swap = false;
+ *swap = 0;
if(_ReceiveData(type, sizeof(int))){
if(*type < 0) return 0;
if(*type > 65535){
// the data comes from a machine with different endianness and
// we must swap the bytes
- swap = true;
+ *swap = 1;
_SwapBytes((char*)type, sizeof(int), 1);
}
if(_ReceiveData(len, sizeof(int))){
if(*len < 0) return 0;
- if(swap) _SwapBytes((char*)len, sizeof(int), 1);
+ if(*swap) _SwapBytes((char*)len, sizeof(int), 1);
return 1;
}
}
diff --git a/Common/VertexArray.cpp b/Common/VertexArray.cpp
index 2bfe2c8d63..b708ff13fd 100644
--- a/Common/VertexArray.cpp
+++ b/Common/VertexArray.cpp
@@ -252,15 +252,14 @@ char *VertexArray::toChar(int num, std::string name, int type, double min, doubl
return bytes;
}
-void VertexArray::fromChar(const char *bytes)
+void VertexArray::fromChar(const char *bytes, int swap)
{
+ // FIXME deal with swap
+
int is = sizeof(int), ds = sizeof(double), index = 0;
int num; memcpy(&num, &bytes[index], is); index += is;
- if(num > 65535)
- Msg::Error("Should swap data in vertex array stream");
-
int ss; memcpy(&ss, &bytes[index], is); index += is;
if(ss){
std::vector<char> name(ss);
diff --git a/Common/VertexArray.h b/Common/VertexArray.h
index 47e5158ebc..49eeb2b2b3 100644
--- a/Common/VertexArray.h
+++ b/Common/VertexArray.h
@@ -166,7 +166,7 @@ class VertexArray{
// network)
char *toChar(int num, std::string name, int type, double min, double max,
int numsteps, double time, SBoundingBox3d bbox, int &len);
- void fromChar(const char *bytes);
+ void fromChar(const char *bytes, int swap);
};
#endif
diff --git a/Fltk/solverWindow.cpp b/Fltk/solverWindow.cpp
index 0f79a18170..e919f787ce 100644
--- a/Fltk/solverWindow.cpp
+++ b/Fltk/solverWindow.cpp
@@ -155,8 +155,8 @@ void ConnectionManager::run(std::string args)
if(stop || _pid < 0 || (prog.empty() && !CTX::instance()->solver.listen))
break;
- int type, length;
- if(!server->ReceiveHeader(&type, &length)){
+ int type, length, swap;
+ if(!server->ReceiveHeader(&type, &length, &swap)){
Msg::Error("Did not receive message header: stopping server");
break;
}
@@ -225,7 +225,7 @@ void ConnectionManager::run(std::string args)
case GmshSocket::GMSH_VERTEX_ARRAY:
{
int n = PView::list.size();
- PView::fillVertexArray(this, length, message);
+ PView::fillVertexArray(this, length, message, swap);
if(n != (int)PView::list.size())
FlGui::instance()->updateViews();
drawContext::global()->draw();
diff --git a/Post/PView.h b/Post/PView.h
index 70a0259596..d621a93e4e 100644
--- a/Post/PView.h
+++ b/Post/PView.h
@@ -119,7 +119,7 @@ class PView{
// fill a vertex array using a raw stream of bytes
static void fillVertexArray(ConnectionManager *remote, int length,
- const char *data);
+ const char *data, int swap);
// smoothed normals
smooth_normals *normals;
diff --git a/Post/PViewVertexArrays.cpp b/Post/PViewVertexArrays.cpp
index 567bd0fed6..b477e77000 100644
--- a/Post/PViewVertexArrays.cpp
+++ b/Post/PViewVertexArrays.cpp
@@ -1142,7 +1142,8 @@ void PView::fillVertexArrays()
init(this);
}
-void PView::fillVertexArray(ConnectionManager *remote, int length, const char *bytes)
+void PView::fillVertexArray(ConnectionManager *remote, int length,
+ const char *bytes, int swap)
{
int is = sizeof(int), ds = sizeof(double);
@@ -1150,6 +1151,11 @@ void PView::fillVertexArray(ConnectionManager *remote, int length, const char *b
Msg::Error("Too few bytes to create vertex array: %d", length);
return;
}
+
+ if(swap){
+ Msg::Error("Should swap bytes in vertex array--not implemented yet");
+ return;
+ }
std::string name;
@@ -1201,22 +1207,22 @@ void PView::fillVertexArray(ConnectionManager *remote, int length, const char *b
case 1:
if(p->va_points) delete p->va_points;
p->va_points = new VertexArray(1, 100);
- p->va_points->fromChar(bytes);
+ p->va_points->fromChar(bytes, swap);
break;
case 2:
if(p->va_lines) delete p->va_lines;
p->va_lines = new VertexArray(2, 100);
- p->va_lines->fromChar(bytes);
+ p->va_lines->fromChar(bytes, swap);
break;
case 3:
if(p->va_triangles) delete p->va_triangles;
p->va_triangles = new VertexArray(3, 100);
- p->va_triangles->fromChar(bytes);
+ p->va_triangles->fromChar(bytes, swap);
break;
case 4:
if(p->va_vectors) delete p->va_vectors;
p->va_vectors = new VertexArray(2, 100);
- p->va_vectors->fromChar(bytes);
+ p->va_vectors->fromChar(bytes, swap);
break;
default:
Msg::Error("Cannot fill vertex array of type %d", type);
diff --git a/utils/solvers/c++/GmshSocket.h b/utils/solvers/c++/GmshSocket.h
index 6f8951da02..d8d9fbbf36 100644
--- a/utils/solvers/c++/GmshSocket.h
+++ b/utils/solvers/c++/GmshSocket.h
@@ -185,25 +185,26 @@ class GmshSocket{
if(num > 5) num = 5;
SendString(GMSH_OPTION_1 + num - 1, str);
}
- int ReceiveHeader(int *type, int *len)
+ int ReceiveHeader(int *type, int *len, int *swap)
{
- bool swap = false;
+ *swap = 0;
if(_ReceiveData(type, sizeof(int))){
if(*type < 0) return 0;
if(*type > 65535){
// the data comes from a machine with different endianness and
// we must swap the bytes
- swap = true;
+ *swap = 1;
_SwapBytes((char*)type, sizeof(int), 1);
}
if(_ReceiveData(len, sizeof(int))){
if(*len < 0) return 0;
- if(swap) _SwapBytes((char*)len, sizeof(int), 1);
+ if(*swap) _SwapBytes((char*)len, sizeof(int), 1);
return 1;
}
}
return 0;
}
+ // str should be allocated with size (len+1)
int ReceiveString(int len, char *str)
{
if(_ReceiveData(str, len) == len) {
--
GitLab