From 585b29bdef15d5058acbd745b7dc7f09348632ba Mon Sep 17 00:00:00 2001
From: Christophe Geuzaine <cgeuzaine@ulg.ac.be>
Date: Sun, 27 Sep 2009 15:45:18 +0000
Subject: [PATCH] more work on remote
---
Common/GmshDaemon.cpp | 61 +++++++++++++++++---------------------
Common/Options.cpp | 6 ++--
Fltk/menuWindow.cpp | 49 +++---------------------------
Fltk/solverWindow.cpp | 9 ++++--
Post/PView.cpp | 29 ++++++++++++++----
Post/PView.h | 16 +++++-----
Post/PViewData.h | 3 ++
Post/PViewDataRemote.h | 24 ++++++++++++---
Post/PViewVertexArrays.cpp | 54 ++++++++++++++++-----------------
9 files changed, 123 insertions(+), 128 deletions(-)
diff --git a/Common/GmshDaemon.cpp b/Common/GmshDaemon.cpp
index b590ad10c2..90f9e1df79 100644
--- a/Common/GmshDaemon.cpp
+++ b/Common/GmshDaemon.cpp
@@ -12,6 +12,27 @@
#include "PViewData.h"
#include "VertexArray.h"
+static void computeAndSendVertexArrays(GmshClient &client)
+{
+ for(unsigned int i = 0; i < PView::list.size(); i++){
+ PView *p = PView::list[i];
+ p->fillVertexArrays();
+ PViewData *data = p->getData();
+ VertexArray *va[4] =
+ {p->va_points, p->va_lines, p->va_triangles, p->va_vectors};
+ for(int type = 0; type < 4; type++){
+ if(va[type] && va[type]->getNumVertices()){
+ int len;
+ char *str = va[type]->toChar
+ (p->getNum(), type + 1, data->getMin(), data->getMax(),
+ data->getTime(0), data->getBoundingBox(), len);
+ client.SendMessage(GmshSocket::GMSH_VERTEX_ARRAY, len, str);
+ delete [] str;
+ }
+ }
+ }
+}
+
int GmshDaemon(std::string socket)
{
GmshClient client;
@@ -23,7 +44,7 @@ int GmshDaemon(std::string socket)
client.Start();
client.Info("Server sucessfully started. Listening...");
- // initialize mpi job, then wait for commands to execute...
+ computeAndSendVertexArrays(client);
while(1){
// stop the server if we have no communications for 60 seconds
@@ -50,49 +71,21 @@ int GmshDaemon(std::string socket)
break;
}
- std::ostringstream tmp;
- tmp << "Hello! I've received msg type=" << type << " len=" << length
- << " str=" << msg;
- client.Info(tmp.str().c_str());
-
if(type == GmshSocket::GMSH_STOP){
- client.Info("Stopping connection!");
+ client.Info("Stopping server");
break;
}
else if(type == GmshSocket::GMSH_VERTEX_ARRAY){
- // create and send a vertex array
- if(PView::list.size()){
- PView *view = PView::list[0];
- view->getOptions()->intervalsType = PViewOptions::Iso;
- view->fillVertexArrays();
- PViewData *data = view->getData();
- int len;
- char *ss = view->va_triangles->toChar
- (view->getNum(), 3, data->getMin(), data->getMax(),
- data->getTime(0), data->getBoundingBox(), len);
- client.SendMessage(GmshSocket::GMSH_VERTEX_ARRAY, len, ss);
- delete [] ss;
- }
+ client.Info("Sending vertex arrays");
+ computeAndSendVertexArrays(client);
}
else if(type == GmshSocket::GMSH_SPEED_TEST){
+ client.Info("Sending huge array");
std::string huge(500000000, 'a');
client.SpeedTest(huge.c_str());
}
- else if(type == GmshSocket::GMSH_PARSE_STRING){
- std::ostringstream v;
- v << "View \"test\" {\n";
- for(int i = 0; i < 200; i++){
- for(int j = 0; j < 200; j++){
- v << "SQ("<<i<<","<<j<<",0, "<<i+1<<","<<j<<",0, "
- <<i+1<<","<<j+1<<",0, "<<i<<","<<j+1<<",0){"
- <<i+j<<","<<i+j<<","<<i+j<<","<<i+j<<"};\n";
- }
- }
- v << "};BoundingBox;\n";
- client.ParseString(v.str().c_str());
- }
else{
- client.Error("Unknown message type: ignoring...");
+ client.Error("Ignoring unknown message");
}
}
diff --git a/Common/Options.cpp b/Common/Options.cpp
index a9324779f5..4c770457c2 100644
--- a/Common/Options.cpp
+++ b/Common/Options.cpp
@@ -611,13 +611,13 @@ void PrintOptions(int num, int level, int diff, int help, const char *filename)
PrintOptionCategory(level, diff, help, "Post-processing options (strings)", file);
PrintStringOptions(num, level, diff, help, PostProcessingOptions_String,
- "PostProcessing.", file);
+ "PostProcessing.", file);
PrintOptionCategory(level, diff, help, "Post-processing options (numbers)", file);
PrintNumberOptions(num, level, diff, help, PostProcessingOptions_Number,
- "PostProcessing.", file);
+ "PostProcessing.", file);
PrintOptionCategory(level, diff, help, "Post-processing options (colors)", file);
PrintColorOptions(num, level, diff, help, PostProcessingOptions_Color,
- "PostProcessing.", file);
+ "PostProcessing.", file);
if(level & GMSH_FULLRC) {
#if !defined(HAVE_NO_POST)
diff --git a/Fltk/menuWindow.cpp b/Fltk/menuWindow.cpp
index 530489d0c3..3a0e3bbdaf 100644
--- a/Fltk/menuWindow.cpp
+++ b/Fltk/menuWindow.cpp
@@ -170,7 +170,6 @@ static void file_remote_cb(Fl_Widget *w, void *data)
}
else if(str == "stop"){
if(GmshRemote::get(99)->getServer()){
- Msg::Info("Stopping remote Gmsh server");
GmshRemote::get(99)->getServer()->SendString
(GmshSocket::GMSH_STOP, "Disconnect!");
}
@@ -178,36 +177,6 @@ static void file_remote_cb(Fl_Widget *w, void *data)
Msg::Error("Cannot stop remote Gmsh: server not running");
}
}
- else if(str == "test1"){
- if(GmshRemote::get(99)->getServer()){
- Msg::Info("Testing remote Gmsh server");
- GmshRemote::get(99)->getServer()->SendString
- (GmshSocket::GMSH_PARSE_STRING, "Send me a view to parse");
- }
- else{
- Msg::Error("Cannot test remote Gmsh: server not running");
- }
- }
- else if(str == "test2"){
- if(GmshRemote::get(99)->getServer()){
- Msg::Info("Testing remote Gmsh server");
- GmshRemote::get(99)->getServer()->SendString
- (GmshSocket::GMSH_SPEED_TEST, "Send me a huge amount of data!");
- }
- else{
- Msg::Error("Cannot test remote Gmsh: server not running");
- }
- }
- else if(str == "test3"){
- if(GmshRemote::get(99)->getServer()){
- Msg::Info("Testing remote Gmsh server");
- GmshRemote::get(99)->getServer()->SendString
- (GmshSocket::GMSH_VERTEX_ARRAY, "Send me a vertex array!");
- }
- else{
- Msg::Error("Cannot test remote Gmsh: server not running");
- }
- }
}
static void file_window_cb(Fl_Widget *w, void *data)
@@ -2216,13 +2185,8 @@ static Fl_Menu_Item bar_table[] = {
{"Clear", 0, (Fl_Callback *)file_window_cb, (void*)"split_u"},
{0},
#if defined(TEST_SERVER)
- {"Start server...", 0, (Fl_Callback *)file_remote_cb, (void*)"start"},
- {"Test server", 0, 0, 0, FL_SUBMENU},
- {"Send small parsed view", 0, (Fl_Callback *)file_remote_cb, (void*)"test1"},
- {"Send large dummy data", 0, (Fl_Callback *)file_remote_cb, (void*)"test2"},
- {"Send a vertex array", 0, (Fl_Callback *)file_remote_cb, (void*)"test3"},
- {0},
- {"Stop server", 0, (Fl_Callback *)file_remote_cb, (void*)"stop", FL_MENU_DIVIDER},
+ {"Start remote...", 0, (Fl_Callback *)file_remote_cb, (void*)"start"},
+ {"Stop remote", 0, (Fl_Callback *)file_remote_cb, (void*)"stop", FL_MENU_DIVIDER},
#endif
{"&Rename...", FL_CTRL+'r', (Fl_Callback *)file_rename_cb, 0},
{"Save &As...", FL_CTRL+'s', (Fl_Callback *)file_save_as_cb, 0},
@@ -2269,13 +2233,8 @@ static Fl_Menu_Item sysbar_table[] = {
{"Clear", 0, (Fl_Callback *)file_window_cb, (void*)"split_u"},
{0},
#if defined(TEST_SERVER)
- {"Start server...", 0, (Fl_Callback *)file_remote_cb, (void*)"start"},
- {"Test server", 0, 0, 0, FL_SUBMENU},
- {"Send small parsed view", 0, (Fl_Callback *)file_remote_cb, (void*)"test1"},
- {"Send large dummy data", 0, (Fl_Callback *)file_remote_cb, (void*)"test2"},
- {"Send a vertex array", 0, (Fl_Callback *)file_remote_cb, (void*)"test3"},
- {0},
- {"Stop server", 0, (Fl_Callback *)file_remote_cb, (void*)"stop", FL_MENU_DIVIDER},
+ {"Start remote...", 0, (Fl_Callback *)file_remote_cb, (void*)"start"},
+ {"Stop remote", 0, (Fl_Callback *)file_remote_cb, (void*)"stop", FL_MENU_DIVIDER},
#endif
{"Rename...", FL_META+'r', (Fl_Callback *)file_rename_cb, 0},
{"Save As...", FL_META+'s', (Fl_Callback *)file_save_as_cb, 0},
diff --git a/Fltk/solverWindow.cpp b/Fltk/solverWindow.cpp
index fce5e31d25..1d2e4d268a 100644
--- a/Fltk/solverWindow.cpp
+++ b/Fltk/solverWindow.cpp
@@ -213,8 +213,13 @@ void GmshRemote::run(std::string args)
/ 1024 / 1024, GetTimeInSeconds() - timer);
break;
case GmshSocket::GMSH_VERTEX_ARRAY:
- PView::fillVertexArray(length, message);
- drawContext::global()->draw();
+ {
+ int n = PView::list.size();
+ PView::fillVertexArray(this, length, message);
+ drawContext::global()->draw();
+ if(n != (int)PView::list.size())
+ FlGui::instance()->updateViews();
+ }
break;
default:
Msg::Warning("Unknown message type");
diff --git a/Post/PView.cpp b/Post/PView.cpp
index 247517a32e..a297a05f66 100644
--- a/Post/PView.cpp
+++ b/Post/PView.cpp
@@ -17,9 +17,15 @@
int PView::_globalNum = 0;
std::vector<PView*> PView::list;
-void PView::_init()
+void PView::_init(int num)
{
- _num = ++_globalNum;
+ if(num){
+ _num = num;
+ _globalNum = std::max(_globalNum, _num);
+ }
+ else{
+ _num = ++_globalNum;
+ }
_changed = true;
_aliasOf = 0;
_eye = SPoint3(0., 0., 0.);
@@ -29,9 +35,9 @@ void PView::_init()
for(unsigned int i = 0; i < list.size(); i++) list[i]->setIndex(i);
}
-PView::PView()
+PView::PView(int num)
{
- _init();
+ _init(num);
_data = new PViewDataList();
_options = new PViewOptions(PViewOptions::reference);
if(_options->adaptVisualizationGrid)
@@ -39,9 +45,9 @@ PView::PView()
_options->targetError);
}
-PView::PView(PViewData *data)
+PView::PView(PViewData *data, int num)
{
- _init();
+ _init(num);
_data = data;
_options = new PViewOptions(PViewOptions::reference);
if(_options->adaptVisualizationGrid)
@@ -267,3 +273,14 @@ PView *PView::getViewByName(std::string name, int timeStep, int partition)
return 0;
}
+PView *PView::getViewByNum(int num, int timeStep, int partition)
+{
+ for(unsigned int i = 0; i < list.size(); i++){
+ if(list[i]->getNum() == num &&
+ ((timeStep < 0 || !list[i]->getData()->hasTimeStep(timeStep)) ||
+ (partition < 0 || !list[i]->getData()->hasPartition(partition))))
+ return list[i];
+ }
+ return 0;
+}
+
diff --git a/Post/PView.h b/Post/PView.h
index d445a593ee..6efef65ab9 100644
--- a/Post/PView.h
+++ b/Post/PView.h
@@ -17,6 +17,7 @@ class VertexArray;
class smooth_normals;
class GModel;
class GMSH_PostPlugin;
+class GmshRemote;
// A post-processing view.
class PView{
@@ -37,13 +38,13 @@ class PView{
// the data
PViewData *_data;
// initialize private stuff
- void _init();
+ void _init(int num=0);
public:
// create a new view with list-based data
- PView();
+ PView(int num=0);
// construct a new view using the given data
- PView(PViewData *data);
+ PView(PViewData *data, int num=0);
// construct a new view, alias of the view "ref"
PView(PView *ref, bool copyOptions=true);
// construct a new list-based view from a simple 2D dataset
@@ -94,11 +95,12 @@ class PView{
// combine view
static void combine(bool time, int how, bool remove);
- // find view by name (if noTimeStep >= 0, return view only if it
- // does *not* contain that timestep; if partition >=0, return view
- // only if it does *not* contain that partition)
+ // find view by name or by number (if timeStep >= 0, return view
+ // only if it does *not* contain that timestep; if partition >= 0,
+ // return view only if it does *not* contain that partition)
static PView *getViewByName(std::string name, int timeStep=-1,
int partition=-1);
+ static PView *getViewByNum(int num, int timeStep=-1, int partition=-1);
// IO read routines (these are global: they can create multiple
// views)
@@ -116,7 +118,7 @@ class PView{
void fillVertexArrays();
// fill a vertex array using a raw stream of bytes
- static void fillVertexArray(int length, const char *data);
+ static void fillVertexArray(GmshRemote *remote, int length, const char *data);
// smoothed normals
smooth_normals *normals;
diff --git a/Post/PViewData.h b/Post/PViewData.h
index 4f04eea04f..d75061de8f 100644
--- a/Post/PViewData.h
+++ b/Post/PViewData.h
@@ -196,6 +196,9 @@ class PViewData {
// combine time steps or elements from multiple datasets
virtual bool combineTime(nameData &nd);
virtual bool combineSpace(nameData &nd);
+
+ // ask to fill vertex arrays remotely
+ virtual int fillRemoteVertexArrays(){ return 0; }
// I/O routines
virtual bool writeSTL(std::string fileName);
diff --git a/Post/PViewDataRemote.h b/Post/PViewDataRemote.h
index a2014baa02..383961e13a 100644
--- a/Post/PViewDataRemote.h
+++ b/Post/PViewDataRemote.h
@@ -8,6 +8,9 @@
#include <vector>
#include <string>
+#include "GmshMessage.h"
+#include "GmshRemote.h"
+#include "GmshSocket.h"
#include "PViewData.h"
#include "SBoundingBox3d.h"
@@ -20,9 +23,11 @@ class PViewDataRemote : public PViewData {
std::vector<double> _timeStepMin, _timeStepMax;
SBoundingBox3d _bbox;
std::vector<double> _time;
+ GmshRemote *_remote;
public:
- PViewDataRemote(double min, double max, double time, SBoundingBox3d bbox)
- : _numTimeSteps(1), _min(min), _max(max), _bbox(bbox)
+ PViewDataRemote(GmshRemote *remote, double min, double max, double time,
+ SBoundingBox3d &bbox)
+ : _remote(remote), _numTimeSteps(1), _min(min), _max(max), _bbox(bbox)
{
_time.push_back(time);
}
@@ -41,8 +46,7 @@ class PViewDataRemote : public PViewData {
{
// hack so that it does not retrn 0
return -1;
- }
-
+ }
void setMin(double min){ _min = min; }
void setMax(double max){ _min = max; }
void setBoundingBox(SBoundingBox3d bbox){ _bbox = bbox; }
@@ -51,6 +55,18 @@ class PViewDataRemote : public PViewData {
if(step >= (int)_time.size()) _time.resize(step + 1);
_time[step] = time;
}
+ int fillRemoteVertexArrays()
+ {
+ GmshServer *server = _remote->getServer();
+ if(!server){
+ Msg::Error("Remote server not running: please start server");
+ return 1;
+ }
+ setDirty(true);
+ // server->SendString(GmshSocket::GMSH_PARSER_STRING, options);
+ server->SendString(GmshSocket::GMSH_VERTEX_ARRAY, "Send the vertex arrays!");
+ return 1;
+ }
};
#endif
diff --git a/Post/PViewVertexArrays.cpp b/Post/PViewVertexArrays.cpp
index c35e66d3b6..494eecb0d9 100644
--- a/Post/PViewVertexArrays.cpp
+++ b/Post/PViewVertexArrays.cpp
@@ -6,6 +6,7 @@
#include <string.h>
#include "GmshMessage.h"
#include "GmshDefines.h"
+#include "GmshRemote.h"
#include "Iso.h"
#include "PView.h"
#include "PViewOptions.h"
@@ -1066,6 +1067,7 @@ class initPView {
if(data->getDirty() || !data->getNumTimeSteps() || !p->getChanged()) return;
if(!opt->visible || opt->type != PViewOptions::Plot3D) return;
+ if(data->fillRemoteVertexArrays()) return;
if(opt->useGenRaise) opt->createGeneralRaise();
@@ -1115,7 +1117,7 @@ void PView::fillVertexArrays()
init(this);
}
-void PView::fillVertexArray(int length, const char *bytes)
+void PView::fillVertexArray(GmshRemote *remote, int length, const char *bytes)
{
int is = sizeof(int), ds = sizeof(double);
@@ -1137,46 +1139,44 @@ void PView::fillVertexArray(int length, const char *bytes)
double ymax; memcpy(&ymax, &bytes[index], ds); index += ds;
double zmax; memcpy(&zmax, &bytes[index], ds); index += ds;
- Msg::Info("Filling vertex array (type %d) in view num %d", type, num);
-
- PView *view;
- if(num >= 0 && num < (int)list.size()){
- view = PView::list[num];
- }
- else{
- Msg::Info("View num %d does not exist: creating new view");
- view = new PView
- (new PViewDataRemote(min, max, time, SBoundingBox3d(xmin, ymin, zmin,
- xmax, ymax, zmax)));
+ Msg::Debug("Filling vertex array (type %d) in view num %d", type, num);
+
+ PView *p = PView::getViewByNum(num);
+ if(!p){
+ Msg::Info("View num %d does not exist: creating new view", num);
+ SBoundingBox3d bb(xmin, ymin, zmin, xmax, ymax, zmax);
+ PViewData *data = new PViewDataRemote(remote, min, max, time, bb);
+ data->setName("Remote");
+ p = new PView(data, num);
SetBoundingBox();
}
switch(type){
- case 1:
- if(view->va_points) delete view->va_points;
- view->va_points = new VertexArray(1, 100);
- view->va_points->fromChar(bytes);
+ case 1:
+ if(p->va_points) delete p->va_points;
+ p->va_points = new VertexArray(1, 100);
+ p->va_points->fromChar(bytes);
break;
case 2:
- if(view->va_lines) delete view->va_lines;
- view->va_lines = new VertexArray(2, 100);
- view->va_lines->fromChar(bytes);
+ if(p->va_lines) delete p->va_lines;
+ p->va_lines = new VertexArray(2, 100);
+ p->va_lines->fromChar(bytes);
break;
case 3:
- if(view->va_triangles) delete view->va_triangles;
- view->va_triangles = new VertexArray(3, 100);
- view->va_triangles->fromChar(bytes);
+ if(p->va_triangles) delete p->va_triangles;
+ p->va_triangles = new VertexArray(3, 100);
+ p->va_triangles->fromChar(bytes);
break;
case 4:
- if(view->va_vectors) delete view->va_vectors;
- view->va_vectors = new VertexArray(2, 100);
- view->va_vectors->fromChar(bytes);
+ if(p->va_vectors) delete p->va_vectors;
+ p->va_vectors = new VertexArray(2, 100);
+ p->va_vectors->fromChar(bytes);
break;
default:
Msg::Error("Cannot fill vertex array of type %d", type);
return;
}
- view->setChanged(false);
- view->getData()->setDirty(false);
+ p->setChanged(false);
+ p->getData()->setDirty(false);
}
--
GitLab