Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
gmsh
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Larry Price
gmsh
Commits
0950c63e
Commit
0950c63e
authored
12 years ago
by
Christophe Geuzaine
Browse files
Options
Downloads
Patches
Plain Diff
reverting Francois's commit; it breaks too many things
will wait until after I come back to integrate his changes
parent
3c81fdde
No related branches found
No related tags found
No related merge requests found
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
Fltk/onelabGroup.cpp
+251
-253
251 additions, 253 deletions
Fltk/onelabGroup.cpp
with
251 additions
and
253 deletions
Fltk/onelabGroup.cpp
+
251
−
253
View file @
0950c63e
...
@@ -52,24 +52,20 @@ typedef unsigned long intptr_t;
...
@@ -52,24 +52,20 @@ typedef unsigned long intptr_t;
class
onelabGmshServer
:
public
GmshServer
{
class
onelabGmshServer
:
public
GmshServer
{
private:
private:
bool
_disconnected
,
_listen
;
onelab
::
localNetworkClient
*
_client
;
onelab
::
localNetworkClient
*
_client
;
public:
public:
onelabGmshServer
(
onelab
::
localNetworkClient
*
client
,
bool
listen
)
onelabGmshServer
(
onelab
::
localNetworkClient
*
client
)
:
GmshServer
(),
_client
(
client
)
{
:
GmshServer
(),
_client
(
client
)
{}
_disconnected
=
false
;
_listen
=
listen
;
}
~
onelabGmshServer
(){}
~
onelabGmshServer
(){}
int
NonBlockingSystemCall
(
const
char
*
str
){
return
SystemCall
(
str
);
}
int
NonBlockingSystemCall
(
const
char
*
str
){
return
SystemCall
(
str
);
}
int
NonBlockingWait
(
int
socket
,
double
waitint
,
double
timeout
)
int
NonBlockingWait
(
int
socket
,
double
waitint
,
double
timeout
)
{
{
double
start
=
GetTimeInSeconds
();
double
start
=
GetTimeInSeconds
();
printf
(
"nb wait %s %s
\n
"
,
_client
->
getName
().
c_str
(),
_client
->
getExecutable
().
c_str
());
while
(
1
){
while
(
1
){
if
(
timeout
>
0
&&
GetTimeInSeconds
()
-
start
>
timeout
)
if
(
timeout
>
0
&&
GetTimeInSeconds
()
-
start
>
timeout
)
return
2
;
// timeout
return
2
;
// timeout
if
(
_disconnected
||
(
_client
->
getExecutable
().
empty
()
&&
!
_listen
))
if
(
_client
->
getPid
()
<
0
||
(
_client
->
getExecutable
().
empty
()
&&
!
CTX
::
instance
()
->
solver
.
listen
))
return
1
;
// process has been killed or we stopped listening
return
1
;
// process has been killed or we stopped listening
// check if there is data (call select with a zero timeout to
// check if there is data (call select with a zero timeout to
// return immediately, i.e., do polling)
// return immediately, i.e., do polling)
...
@@ -90,10 +86,9 @@ class onelabGmshServer : public GmshServer{
...
@@ -90,10 +86,9 @@ class onelabGmshServer : public GmshServer{
else
if
(
ret
>
0
){
else
if
(
ret
>
0
){
return
0
;
// data is there!
return
0
;
// data is there!
}
}
else
{
// ret < 0
else
{
// an error happened
// an error happened
_client
->
setPid
(
-
1
);
_client
->
setPid
(
-
1
);
_disconnected
=
true
;
_client
->
setGmshServer
(
0
);
_client
->
setGmshServer
(
0
);
return
1
;
return
1
;
}
}
...
@@ -101,80 +96,91 @@ class onelabGmshServer : public GmshServer{
...
@@ -101,80 +96,91 @@ class onelabGmshServer : public GmshServer{
}
}
};
};
class
socketListener
{
bool
onelab
::
localNetworkClient
::
run
()
std
::
map
<
GmshServer
*
,
onelab
::
localNetworkClient
*>
_clients
;
public:
void
addClient
(
onelab
::
localNetworkClient
*
client
,
GmshServer
*
server
)
{
{
_clients
[
server
]
=
client
;
new_connection:
_pid
=
0
;
_gmshServer
=
0
;
onelabGmshServer
*
server
=
new
onelabGmshServer
(
this
);
std
::
string
sockname
;
std
::
ostringstream
tmp
;
if
(
!
strstr
(
CTX
::
instance
()
->
solver
.
socketName
.
c_str
(),
":"
)){
// Unix socket
tmp
<<
CTX
::
instance
()
->
homeDir
<<
CTX
::
instance
()
->
solver
.
socketName
<<
getId
();
sockname
=
FixWindowsPath
(
tmp
.
str
());
}
}
int
NonBlockingWait
(
double
waitint
,
double
timeout
)
else
{
{
// TCP/IP socket
double
start
=
GetTimeInSeconds
();
if
(
CTX
::
instance
()
->
solver
.
socketName
.
size
()
&&
while
(
1
){
CTX
::
instance
()
->
solver
.
socketName
[
0
]
==
':'
)
if
(
timeout
>
0
&&
GetTimeInSeconds
()
-
start
>
timeout
)
tmp
<<
GetHostName
();
// prepend hostname if only the port number is given
return
2
;
// timeout
tmp
<<
CTX
::
instance
()
->
solver
.
socketName
<<
getId
();
/*if(_client->getPid() < 0 || (_client->getExecutable().empty() &&
sockname
=
tmp
.
str
();
!CTX::instance()->solver.listen))
return 1; // process has been killed or we stopped listening*/
// check if there is data (call select with a zero timeout to
// return immediately, i.e., do polling)
bool
somethingHappend
=
false
;
for
(
std
::
map
<
GmshServer
*
,
onelab
::
localNetworkClient
*>::
iterator
it
=
_clients
.
begin
();
it
!=
_clients
.
end
();
)
{
GmshServer
*
server
=
it
->
first
;
std
::
map
<
GmshServer
*
,
onelab
::
localNetworkClient
*>::
iterator
next
=
it
;
next
++
;
if
(
server
->
Select
(
0
,
0
)){
receiveMessage
(
server
);
somethingHappend
=
true
;
}
it
=
next
;
}
if
(
!
somethingHappend
){
// nothing available
// if asked, refresh the onelab GUI
std
::
vector
<
onelab
::
string
>
ps
;
onelab
::
server
::
instance
()
->
get
(
ps
,
"Gmsh/Action"
);
if
(
ps
.
size
()
&&
ps
[
0
].
getValue
()
==
"refresh"
){
ps
[
0
].
setVisible
(
false
);
ps
[
0
].
setValue
(
""
);
onelab
::
server
::
instance
()
->
set
(
ps
[
0
]);
if
(
FlGui
::
available
())
onelab_cb
(
0
,
(
void
*
)
"refresh"
);
}
}
// wait at most waitint seconds and respond to FLTK events
if
(
FlGui
::
available
())
FlGui
::
instance
()
->
wait
(
waitint
);
std
::
string
command
=
FixWindowsPath
(
_executable
);
if
(
command
.
size
()){
std
::
vector
<
std
::
string
>
args
=
onelabUtils
::
getCommandLine
(
this
);
for
(
unsigned
int
i
=
0
;
i
<
args
.
size
();
i
++
)
command
.
append
(
" "
+
args
[
i
]);
command
.
append
(
" "
+
getSocketSwitch
()
+
"
\"
"
+
getName
()
+
"
\"
%s"
);
}
else
{
Msg
::
Info
(
"Listening on socket '%s'"
,
sockname
.
c_str
());
}
int
sock
;
try
{
sock
=
server
->
Start
(
command
.
c_str
(),
sockname
.
c_str
(),
CTX
::
instance
()
->
solver
.
timeout
);
}
}
return
_clients
.
empty
();
catch
(
const
char
*
err
){
Msg
::
Error
(
"%s (on socket '%s')"
,
err
,
sockname
.
c_str
());
sock
=
-
1
;
}
}
if
(
sock
<
0
){
server
->
Shutdown
();
delete
server
;
return
false
;
}
}
void
receiveMessage
(
GmshServer
*
server
)
Msg
::
StatusBar
(
true
,
"Running '%s'..."
,
_name
.
c_str
());
{
onelab
::
localNetworkClient
*
client
=
_clients
[
server
];
while
(
1
)
{
if
(
_pid
<
0
||
(
command
.
empty
()
&&
!
CTX
::
instance
()
->
solver
.
listen
))
break
;
int
stop
=
server
->
NonBlockingWait
(
sock
,
0.001
,
0.
);
if
(
stop
||
_pid
<
0
||
(
command
.
empty
()
&&
!
CTX
::
instance
()
->
solver
.
listen
))
break
;
double
timer
=
GetTimeInSeconds
();
int
type
,
length
,
swap
;
int
type
,
length
,
swap
;
if
(
!
server
->
ReceiveHeader
(
&
type
,
&
length
,
&
swap
)){
if
(
!
server
->
ReceiveHeader
(
&
type
,
&
length
,
&
swap
)){
Msg
::
Error
(
"Did not receive message header: stopping server"
);
Msg
::
Error
(
"Did not receive message header: stopping server"
);
re
turn
;
b
re
ak
;
}
}
std
::
string
message
(
length
,
' '
);
std
::
string
message
(
length
,
' '
);
if
(
!
server
->
ReceiveMessage
(
length
,
&
message
[
0
])){
if
(
!
server
->
ReceiveMessage
(
length
,
&
message
[
0
])){
Msg
::
Error
(
"Did not receive message body: stopping server"
);
Msg
::
Error
(
"Did not receive message body: stopping server"
);
re
turn
;
b
re
ak
;
}
}
//printf("%i %s\n", type, message.c_str());
double
timer
=
GetTimeInSeconds
();
switch
(
type
)
{
switch
(
type
)
{
case
GmshSocket
::
GMSH_START
:
case
GmshSocket
::
GMSH_START
:
//
_pid = atoi(message.c_str());
_pid
=
atoi
(
message
.
c_str
());
//
_gmshServer = server;
_gmshServer
=
server
;
break
;
break
;
case
GmshSocket
::
GMSH_STOP
:
case
GmshSocket
::
GMSH_STOP
:
server
->
Shutdown
();
_pid
=
-
1
;
client
->
setPid
(
-
1
);
_gmshServer
=
0
;
client
->
setGmshServer
(
0
);
_clients
.
erase
(
server
);
delete
server
;
break
;
break
;
case
GmshSocket
::
GMSH_PARAMETER
:
case
GmshSocket
::
GMSH_PARAMETER
:
{
{
...
@@ -185,20 +191,20 @@ class socketListener {
...
@@ -185,20 +191,20 @@ class socketListener {
onelab
::
parameter
::
version
().
c_str
(),
version
.
c_str
());
onelab
::
parameter
::
version
().
c_str
(),
version
.
c_str
());
}
}
else
if
(
type
==
"number"
){
else
if
(
type
==
"number"
){
onelab
::
number
p
;
p
.
fromChar
(
message
);
client
->
set
(
p
);
onelab
::
number
p
;
p
.
fromChar
(
message
);
set
(
p
);
if
(
p
.
getName
()
==
client
->
getName
()
+
"/Progress"
)
if
(
p
.
getName
()
==
getName
()
+
"/Progress"
)
if
(
FlGui
::
available
())
if
(
FlGui
::
available
())
FlGui
::
instance
()
->
setProgress
(
p
.
getLabel
().
c_str
(),
p
.
getValue
(),
FlGui
::
instance
()
->
setProgress
(
p
.
getLabel
().
c_str
(),
p
.
getValue
(),
p
.
getMin
(),
p
.
getMax
());
p
.
getMin
(),
p
.
getMax
());
}
}
else
if
(
type
==
"string"
){
else
if
(
type
==
"string"
){
onelab
::
string
p
;
p
.
fromChar
(
message
);
client
->
set
(
p
);
onelab
::
string
p
;
p
.
fromChar
(
message
);
set
(
p
);
}
}
else
if
(
type
==
"region"
){
else
if
(
type
==
"region"
){
onelab
::
region
p
;
p
.
fromChar
(
message
);
client
->
set
(
p
);
onelab
::
region
p
;
p
.
fromChar
(
message
);
set
(
p
);
}
}
else
if
(
type
==
"function"
){
else
if
(
type
==
"function"
){
onelab
::
function
p
;
p
.
fromChar
(
message
);
client
->
set
(
p
);
onelab
::
function
p
;
p
.
fromChar
(
message
);
set
(
p
);
}
}
else
else
Msg
::
Error
(
"Unknown OneLab parameter type: %s"
,
type
.
c_str
());
Msg
::
Error
(
"Unknown OneLab parameter type: %s"
,
type
.
c_str
());
...
@@ -213,19 +219,19 @@ class socketListener {
...
@@ -213,19 +219,19 @@ class socketListener {
onelab
::
parameter
::
version
().
c_str
(),
version
.
c_str
());
onelab
::
parameter
::
version
().
c_str
(),
version
.
c_str
());
}
}
else
if
(
type
==
"number"
){
else
if
(
type
==
"number"
){
std
::
vector
<
onelab
::
number
>
par
;
client
->
get
(
par
,
name
);
std
::
vector
<
onelab
::
number
>
par
;
get
(
par
,
name
);
if
(
par
.
size
()
==
1
)
reply
=
par
[
0
].
toChar
();
if
(
par
.
size
()
==
1
)
reply
=
par
[
0
].
toChar
();
}
}
else
if
(
type
==
"string"
){
else
if
(
type
==
"string"
){
std
::
vector
<
onelab
::
string
>
par
;
client
->
get
(
par
,
name
);
std
::
vector
<
onelab
::
string
>
par
;
get
(
par
,
name
);
if
(
par
.
size
()
==
1
)
reply
=
par
[
0
].
toChar
();
if
(
par
.
size
()
==
1
)
reply
=
par
[
0
].
toChar
();
}
}
else
if
(
type
==
"region"
){
else
if
(
type
==
"region"
){
std
::
vector
<
onelab
::
region
>
par
;
client
->
get
(
par
,
name
);
std
::
vector
<
onelab
::
region
>
par
;
get
(
par
,
name
);
if
(
par
.
size
()
==
1
)
reply
=
par
[
0
].
toChar
();
if
(
par
.
size
()
==
1
)
reply
=
par
[
0
].
toChar
();
}
}
else
if
(
type
==
"function"
){
else
if
(
type
==
"function"
){
std
::
vector
<
onelab
::
function
>
par
;
client
->
get
(
par
,
name
);
std
::
vector
<
onelab
::
function
>
par
;
get
(
par
,
name
);
if
(
par
.
size
()
==
1
)
reply
=
par
[
0
].
toChar
();
if
(
par
.
size
()
==
1
)
reply
=
par
[
0
].
toChar
();
}
}
else
else
...
@@ -243,18 +249,55 @@ class socketListener {
...
@@ -243,18 +249,55 @@ class socketListener {
}
}
break
;
break
;
case
GmshSocket
::
GMSH_PARAM_QUERY_ALL
:
case
GmshSocket
::
GMSH_PARAM_QUERY_ALL
:
{
std
::
string
version
,
type
,
name
,
reply
;
std
::
vector
<
std
::
string
>
replies
;
onelab
::
parameter
::
getInfoFromChar
(
message
,
version
,
type
,
name
);
if
(
onelab
::
parameter
::
version
()
!=
version
){
Msg
::
Error
(
"OneLab version mismatch (server: %s / client: %s)"
,
onelab
::
parameter
::
version
().
c_str
(),
version
.
c_str
());
}
else
if
(
type
==
"number"
){
std
::
vector
<
onelab
::
number
>
numbers
;
get
(
numbers
);
for
(
std
::
vector
<
onelab
::
number
>::
iterator
it
=
numbers
.
begin
();
it
!=
numbers
.
end
();
it
++
)
replies
.
push_back
((
*
it
).
toChar
());
}
else
if
(
type
==
"string"
){
std
::
vector
<
onelab
::
string
>
strings
;
get
(
strings
);
for
(
std
::
vector
<
onelab
::
string
>::
iterator
it
=
strings
.
begin
();
it
!=
strings
.
end
();
it
++
)
replies
.
push_back
((
*
it
).
toChar
());
}
else
if
(
type
==
"region"
){
std
::
vector
<
onelab
::
region
>
regions
;
get
(
regions
);
for
(
std
::
vector
<
onelab
::
region
>::
iterator
it
=
regions
.
begin
();
it
!=
regions
.
end
();
it
++
)
replies
.
push_back
((
*
it
).
toChar
());
}
else
if
(
type
==
"function"
){
std
::
vector
<
onelab
::
function
>
functions
;
get
(
functions
);
for
(
std
::
vector
<
onelab
::
function
>::
iterator
it
=
functions
.
begin
();
it
!=
functions
.
end
();
it
++
)
replies
.
push_back
((
*
it
).
toChar
());
}
else
Msg
::
Error
(
"Unknown OneLab parameter type in query: %s"
,
type
.
c_str
());
for
(
unsigned
int
i
=
0
;
i
<
replies
.
size
();
i
++
)
server
->
SendMessage
(
GmshSocket
::
GMSH_PARAM_QUERY_ALL
,
replies
[
i
].
size
(),
&
replies
[
i
][
0
]);
reply
=
"Sent all OneLab "
+
type
+
"s"
;
server
->
SendMessage
(
GmshSocket
::
GMSH_PARAM_QUERY_END
,
reply
.
size
(),
&
reply
[
0
]);
}
break
;
break
;
case
GmshSocket
::
GMSH_PROGRESS
:
case
GmshSocket
::
GMSH_PROGRESS
:
Msg
::
StatusBar
(
false
,
"%s %s"
,
client
->
getN
ame
()
.
c_str
(),
message
.
c_str
());
Msg
::
StatusBar
(
false
,
"%s %s"
,
_n
ame
.
c_str
(),
message
.
c_str
());
break
;
break
;
case
GmshSocket
::
GMSH_INFO
:
case
GmshSocket
::
GMSH_INFO
:
Msg
::
Direct
(
"Info : %s - %s"
,
client
->
getN
ame
()
.
c_str
(),
message
.
c_str
());
Msg
::
Direct
(
"Info : %s - %s"
,
_n
ame
.
c_str
(),
message
.
c_str
());
break
;
break
;
case
GmshSocket
::
GMSH_WARNING
:
case
GmshSocket
::
GMSH_WARNING
:
Msg
::
Warning
(
"%s - %s"
,
client
->
getN
ame
()
.
c_str
(),
message
.
c_str
());
Msg
::
Warning
(
"%s - %s"
,
_n
ame
.
c_str
(),
message
.
c_str
());
break
;
break
;
case
GmshSocket
::
GMSH_ERROR
:
case
GmshSocket
::
GMSH_ERROR
:
Msg
::
Error
(
"%s - %s"
,
client
->
getN
ame
()
.
c_str
(),
message
.
c_str
());
Msg
::
Error
(
"%s - %s"
,
_n
ame
.
c_str
(),
message
.
c_str
());
break
;
break
;
case
GmshSocket
::
GMSH_MERGE_FILE
:
case
GmshSocket
::
GMSH_MERGE_FILE
:
if
(
CTX
::
instance
()
->
solver
.
autoMergeFile
){
if
(
CTX
::
instance
()
->
solver
.
autoMergeFile
){
...
@@ -276,135 +319,32 @@ class socketListener {
...
@@ -276,135 +319,32 @@ class socketListener {
Msg
::
Info
(
"got %d Mb message in %g seconds"
,
Msg
::
Info
(
"got %d Mb message in %g seconds"
,
length
/
1024
/
1024
,
GetTimeInSeconds
()
-
timer
);
length
/
1024
/
1024
,
GetTimeInSeconds
()
-
timer
);
break
;
break
;
/*
case GmshSocket::GMSH_VERTEX_ARRAY:
case
GmshSocket
::
GMSH_VERTEX_ARRAY
:
{
{
int
n
=
PView
::
list
.
size
();
int
n
=
PView
::
list
.
size
();
PView::fillVertexArray(
server
, length, &message[0], swap);
PView
::
fillVertexArray
(
this
,
length
,
&
message
[
0
],
swap
);
if
(
FlGui
::
available
())
if
(
FlGui
::
available
())
FlGui
::
instance
()
->
updateViews
(
n
!=
(
int
)
PView
::
list
.
size
());
FlGui
::
instance
()
->
updateViews
(
n
!=
(
int
)
PView
::
list
.
size
());
drawContext
::
global
()
->
draw
();
drawContext
::
global
()
->
draw
();
}
}
break;
*/
break
;
default
:
default
:
Msg
::
Warning
(
"Received unknown message type (%d)"
,
type
);
Msg
::
Warning
(
"Received unknown message type (%d)"
,
type
);
break
;
break
;
case
GmshSocket
::
GMSH_CONNECT
:
{
const
std
::
string
subClientName
=
message
;
onelab
::
localNetworkClient
*
subClient
=
dynamic_cast
<
onelab
::
localNetworkClient
*>
(
onelab
::
server
::
instance
()
->
findClient
(
subClientName
)
->
second
);
if
(
!
subClient
)
{
subClient
=
new
onelab
::
localNetworkClient
(
subClientName
,
""
);
}
//if (onelab::server::instance()->getChanged(subClientName)) {
std
::
string
sockname
;
std
::
ostringstream
tmp
;
if
(
!
strstr
(
CTX
::
instance
()
->
solver
.
socketName
.
c_str
(),
":"
)){
// Unix socket
tmp
<<
CTX
::
instance
()
->
homeDir
<<
CTX
::
instance
()
->
solver
.
socketName
<<
subClient
->
getId
();
sockname
=
FixWindowsPath
(
tmp
.
str
());
}
else
{
// TCP/IP socket
if
(
CTX
::
instance
()
->
solver
.
socketName
.
size
()
&&
CTX
::
instance
()
->
solver
.
socketName
[
0
]
==
':'
)
tmp
<<
GetHostName
();
// prepend hostname if only the port number is given
tmp
<<
CTX
::
instance
()
->
solver
.
socketName
<<
subClient
->
getId
();
sockname
=
tmp
.
str
();
}
}
server
->
SendString
(
GmshSocket
::
GMSH_CONNECT
,
sockname
.
c_str
());
GmshServer
*
subServer
=
new
onelabGmshServer
(
subClient
,
true
);
subServer
->
Start
(
""
,
sockname
.
c_str
(),
CTX
::
instance
()
->
solver
.
timeout
);
addClient
(
subClient
,
subServer
);
/*}
else {
server->SendString(GmshSocket::GMSH_CONNECT, "");
}*/
}
}
}
}
};
bool
onelab
::
localNetworkClient
::
run
()
{
if
(
getExecutable
().
empty
())
return
false
;
printf
(
"Onelab local client :: run on '%s'
\n
"
,
getName
().
c_str
());
new_connection:
_pid
=
0
;
_gmshServer
=
0
;
_gmshServer
=
0
;
onelabGmshServer
*
server
=
new
onelabGmshServer
(
this
,
CTX
::
instance
()
->
solver
.
listen
);
std
::
string
sockname
;
std
::
ostringstream
tmp
;
if
(
!
strstr
(
CTX
::
instance
()
->
solver
.
socketName
.
c_str
(),
":"
)){
// Unix socket
tmp
<<
CTX
::
instance
()
->
homeDir
<<
CTX
::
instance
()
->
solver
.
socketName
<<
getId
();
sockname
=
FixWindowsPath
(
tmp
.
str
());
}
else
{
// TCP/IP socket
if
(
CTX
::
instance
()
->
solver
.
socketName
.
size
()
&&
CTX
::
instance
()
->
solver
.
socketName
[
0
]
==
':'
)
tmp
<<
GetHostName
();
// prepend hostname if only the port number is given
tmp
<<
CTX
::
instance
()
->
solver
.
socketName
<<
getId
();
sockname
=
tmp
.
str
();
}
std
::
string
command
=
FixWindowsPath
(
_executable
);
if
(
command
.
size
()){
std
::
vector
<
std
::
string
>
args
=
onelabUtils
::
getCommandLine
(
this
);
for
(
unsigned
int
i
=
0
;
i
<
args
.
size
();
i
++
)
command
.
append
(
" "
+
args
[
i
]);
command
.
append
(
" "
+
getSocketSwitch
()
+
"
\"
"
+
getName
()
+
"
\"
%s"
);
}
else
{
Msg
::
Info
(
"Listening on socket '%s'"
,
sockname
.
c_str
());
}
int
sock
;
printf
(
"TRY
\n
"
);
try
{
sock
=
server
->
Start
(
command
.
c_str
(),
sockname
.
c_str
(),
CTX
::
instance
()
->
solver
.
timeout
);
}
catch
(
const
char
*
err
){
Msg
::
Error
(
"%s (on socket '%s')"
,
err
,
sockname
.
c_str
());
sock
=
-
1
;
}
printf
(
"END TRY
\n
"
);
if
(
sock
<
0
){
server
->
Shutdown
();
server
->
Shutdown
();
delete
server
;
delete
server
;
return
false
;
}
Msg
::
StatusBar
(
true
,
"Running '%s'..."
,
_name
.
c_str
());
socketListener
*
listener
=
new
socketListener
();
listener
->
addClient
(
this
,
server
);
while
(
1
)
{
if
(
_pid
<
0
||
(
command
.
empty
()
&&
!
CTX
::
instance
()
->
solver
.
listen
))
break
;
int
stop
=
listener
->
NonBlockingWait
(
0.001
,
0.
);
if
(
stop
||
_pid
<
0
||
(
command
.
empty
()
&&
!
CTX
::
instance
()
->
solver
.
listen
))
break
;
}
_gmshServer
=
0
;
delete
listener
;
Msg
::
StatusBar
(
true
,
"Done running '%s'"
,
_name
.
c_str
());
Msg
::
StatusBar
(
true
,
"Done running '%s'"
,
_name
.
c_str
());
if
(
command
.
empty
()){
if
(
command
.
empty
()){
Msg
::
Info
(
"Client disconnected: starting new connection"
);
Msg
::
Info
(
"Client disconnected: starting new connection"
);
goto
new_connection
;
goto
new_connection
;
}
}
return
true
;
return
true
;
}
}
...
@@ -534,6 +474,7 @@ static void loadDb(const std::string &name)
...
@@ -534,6 +474,7 @@ static void loadDb(const std::string &name)
void
onelab_cb
(
Fl_Widget
*
w
,
void
*
data
)
void
onelab_cb
(
Fl_Widget
*
w
,
void
*
data
)
{
{
if
(
!
data
)
return
;
if
(
!
data
)
return
;
std
::
string
action
((
const
char
*
)
data
);
std
::
string
action
((
const
char
*
)
data
);
if
(
action
==
"refresh"
){
if
(
action
==
"refresh"
){
...
@@ -612,6 +553,8 @@ void onelab_cb(Fl_Widget *w, void *data)
...
@@ -612,6 +553,8 @@ void onelab_cb(Fl_Widget *w, void *data)
return
;
return
;
}
}
Msg
::
ResetErrorCounter
();
FlGui
::
instance
()
->
onelab
->
setButtonMode
(
""
,
"stop"
);
FlGui
::
instance
()
->
onelab
->
setButtonMode
(
""
,
"stop"
);
if
(
action
==
"compute"
)
initializeLoops
();
if
(
action
==
"compute"
)
initializeLoops
();
...
@@ -639,7 +582,6 @@ void onelab_cb(Fl_Widget *w, void *data)
...
@@ -639,7 +582,6 @@ void onelab_cb(Fl_Widget *w, void *data)
OpenProject
(
GModel
::
current
()
->
getFileName
());
OpenProject
(
GModel
::
current
()
->
getFileName
());
drawContext
::
global
()
->
draw
();
drawContext
::
global
()
->
draw
();
}
}
Msg
::
ResetErrorCounter
();
#endif
#endif
}
}
else
{
else
{
...
@@ -981,7 +923,7 @@ void onelabGroup::_addMenu(const std::string &path, Fl_Callback *callback, void
...
@@ -981,7 +923,7 @@ void onelabGroup::_addMenu(const std::string &path, Fl_Callback *callback, void
void
onelabGroup
::
_addViewMenu
(
int
num
)
void
onelabGroup
::
_addViewMenu
(
int
num
)
{
{
std
::
ostringstream
path
;
std
::
ostringstream
path
;
path
<<
"0
Gmsh m
odules/Post-processing/View"
<<
num
;
path
<<
"0
M
odules/Post-processing/View"
<<
num
;
Fl_Tree_Item
*
n
=
_tree
->
add
(
path
.
str
().
c_str
());
Fl_Tree_Item
*
n
=
_tree
->
add
(
path
.
str
().
c_str
());
int
ww
=
_baseWidth
-
(
n
->
depth
()
+
1
)
*
_indent
;
int
ww
=
_baseWidth
-
(
n
->
depth
()
+
1
)
*
_indent
;
_tree
->
begin
();
_tree
->
begin
();
...
@@ -994,7 +936,7 @@ void onelabGroup::_addViewMenu(int num)
...
@@ -994,7 +936,7 @@ void onelabGroup::_addViewMenu(int num)
viewButton
*
onelabGroup
::
getViewButton
(
int
num
)
viewButton
*
onelabGroup
::
getViewButton
(
int
num
)
{
{
char
tmp
[
256
];
char
tmp
[
256
];
sprintf
(
tmp
,
"0
Gmsh m
odules/Post-processing/View%d"
,
num
);
sprintf
(
tmp
,
"0
M
odules/Post-processing/View%d"
,
num
);
Fl_Tree_Item
*
n
=
_tree
->
find_item
(
tmp
);
Fl_Tree_Item
*
n
=
_tree
->
find_item
(
tmp
);
if
(
n
)
return
(
viewButton
*
)
n
->
widget
();
if
(
n
)
return
(
viewButton
*
)
n
->
widget
();
return
0
;
return
0
;
...
@@ -1143,7 +1085,8 @@ Fl_Widget *onelabGroup::_addParameterWidget(onelab::number &p, Fl_Tree_Item *n,
...
@@ -1143,7 +1085,8 @@ Fl_Widget *onelabGroup::_addParameterWidget(onelab::number &p, Fl_Tree_Item *n,
}
}
// general number input
// general number input
inputRange
*
but
=
new
inputRange
(
1
,
1
,
ww
,
1
,
onelab
::
parameter
::
maxNumber
());
inputRange
*
but
=
new
inputRange
(
1
,
1
,
ww
,
1
,
onelab
::
parameter
::
maxNumber
(),
p
.
getAttribute
(
"ReadOnlyRange"
)
==
"1"
);
but
->
value
(
p
.
getValue
());
but
->
value
(
p
.
getValue
());
but
->
minimum
(
p
.
getMin
());
but
->
minimum
(
p
.
getMin
());
but
->
maximum
(
p
.
getMax
());
but
->
maximum
(
p
.
getMax
());
...
@@ -1173,6 +1116,21 @@ static void onelab_string_button_cb(Fl_Widget *w, void *data)
...
@@ -1173,6 +1116,21 @@ static void onelab_string_button_cb(Fl_Widget *w, void *data)
}
}
}
}
static
void
onelab_string_input_cb
(
Fl_Widget
*
w
,
void
*
data
)
{
if
(
!
data
)
return
;
std
::
string
name
=
FlGui
::
instance
()
->
onelab
->
getPath
((
Fl_Tree_Item
*
)
data
);
std
::
vector
<
onelab
::
string
>
strings
;
onelab
::
server
::
instance
()
->
get
(
strings
,
name
);
if
(
strings
.
size
()){
Fl_Input
*
o
=
(
Fl_Input
*
)
w
;
onelab
::
string
old
=
strings
[
0
];
strings
[
0
].
setValue
(
o
->
value
());
onelab
::
server
::
instance
()
->
set
(
strings
[
0
]);
autoCheck
(
old
,
strings
[
0
]);
}
}
static
void
onelab_string_input_choice_cb
(
Fl_Widget
*
w
,
void
*
data
)
static
void
onelab_string_input_choice_cb
(
Fl_Widget
*
w
,
void
*
data
)
{
{
if
(
!
data
)
return
;
if
(
!
data
)
return
;
...
@@ -1183,6 +1141,17 @@ static void onelab_string_input_choice_cb(Fl_Widget *w, void *data)
...
@@ -1183,6 +1141,17 @@ static void onelab_string_input_choice_cb(Fl_Widget *w, void *data)
Fl_Input_Choice
*
o
=
(
Fl_Input_Choice
*
)
w
;
Fl_Input_Choice
*
o
=
(
Fl_Input_Choice
*
)
w
;
onelab
::
string
old
=
strings
[
0
];
onelab
::
string
old
=
strings
[
0
];
strings
[
0
].
setValue
(
o
->
value
());
strings
[
0
].
setValue
(
o
->
value
());
std
::
string
choices
;
for
(
int
i
=
0
;
i
<
o
->
menubutton
()
->
menu
()
->
size
();
i
++
){
if
(
o
->
menubutton
()
->
menu
()[
i
].
flags
&
FL_MENU_TOGGLE
){
if
(
o
->
menubutton
()
->
menu
()[
i
].
flags
&
FL_MENU_VALUE
)
choices
+=
"1"
;
else
choices
+=
"0"
;
}
}
if
(
choices
.
size
())
strings
[
0
].
setAttribute
(
"MultipleSelection"
,
choices
);
onelab
::
server
::
instance
()
->
set
(
strings
[
0
]);
onelab
::
server
::
instance
()
->
set
(
strings
[
0
]);
autoCheck
(
old
,
strings
[
0
]);
autoCheck
(
old
,
strings
[
0
]);
}
}
...
@@ -1213,6 +1182,22 @@ static void onelab_input_choice_file_merge_cb(Fl_Widget *w, void *data)
...
@@ -1213,6 +1182,22 @@ static void onelab_input_choice_file_merge_cb(Fl_Widget *w, void *data)
drawContext
::
global
()
->
draw
();
drawContext
::
global
()
->
draw
();
}
}
static
void
multiple_selection_menu_cb
(
Fl_Widget
*
w
,
void
*
data
)
{
Fl_Menu_Button
*
menu
=
(
Fl_Menu_Button
*
)
w
;
std
::
string
val
;
for
(
int
i
=
0
;
i
<
menu
->
size
()
-
1
;
i
++
)
{
const
Fl_Menu_Item
&
item
=
menu
->
menu
()[
i
];
if
(
item
.
value
()
&&
item
.
label
()){
if
(
val
.
size
())
val
+=
", "
;
val
+=
item
.
label
();
}
}
Fl_Input_Choice
*
but
=
(
Fl_Input_Choice
*
)
data
;
but
->
value
(
val
.
c_str
());
but
->
do_callback
();
}
Fl_Widget
*
onelabGroup
::
_addParameterWidget
(
onelab
::
string
&
p
,
Fl_Tree_Item
*
n
,
Fl_Widget
*
onelabGroup
::
_addParameterWidget
(
onelab
::
string
&
p
,
Fl_Tree_Item
*
n
,
bool
highlight
,
Fl_Color
c
)
bool
highlight
,
Fl_Color
c
)
{
{
...
@@ -1242,15 +1227,32 @@ Fl_Widget *onelabGroup::_addParameterWidget(onelab::string &p, Fl_Tree_Item *n,
...
@@ -1242,15 +1227,32 @@ Fl_Widget *onelabGroup::_addParameterWidget(onelab::string &p, Fl_Tree_Item *n,
return
but
;
return
but
;
}
}
// simple string (no menu)
if
(
p
.
getChoices
().
empty
()
&&
p
.
getKind
()
!=
"file"
){
Fl_Input
*
but
=
new
Fl_Input
(
1
,
1
,
ww
,
1
);
but
->
value
(
p
.
getValue
().
c_str
());
but
->
callback
(
onelab_string_input_cb
,
(
void
*
)
n
);
but
->
when
(
FL_WHEN_ENTER_KEY
);
but
->
align
(
FL_ALIGN_RIGHT
);
if
(
highlight
)
but
->
color
(
c
);
return
but
;
}
// general string input
// general string input
Fl_Input_Choice
*
but
=
new
Fl_Input_Choice
(
1
,
1
,
ww
,
1
);
Fl_Input_Choice
*
but
=
new
Fl_Input_Choice
(
1
,
1
,
ww
,
1
);
std
::
string
multipleSelection
=
p
.
getAttribute
(
"MultipleSelection"
);
if
(
multipleSelection
.
size
())
but
->
menubutton
()
->
callback
(
multiple_selection_menu_cb
,
but
);
std
::
vector
<
Fl_Menu_Item
>
menu
;
std
::
vector
<
Fl_Menu_Item
>
menu
;
for
(
unsigned
int
j
=
0
;
j
<
p
.
getChoices
().
size
();
j
++
){
for
(
unsigned
int
j
=
0
;
j
<
p
.
getChoices
().
size
();
j
++
){
char
*
str
=
strdup
(
p
.
getChoices
()[
j
].
c_str
());
char
*
str
=
strdup
(
p
.
getChoices
()[
j
].
c_str
());
_treeStrings
.
push_back
(
str
);
_treeStrings
.
push_back
(
str
);
bool
divider
=
(
p
.
getKind
()
==
"file"
&&
bool
divider
=
(
p
.
getKind
()
==
"file"
&&
j
==
p
.
getChoices
().
size
()
-
1
);
j
==
p
.
getChoices
().
size
()
-
1
);
Fl_Menu_Item
it
=
{
str
,
0
,
0
,
0
,
divider
?
FL_MENU_DIVIDER
:
0
};
int
choice
=
multipleSelection
.
size
()
?
FL_MENU_TOGGLE
:
0
;
if
(
multipleSelection
.
size
()
>
j
&&
multipleSelection
[
j
]
==
'1'
)
choice
|=
FL_MENU_VALUE
;
Fl_Menu_Item
it
=
{
str
,
0
,
0
,
0
,
divider
?
FL_MENU_DIVIDER
:
choice
};
menu
.
push_back
(
it
);
menu
.
push_back
(
it
);
}
}
if
(
p
.
getKind
()
==
"file"
){
if
(
p
.
getKind
()
==
"file"
){
...
@@ -1426,7 +1428,6 @@ void onelabGroup::openTreeItem(const std::string &name)
...
@@ -1426,7 +1428,6 @@ void onelabGroup::openTreeItem(const std::string &name)
void
onelabGroup
::
checkForErrors
(
const
std
::
string
&
client
)
void
onelabGroup
::
checkForErrors
(
const
std
::
string
&
client
)
{
{
if
(
Msg
::
GetErrorCount
()
>
0
&&
!
CTX
::
instance
()
->
expertMode
){
if
(
Msg
::
GetErrorCount
()
>
0
&&
!
CTX
::
instance
()
->
expertMode
){
Msg
::
ResetErrorCounter
();
std
::
string
msg
std
::
string
msg
(
client
+
" reported an error: do you really want to continue?
\n\n
"
(
client
+
" reported an error: do you really want to continue?
\n\n
"
"(To disable this warning in the future, select `Enable expert mode'
\n
"
"(To disable this warning in the future, select `Enable expert mode'
\n
"
...
@@ -1628,8 +1629,6 @@ void onelabGroup::removeSolver(const std::string &name)
...
@@ -1628,8 +1629,6 @@ void onelabGroup::removeSolver(const std::string &name)
void
solver_cb
(
Fl_Widget
*
w
,
void
*
data
)
void
solver_cb
(
Fl_Widget
*
w
,
void
*
data
)
{
{
Msg
::
ResetErrorCounter
();
int
num
=
(
intptr_t
)
data
;
int
num
=
(
intptr_t
)
data
;
if
(
num
>=
0
){
if
(
num
>=
0
){
std
::
string
name
=
opt_solver_name
(
num
,
GMSH_GET
,
""
);
std
::
string
name
=
opt_solver_name
(
num
,
GMSH_GET
,
""
);
...
@@ -1716,7 +1715,6 @@ void flgui_wait_cb(double time)
...
@@ -1716,7 +1715,6 @@ void flgui_wait_cb(double time)
int
metamodel_cb
(
const
std
::
string
&
name
,
const
std
::
string
&
action
)
int
metamodel_cb
(
const
std
::
string
&
name
,
const
std
::
string
&
action
)
{
{
#if defined(HAVE_ONELAB_METAMODEL)
#if defined(HAVE_ONELAB_METAMODEL)
Msg
::
ResetErrorCounter
();
if
(
FlGui
::
instance
()
->
onelab
->
isBusy
())
if
(
FlGui
::
instance
()
->
onelab
->
isBusy
())
FlGui
::
instance
()
->
onelab
->
show
();
FlGui
::
instance
()
->
onelab
->
show
();
else
{
else
{
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment