- Adapted indenation to new agreed upon system

- Added support for second generation scriptcontext based counter
This commit is contained in:
koennecke
2009-02-13 09:00:03 +00:00
parent a3dcad2bfa
commit 91d4af0541
405 changed files with 88101 additions and 88173 deletions

View File

@@ -24,8 +24,8 @@
Some file statics which hold the connection parameters
------------------------------------------------------------------------*/
static char *hostname, *looser, *password, *syncFile;
static int port;
static mkChannel *connection = NULL;
static int port;
static mkChannel *connection = NULL;
/*-----------------------------------------------------------------------*/
static void syncLogin(void)
{
@@ -33,27 +33,23 @@ static void syncLogin(void)
char pBueffel[2048], pRead[80];
/*
connect
*/
connect
*/
connection = NETConnect(hostname, port);
for(i = 0; i < 10; i++)
{
NETRead(connection,pBueffel,1020,10); /* 10 ms M.Z */
if(strstr(pBueffel,"OK") != NULL)
{
for (i = 0; i < 10; i++) {
NETRead(connection, pBueffel, 1020, 10); /* 10 ms M.Z */
if (strstr(pBueffel, "OK") != NULL) {
break;
}
SicsWait(1);
}
if(connection != NULL)
{
if (connection != NULL) {
/*
try a login
*/
sprintf(pBueffel,"%s %s\n", looser, password);
test = NETWrite(connection,pBueffel,strlen(pBueffel));
if(test != 1)
{
try a login
*/
sprintf(pBueffel, "%s %s\n", looser, password);
test = NETWrite(connection, pBueffel, strlen(pBueffel));
if (test != 1) {
printf("Failed at writing user/password\n");
NETClosePort(connection);
free(connection);
@@ -61,248 +57,219 @@ static void syncLogin(void)
}
pBueffel[0] = '\0';
for(i = 0; i < 60; i++)
{
memset(pRead,0,80);
test = NETRead(connection,pRead,70,10); /* 10 ms M.Z. */
if(test < 0)
{
NETClosePort(connection);
free(connection);
connection = NULL;
for (i = 0; i < 60; i++) {
memset(pRead, 0, 80);
test = NETRead(connection, pRead, 70, 10); /* 10 ms M.Z. */
if (test < 0) {
NETClosePort(connection);
free(connection);
connection = NULL;
} else {
strcat(pBueffel, pRead);
}
else
{
strcat(pBueffel,pRead);
}
if(strstr(pBueffel,"Login OK") == NULL)
{
test = 0;
}
else
{
test = 1;
if (strstr(pBueffel, "Login OK") == NULL) {
test = 0;
} else {
test = 1;
break;
}
SicsWait(1);
SicsWait(1);
}
if(!test)
{
printf("Bad reply to login: %s\n",pBueffel);
if (!test) {
printf("Bad reply to login: %s\n", pBueffel);
NETClosePort(connection);
free(connection);
connection = NULL;
}
}
}
/*---------------------------------------------------------------------*/
static void killSync(void *pData)
{
if(connection)
{
if (connection) {
NETClosePort(connection);
free(connection);
}
if(hostname)
if (hostname)
free(hostname);
if(looser)
if (looser)
free(looser);
if(password)
if (password)
free(password);
if(syncFile)
if (syncFile)
free(syncFile);
}
/*----------------------------------------------------------------------*/
int MakeSync(SConnection *pCon, SicsInterp *pSics, void *pData,
int argc, char *argv[])
int MakeSync(SConnection * pCon, SicsInterp * pSics, void *pData,
int argc, char *argv[])
{
char pBueffel[256];
int iRet;
/*
check arguments: we need host, port, user and passwd
*/
if(argc < 5)
{
check arguments: we need host, port, user and passwd
*/
if (argc < 5) {
SCWrite(pCon,
"ERROR: need parameters: host port user passwd : for sync creation",
eError);
"ERROR: need parameters: host port user passwd : for sync creation",
eError);
return 0;
}
/*
copy parameters
*/
copy parameters
*/
hostname = strdup(argv[1]);
port = atof(argv[2]);
looser = strdup(argv[3]);
password = strdup(argv[4]);
if(argc > 5)
{
if (argc > 5) {
syncFile = strdup(argv[5]);
}
else
{
} else {
syncFile = NULL;
}
pServ->simMode = 1;
/*
add the command to the Interpreter
*/
iRet = AddCommand(pSics,"sync",Synchronize,killSync,NULL);
if(!iRet)
{
sprintf(pBueffel,"ERROR: duplicate command sync not created");
killSync(NULL);
SCWrite(pCon,pBueffel,eError);
return 0;
add the command to the Interpreter
*/
iRet = AddCommand(pSics, "sync", Synchronize, killSync, NULL);
if (!iRet) {
sprintf(pBueffel, "ERROR: duplicate command sync not created");
killSync(NULL);
SCWrite(pCon, pBueffel, eError);
return 0;
}
return 1;
}
/*----------------------------------------------------------------------*/
int Synchronize(SConnection *pCon, SicsInterp *pSics, void *pData,
int argc, char *argv[])
int Synchronize(SConnection * pCon, SicsInterp * pSics, void *pData,
int argc, char *argv[])
{
char pBueffel[2048];
char pRead[80];
int test,i;
int test, i;
SConnection *internalCon = NULL;
int try;
try = 2;
tryagain:
try--;
/*
check for connection
*/
if(connection == NULL)
{
check for connection
*/
if (connection == NULL) {
syncLogin();
if(connection == NULL)
{
sprintf(pBueffel,"ERROR: failed to connect to %s, %d for sync 'ing",
hostname, port);
SCWrite(pCon,pBueffel, eError);
if (connection == NULL) {
sprintf(pBueffel, "ERROR: failed to connect to %s, %d for sync 'ing",
hostname, port);
SCWrite(pCon, pBueffel, eError);
return 0;
}
}
}
/*
first tell the remote server to backup
*/
first tell the remote server to backup
*/
SetStatusFixed(eBatch);
strcpy(pBueffel,"transact syncbackup");
if(syncFile != NULL)
{
strcat(pBueffel," ");
strcat(pBueffel,syncFile);
strcpy(pBueffel, "transact syncbackup");
if (syncFile != NULL) {
strcat(pBueffel, " ");
strcat(pBueffel, syncFile);
}
strcat(pBueffel,"\n");
test = NETWrite(connection,pBueffel,strlen(pBueffel));
if(test != 1)
{
strcat(pBueffel, "\n");
test = NETWrite(connection, pBueffel, strlen(pBueffel));
if (test != 1) {
NETClosePort(connection);
free(connection);
connection = NULL;
ClearFixedStatus(eEager);
if (try > 0) goto tryagain;
SCWrite(pCon,"ERROR: Failed to contact main SICS server",eError);
if (try > 0)
goto tryagain;
SCWrite(pCon, "ERROR: Failed to contact main SICS server", eError);
return 0;
}
/*
wait 60 seconds for correct message
*/
pServ->simMode = 0; /* bug fix: SicsWait returns right away if this would be
left at normal. Reset after loop
*/
wait 60 seconds for correct message
*/
pServ->simMode = 0; /* bug fix: SicsWait returns right away if this would be
left at normal. Reset after loop
*/
pBueffel[0] = '\0';
for(i = 0; i < 60; i++)
{
pRead[0] = '\0';
test = NETRead(connection,pRead,75,20); /* 20 ms M.Z. */
if(test < 0)
{
NETClosePort(connection);
free(connection);
connection = NULL;
ClearFixedStatus(eEager);
pServ->simMode = 1;
if (try > 0) goto tryagain;
SCWrite(pCon,"ERROR: Failed to contact main SICS server",eError);
return 0;
for (i = 0; i < 60; i++) {
pRead[0] = '\0';
test = NETRead(connection, pRead, 75, 20); /* 20 ms M.Z. */
if (test < 0) {
NETClosePort(connection);
free(connection);
connection = NULL;
ClearFixedStatus(eEager);
pServ->simMode = 1;
if (try > 0)
goto tryagain;
SCWrite(pCon, "ERROR: Failed to contact main SICS server", eError);
return 0;
} else {
if (test > 0) {
strncat(pBueffel, pRead, 2047 - strlen(pBueffel));
}
else
{
if(test > 0)
{
strncat(pBueffel,pRead, 2047 - strlen(pBueffel));
}
}
if(strstr(pBueffel,"TRANSACTIONFINISHED") != NULL)
{
test = 1;
break;
}
else
{
test = 0;
}
SicsWait(1);
}
if (strstr(pBueffel, "TRANSACTIONFINISHED") != NULL) {
test = 1;
break;
} else {
test = 0;
}
SicsWait(1);
}
pServ->simMode = 1;
if(!test)
{
SCWrite(pCon,"WARNING: sync server may not have exectued backup",
if (!test) {
SCWrite(pCon, "WARNING: sync server may not have exectued backup",
eWarning);
}
/*
* relase the connection, this may be more stable
*/
NETClosePort(connection);
free(connection);
connection = NULL;
/*
now read the backup file and we are done
*/
* relase the connection, this may be more stable
*/
NETClosePort(connection);
free(connection);
connection = NULL;
/*
now read the backup file and we are done
*/
internalCon = SCCreateDummyConnection(pSics);
if(internalCon == NULL)
{
SCWrite(pCon,"ERROR: out of memory in sync",
eError);
if (internalCon == NULL) {
SCWrite(pCon, "ERROR: out of memory in sync", eError);
ClearFixedStatus(eEager);
return 0;
}
if(syncFile != NULL)
{
sprintf(pBueffel,"restore %s",syncFile);
if (syncFile != NULL) {
sprintf(pBueffel, "restore %s", syncFile);
} else {
strcpy(pBueffel, "restore");
}
else
{
strcpy(pBueffel,"restore");
}
test = InterpExecute(pSics,internalCon,pBueffel);
test = InterpExecute(pSics, internalCon, pBueffel);
SCDeleteConnection(internalCon);
ClearFixedStatus(eEager);
if(test != 1)
{
SCWrite(pCon,"ERROR: Failed to read sync information",eError);
if (test != 1) {
SCWrite(pCon, "ERROR: Failed to read sync information", eError);
return 0;
}
/*
tell everybody that we have sync'ed
*/
ServerWriteGlobal("Simulation Server has SYNCHRONIZED!",eWarning);
tell everybody that we have sync'ed
*/
ServerWriteGlobal("Simulation Server has SYNCHRONIZED!", eWarning);
ServerWriteGlobal("Fixed motors may not have correct positions",
eWarning);
eWarning);
return 1;
}