Skip to content
GitLab
Commit 9d228ed7 authored by Peterson, Peter's avatar Peterson, Peter
Browse files

Fixing EOLs. Refs #2696.

parent 2e9e7098
Expand all Hide whitespace changes
Inline Side-by-side
Code/Mantid/Framework/DataHandling/src/LoadDAE/idc.h
View file @ 9d228ed7
#ifndef IDC_H
#define IDC_H
/**
@file idc.h
IDC interface - minimal socket interface to the DAE
@author Freddie Akeroyd, STFC ISIS Facility
@date 31/07/2008
Copyright © 2007-8 ISIS Rutherford Appleton Laboratory & NScD Oak Ridge National Laboratory
This file is part of ISIS Instrument control program.
you can redistribute it and/or modify it under the terms of the
GNU General Public License
*/
#include "MantidKernel/DllExport.h"
///@cond nodoc
/**
* holds information about the DAE connection - defined fully in idc.c
*/
struct idc_info;
typedef struct idc_info* idc_handle_t;
/**
* prototype for error reporting function passed to IDCsetreportfunc()
*/
typedef void (*idc_error_report_t)(int status, int code, const char* messsage);
#ifdef __cplusplus
extern "C" {
#endif
/** Open a DAE connection on host*/
int DLLExport IDCopen(const char* host, int mode, int options, idc_handle_t* fh);
/** Close a DAE connection */
int DLLExport IDCclose(idc_handle_t* fh);
/* The A versions of the functions allocate memory, the other need to be passed a pre-allocated array */
/** Read an integer parameter \a name from the DAE and copy data into a pre-allocated array \a value.
The size of value is held in the parameters dims_array and ndims */
int IDCgetpari(idc_handle_t fh, const char* name, int* value, int dims_array[], int* ndims);
/** Read an integer parameter \a name from the DAE and allocate space of it in array \a value.
The size of the returned array is written to the parameters dims_array and ndims */
int IDCAgetpari(idc_handle_t fh, const char* name, int** value, int dims_array[], int* ndims);
/** Read a real (float) parameter \a name from the DAE and copy data into a pre-allocated array \a value.
The size of value is held in the parameters dims_array and ndims */
int IDCgetparr(idc_handle_t fh, const char* name, float* value, int dims_array[], int* ndims);
/** Read a real (float) parameter \a name from the DAE and allocate space of it in array \a value.
The size of the returned array is written to the parameters dims_array and ndims */
int IDCAgetparr(idc_handle_t fh, const char* name, float** value, int dims_array[], int* ndims);
/** Read a character parameter \a name from the DAE and copy data into a pre-allocated array \a value.
The size of value is held in the parameters dims_array and ndims */
int IDCgetpard(idc_handle_t fh, const char* name, double* value, int dims_array[], int* ndims);
/** Read a character parameter \a name from the DAE and allocate space of it in array \a value.
The size of the returned array is written to the parameters dims_array and ndims */
int IDCAgetparc(idc_handle_t fh, const char* name, char** value, int dims_array[], int* ndims);
/** Read \a nos spectra from the DAE starting at \a ifsn into pre-allocated array \a value.
The size of value is held in the parameters \a dims_array and \a ndims */
int DLLExport IDCgetdat(idc_handle_t fh, int ifsn, int nos, int* value, int dims_array[], int* ndims);
/** Read \a nos spectra from the DAE starting at \a ifsn and allocate array \a value to return the results.
The size of the returned array is written to the parameters \a dims_array and \a ndims */
int IDCAgetdat(idc_handle_t fh, int ifsn, int nos, int** value, int dims_array[], int* ndims);
/** specify an error report function to be used by IDCreport() */
int IDCsetreportfunc(idc_error_report_t report_func);
/** Used to report an error by the IDC routines - it calls the function specified by IDCsetreportfunc()
* to do the actual reporting */
int IDCreport(int status, int code, const char* format, ... );
///@endcond
#ifdef __cplusplus
}
#endif
#endif /* IDC_H */
#ifndef IDC_H
#define IDC_H
/**
@file idc.h
IDC interface - minimal socket interface to the DAE
@author Freddie Akeroyd, STFC ISIS Facility
@date 31/07/2008
Copyright © 2007-8 ISIS Rutherford Appleton Laboratory & NScD Oak Ridge National Laboratory
This file is part of ISIS Instrument control program.
you can redistribute it and/or modify it under the terms of the
GNU General Public License
*/
#include "MantidKernel/DllExport.h"
///@cond nodoc
/**
* holds information about the DAE connection - defined fully in idc.c
*/
struct idc_info;
typedef struct idc_info* idc_handle_t;
/**
* prototype for error reporting function passed to IDCsetreportfunc()
*/
typedef void (*idc_error_report_t)(int status, int code, const char* messsage);
#ifdef __cplusplus
extern "C" {
#endif
/** Open a DAE connection on host*/
int DLLExport IDCopen(const char* host, int mode, int options, idc_handle_t* fh);
/** Close a DAE connection */
int DLLExport IDCclose(idc_handle_t* fh);
/* The A versions of the functions allocate memory, the other need to be passed a pre-allocated array */
/** Read an integer parameter \a name from the DAE and copy data into a pre-allocated array \a value.
The size of value is held in the parameters dims_array and ndims */
int IDCgetpari(idc_handle_t fh, const char* name, int* value, int dims_array[], int* ndims);
/** Read an integer parameter \a name from the DAE and allocate space of it in array \a value.
The size of the returned array is written to the parameters dims_array and ndims */
int IDCAgetpari(idc_handle_t fh, const char* name, int** value, int dims_array[], int* ndims);
/** Read a real (float) parameter \a name from the DAE and copy data into a pre-allocated array \a value.
The size of value is held in the parameters dims_array and ndims */
int IDCgetparr(idc_handle_t fh, const char* name, float* value, int dims_array[], int* ndims);
/** Read a real (float) parameter \a name from the DAE and allocate space of it in array \a value.
The size of the returned array is written to the parameters dims_array and ndims */
int IDCAgetparr(idc_handle_t fh, const char* name, float** value, int dims_array[], int* ndims);
/** Read a character parameter \a name from the DAE and copy data into a pre-allocated array \a value.
The size of value is held in the parameters dims_array and ndims */
int IDCgetpard(idc_handle_t fh, const char* name, double* value, int dims_array[], int* ndims);
/** Read a character parameter \a name from the DAE and allocate space of it in array \a value.
The size of the returned array is written to the parameters dims_array and ndims */
int IDCAgetparc(idc_handle_t fh, const char* name, char** value, int dims_array[], int* ndims);
/** Read \a nos spectra from the DAE starting at \a ifsn into pre-allocated array \a value.
The size of value is held in the parameters \a dims_array and \a ndims */
int DLLExport IDCgetdat(idc_handle_t fh, int ifsn, int nos, int* value, int dims_array[], int* ndims);
/** Read \a nos spectra from the DAE starting at \a ifsn and allocate array \a value to return the results.
The size of the returned array is written to the parameters \a dims_array and \a ndims */
int IDCAgetdat(idc_handle_t fh, int ifsn, int nos, int** value, int dims_array[], int* ndims);
/** specify an error report function to be used by IDCreport() */
int IDCsetreportfunc(idc_error_report_t report_func);
/** Used to report an error by the IDC routines - it calls the function specified by IDCsetreportfunc()
* to do the actual reporting */
int IDCreport(int status, int code, const char* format, ... );
///@endcond
#ifdef __cplusplus
}
#endif
#endif /* IDC_H */
Code/Mantid/Framework/DataHandling/src/LoadDAE/isisds_command.cpp
View file @ 9d228ed7
/**
@file isisds_command.cpp
IDC interface - minimal socket interface to the DAE
@author Freddie Akeroyd, STFC ISIS Facility
@date 31/07/2008
Copyright © 2007-8 STFC Rutherford Appleton Laboratory
This file is part of ISIS Instrument control program.
you can redistribute it and/or modify it under the terms of the
GNU General Public License
*/
///@cond nodoc
#include <stdio.h>
#include "isisds_command.h"
/*
* versions of these structures
* increment major for incompatible changes
* increment minor for backward compatible changes on server
*/
#define ISISDS_MAJOR_VER 1
#define ISISDS_MINOR_VER 1
#ifndef _WIN32
#define closesocket close
#include <stdlib.h>
#include <stdio.h>
#include <stdarg.h>
#include <string.h>
#include <sys/socket.h>
#include <netdb.h>
#include <netinet/in.h>
#include <arpa/inet.h>
#include <fcntl.h>
#include <unistd.h>
#include <sys/select.h>
#endif
/** Try to align to 64 bit (8 bytes) boundaries
*/
typedef struct
{
int len;
int ver_major;
int ver_minor;
int pid;
int access_type; /* 0 =dae, 1 = crpt */
int pad[1];
char user[32];
char host[64];
} isisds_open_t;
/** used for sends and replies once a connection open
* try to align to 64 bits (8 bytes) boundaries
*/
typedef struct
{
int len; /* of this structure plus any additional data (in bytes) */
int type; /* ISISDSDataType */
int ndims;
int dims_array[11];
char command[32];
/* additional data (if any) will follow this */
} isisds_command_header_t;
/* wait until read len bytes, return <=0 on error */
static int recv_all(SOCKET s, void* buffer, int len, int flags)
{
char* cbuffer = (char*)buffer;
int n, ntot;
ntot = 0;
while(len > 0)
{
n = recv(s, cbuffer, len, flags);
if (n <= 0)
{
return n; /* error */
}
len -= n;
cbuffer += n;
ntot += n;
}
return ntot;
}
/* clear out old data from a socket */
static void clear_replies(SOCKET s)
{
static char buffer[100000];
struct timeval timeout = { 0, 0 };
fd_set fds;
int done = 0;
while(!done)
{
FD_ZERO(&fds);
FD_SET(s, &fds);
if ( (select(FD_SETSIZE, &fds, NULL, NULL, &timeout) > 0) && FD_ISSET(s, &fds) )
{
recv(s, buffer, sizeof(buffer), 0);
}
else
{
done = 1;
}
}
}
/*
* client: open a socket and perform initial negotiation
* return connected socket or INVALID_SOCKET on error
*/
SOCKET isisds_send_open(const char* host, ISISDSAccessMode access_type)
{
SOCKET s;
int setkeepalive = 1;
struct hostent *hostp;
struct sockaddr_in address;
int n;
char *comm, *comm_data;
/* int len_comm_data; */
isisds_open_t op;
ISISDSDataType data_type;
int dims_array[10], ndims;
if ( (hostp = gethostbyname(host)) == NULL )
{
return INVALID_SOCKET;
}
memset(&address, 0, sizeof(address));
memcpy(&(address.sin_addr.s_addr), hostp->h_addr_list[0], hostp->h_length);
address.sin_family = AF_INET;
address.sin_port = htons(ISISDS_PORT);
s = socket(PF_INET, SOCK_STREAM, 0);
if (s == INVALID_SOCKET)
{
return INVALID_SOCKET;
}
setsockopt(s, SOL_SOCKET, SO_KEEPALIVE, (char*)&setkeepalive, sizeof(setkeepalive));
if (connect(s, (struct sockaddr*)&address, sizeof(address)) == -1)
{
closesocket(s);
return INVALID_SOCKET;
}
/* socket connected */
op.ver_major = ISISDS_MAJOR_VER;
op.ver_minor = ISISDS_MINOR_VER;
op.pid = 0;
op.access_type = access_type;
strncpy(op.user, "faa", sizeof(op.user));
strncpy(op.host, "localhost", sizeof(op.host));
op.len = sizeof(op);
if ( (n = send(s, (char*)&op, sizeof(op), 0)) != sizeof(op) )
{
closesocket(s);
return INVALID_SOCKET;
}
if (isisds_recv_command_alloc(s, &comm, (void**)&comm_data, &data_type, dims_array, &ndims) <= 0)
{
closesocket(s);
return INVALID_SOCKET;
}
if (comm_data != NULL)
{
free(comm_data);
}
if (!strcmp(comm, "OK"))
{
free(comm);
return s;
}
else
{
free(comm);
closesocket(s);
return INVALID_SOCKET;
}
}
/*
* server
* client minor ver <= server minor ver
*/
int isisds_recv_open(SOCKET s, ISISDSAccessMode* access_type)
{
int n;
isisds_open_t op;
if ( (n = recv_all(s, (char*)&op, sizeof(op), 0)) != sizeof(op) )
{
return -1;
}
if ( op.len != sizeof(op) )
{
return -1;
}
if ( (op.ver_major != ISISDS_MAJOR_VER) || (op.ver_minor > ISISDS_MINOR_VER) )
{
return -1;
}
*access_type = (ISISDSAccessMode)op.access_type;
return isisds_send_command(s, "OK", NULL, ISISDSUnknown, NULL, 0);
}
/*
* return > 0 on success
* if dims_array == NULL, ndims is length
* on graceful termination should get an FD_CLOSE from client, should then send any data
* shutdown(s, SD_SEND) and then closesocket()
*/
int isisds_send_command(SOCKET s, const char* command, const void* data, ISISDSDataType type, const int dims_array[], int ndims)
{
int i, n, len_data;
isisds_command_header_t comm;
memset(&comm, 0, sizeof(comm));
if (dims_array == NULL)
{
comm.ndims = 1;
comm.dims_array[0] = ndims;
len_data = ndims * isisds_type_size[type];
}
else
{
len_data = 1;
comm.ndims = ndims;
for(i=0; i<ndims; i++)
{
len_data *= dims_array[i];
comm.dims_array[i] = dims_array[i];
}
len_data *= isisds_type_size[type];
}
comm.len = sizeof(comm) + len_data;
comm.type = type;
strncpy(comm.command, command, sizeof(comm.command));
clear_replies(s);
n = send(s, (char*)&comm, sizeof(comm), 0);
if ( (n == sizeof(comm)) && (data != NULL) && (len_data > 0) )
{
n = send(s, (const char*)data, len_data, 0);
}
return n;
}
/* if not do_alloc, then type and dims_array are checked */
static int isisds_recv_command_helper(SOCKET s, char** command, void** data, ISISDSDataType* type, int dims_array[], int* ndims, int do_alloc)
{
int n, len_data, size_in, i;
isisds_command_header_t comm;
n = recv_all(s, (char*)&comm, sizeof(comm), 0);
if (n != sizeof(comm))
{
return -1;
}
*command = (char*)malloc(sizeof(comm.command) + 1);
strncpy(*command, comm.command, sizeof(comm.command));
(*command)[sizeof(comm.command)] = '\0';
len_data = comm.len - sizeof(comm); /* in bytes */
if (len_data < 0)
{
return -1; /* error */
}
else if (len_data == 0)
{
dims_array[0] = 0;
/* *ndims = 0; */
*type = ISISDSUnknown;
return n; /* all ok, just no extra data */
}
/* isisds_report(0, 0, "Received data Type = \"%s\", ndims = %d\n", isisds_type_name[comm.type], comm.ndims); */
if (do_alloc)
{
*data = malloc(len_data + 1);
((char*)(*data))[len_data] = '\0';
}
else
{
size_in = 1;
for(i=0; i < *ndims; i++)
{
size_in *= dims_array[i];
}
size_in *= isisds_type_size[*type];
if (size_in < len_data)
{
isisds_report(0,0,"data array too small %d < %d\n", size_in, len_data);
return -1;
}
if (size_in > len_data) /* only NULL terminate if space */
{
((char*)(*data))[len_data] = '\0';
}
}
n = recv_all(s, *data, len_data, 0);
if (n != len_data)
{
free(*data);
*data = NULL;
len_data = 0;
return -1;
}
/* only update values if changed ... allows Read only parameters to be passed */
if ( do_alloc || (*ndims != comm.ndims) )
{
*ndims = comm.ndims;
}
if ( do_alloc || (*type != comm.type) )
{
*type = (ISISDSDataType)comm.type;
}
for(i=0; i < comm.ndims; i++)
{
dims_array[i] = comm.dims_array[i];
}
return n;
}
/* return > 0 on success */
int isisds_recv_command(SOCKET s, char* command, int* len_command, void* data, ISISDSDataType* type, int dims_array[], int* ndims)
{
int t_dims[8] = { 1, 0, 0, 0, 0, 0, 0, 0 };
int t_ndims = 1;
int istat;
char* command_temp = NULL;
if (type == NULL)
{
return -1;
}
if ( dims_array == NULL || ndims == NULL || (*ndims <= 1 && dims_array[0] <= 1) )
{
/* assume single simple value */
istat = isisds_recv_command_helper(s, &command_temp, &data, type, t_dims, &t_ndims, 0);
if ( (t_ndims != 1) || (t_dims[0] != 1) )
{
istat = -1;
}
}
else
{
istat = isisds_recv_command_helper(s, &command_temp, &data, type, dims_array, ndims, 0);
}
strncpy(command, command_temp, *len_command);
*len_command = strlen(command_temp);
free(command_temp);
return istat;
}
/* return > 0 on success */
int isisds_recv_command_alloc(SOCKET s, char** command, void** data, ISISDSDataType* type, int dims_array[], int* ndims)
{
if (ndims == NULL || dims_array == NULL || type == NULL)
{
return -1;
}
if (data == NULL || command == NULL)
{
return -1;
}
*data = NULL;
*command = NULL;
/* *ndims = 0; */
dims_array[0] = 0;
*type = ISISDSUnknown;
return isisds_recv_command_helper(s, command, data, type, dims_array, ndims, 1);
}
int isisds_send_close(SOCKET s)
{
/* shutdown((*pfh)->s, SD_SEND); indicate no more data to send SHUT_WR
* check for FD_READ and recv any other stuff from server
* check for FD_CLOSE and closesocket()
*/
closesocket(s);
return 0;
}
static void default_status_reporter(int status, int code, const char* message)
{
printf("ISISDS: %d %d %s\n", status, code, message);
}
static isisds_error_report_t status_reporter = default_status_reporter;
int isisds_report(int status, int code, const char* format, ... )
{
va_list ap;
char* message = (char*)malloc(1024);
va_start(ap, format);
vsprintf(message, format, ap);
va_end(ap);
(*status_reporter)(status, code, message);
free(message);