Skip to content
Snippets Groups Projects
Commit b746b947 authored by Christophe Geuzaine's avatar Christophe Geuzaine
Browse files

*** empty log message ***

parent 1341ed17
No related branches found
No related tags found
No related merge requests found
...@@ -112,7 +112,7 @@ StringXString MeshOptions_String[] = { ...@@ -112,7 +112,7 @@ StringXString MeshOptions_String[] = {
StringXString SolverOptions_String[] = { StringXString SolverOptions_String[] = {
#if defined(WIN32) && !defined(__CYGWIN__) #if defined(WIN32) && !defined(__CYGWIN__)
{ F|O, "SocketName" , opt_solver_socket_name , "127.0.0.1:33791" , { F|O, "SocketName" , opt_solver_socket_name , "127.0.0.1:44122" ,
#else #else
{ F|O, "SocketName" , opt_solver_socket_name , ".gmshsock" , { F|O, "SocketName" , opt_solver_socket_name , ".gmshsock" ,
#endif #endif
......
...@@ -149,7 +149,7 @@ class GmshServer { ...@@ -149,7 +149,7 @@ class GmshServer {
_portno = -1; _portno = -1;
} }
else{ else{
// INET socket // TCP/IP socket
char *port = strstr(_sockname, ":"); char *port = strstr(_sockname, ":");
_portno = atoi(port+1); _portno = atoi(port+1);
} }
......
// $Id: Message.cpp,v 1.69 2006-02-22 19:39:50 geuzaine Exp $ // $Id: Message.cpp,v 1.70 2006-02-25 05:27:59 geuzaine Exp $
// //
// Copyright (C) 1997-2006 C. Geuzaine, J.-F. Remacle // Copyright (C) 1997-2006 C. Geuzaine, J.-F. Remacle
// //
...@@ -21,7 +21,6 @@ ...@@ -21,7 +21,6 @@
#if !defined(WIN32) || defined(__CYGWIN__) #if !defined(WIN32) || defined(__CYGWIN__)
#include <unistd.h> #include <unistd.h>
#include <signal.h>
#include <sys/time.h> #include <sys/time.h>
#include <sys/resource.h> #include <sys/resource.h>
#endif #endif
...@@ -31,6 +30,8 @@ ...@@ -31,6 +30,8 @@
#define RUSAGE_CHILDREN -1 #define RUSAGE_CHILDREN -1
#endif #endif
#include <signal.h>
#include "Gmsh.h" #include "Gmsh.h"
#include "GmshUI.h" #include "GmshUI.h"
#include "GmshVersion.h" #include "GmshVersion.h"
...@@ -47,7 +48,6 @@ extern Context_T CTX; ...@@ -47,7 +48,6 @@ extern Context_T CTX;
void Signal(int sig_num) void Signal(int sig_num)
{ {
#if !defined(WIN32) || defined(__CYGWIN__)
switch (sig_num) { switch (sig_num) {
case SIGSEGV: case SIGSEGV:
Msg(FATAL1, "Segmentation violation (invalid memory reference)"); Msg(FATAL1, "Segmentation violation (invalid memory reference)");
...@@ -67,7 +67,6 @@ void Signal(int sig_num) ...@@ -67,7 +67,6 @@ void Signal(int sig_num)
Msg(FATAL, "Unknown signal"); Msg(FATAL, "Unknown signal");
break; break;
} }
#endif
} }
// General purpose message routine // General purpose message routine
......
// $Id: Solvers.cpp,v 1.48 2006-02-24 22:07:06 geuzaine Exp $ // $Id: Solvers.cpp,v 1.49 2006-02-25 05:27:59 geuzaine Exp $
// //
// Copyright (C) 1997-2006 C. Geuzaine, J.-F. Remacle // Copyright (C) 1997-2006 C. Geuzaine, J.-F. Remacle
// //
...@@ -106,15 +106,17 @@ int Solver(int num, char *args) ...@@ -106,15 +106,17 @@ int Solver(int num, char *args)
} }
if(!strstr(CTX.solver.socket_name, ":")){ if(!strstr(CTX.solver.socket_name, ":")){
// file socket // Unix socket
if(num >= 0) if(num >= 0)
sprintf(tmp, "%s%s-%d", CTX.home_dir, CTX.solver.socket_name, num); sprintf(tmp, "%s%s-%d", CTX.home_dir, CTX.solver.socket_name, num);
else else
sprintf(tmp, "%s%s", CTX.home_dir, CTX.solver.socket_name); sprintf(tmp, "%s%s", CTX.home_dir, CTX.solver.socket_name);
FixWindowsPath(tmp, sockname); FixWindowsPath(tmp, sockname);
} }
else else{
// TCP/IP socket
strcpy(sockname, CTX.solver.socket_name); strcpy(sockname, CTX.solver.socket_name);
}
if(num >= 0){ if(num >= 0){
sprintf(tmp, "\"%s\"", sockname); sprintf(tmp, "\"%s\"", sockname);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment