[kitten] push by debonis....@gmail.com - Moved PIAPI to external on 2013-07-01 17:20 GMT

[kit...@googlecode.com]

Revision: b999075a0077
Branch: default
Author: David DeBonis <dde...@sandia.gov>
Date: Mon Jul 1 10:18:52 2013
Log: Moved PIAPI to external
http://code.google.com/p/kitten/source/detail?r=b999075a0077

Deleted:
/user/runtime2/libpiapi/Makefile
/user/runtime2/libpiapi/piapi.c
/user/runtime2/libpiapi/piapi.h
Modified:
/user/external/get.pl

=======================================
--- /user/runtime2/libpiapi/Makefile Fri May 24 15:16:50 2013
+++ /dev/null
@@ -1,13 +0,0 @@
-BASE=../../
-include $(BASE)/Makefile.header
-
-LIBRARIES = libpiapi.a
-HEADERS = piapi.h
-
-libpiapi_SOURCES = piapi.c
-
-CFLAGS += -std=gnu99
-INCDIRS += -I../pct
-LIBDIRS += -L.
-
-include $(BASE)/Makefile.footer
=======================================
--- /user/runtime2/libpiapi/piapi.c Wed Jun 5 16:54:54 2013
+++ /dev/null
@@ -1,251 +0,0 @@
-/* Copyright (c) 2013, Sandia National Laboratories */
-
-#include "piapi.h"
-
-#include <lwk/liblwk.h>
-#include <netinet/in.h>
-#include <sys/socket.h>
-#include <pthread.h>
-#include <stdlib.h>
-#include <ctype.h>
-#include <unistd.h>
-#include <errno.h>
-
-static int piapi_debug = 1;
-
-struct piapi_context
-{
- int pfd;
-
- piapi_callback_t callback;
- pthread_t worker;
- int worker_run;
-};
-
-#define PIAPI_CNTX(X) ((struct piapi_context *)(X))
-
-/* writen() is from "UNIX Network Programming" by W. Richard Stevents */
-static ssize_t
-writen(int fd, const void *vptr, size_t n)
-{
- size_t nleft;
- ssize_t nwritten;
- const char *ptr;
-
- ptr = vptr;
- nleft = n;
- while (nleft > 0) {
- if ((nwritten = write(fd, ptr, nleft)) <= 0) {
- if (errno == EINTR) {
- nwritten = 0; /* and call write() again */
- } else {
- perror( "write" );
- return -1; /* error */
- }
- }
- nleft -= nwritten;
- ptr += nwritten;
- }
-
- return n;
-}
-
-
-static int
-piapi_agent_connect( void *cntx )
-{
- struct sockaddr_in addr;
- ssize_t rc;
-
- if( piapi_debug )
- printf( "Establishing agent connection\n" );
-
- PIAPI_CNTX(cntx)->pfd = socket( PF_INET, SOCK_STREAM, 0 );
- if( PIAPI_CNTX(cntx)->pfd < 0 )
- {
- printf( "ERROR: socket() failed! rc=%d\n",
PIAPI_CNTX(cntx)->pfd );
- return -1;
- }
-
- bzero((void *)&addr, sizeof(addr));
- addr.sin_family = AF_INET;
- addr.sin_addr.s_addr = htonl( PIAPI_AGNT_SADDR );
- addr.sin_port = htons( PIAPI_AGNT_PORT );
-
- rc = connect( PIAPI_CNTX(cntx)->pfd, (struct sockaddr *) &addr,
sizeof(addr) );
- if( rc < 0 )
- {
- printf( "ERROR: connect() failed! rc=%d\n", rc );
- perror( "CONNECT" );
- return -1;
- }
-
- if( piapi_debug )
- printf( "Agent IP address is %d.%d.%d.%d\n",
- *((char *)(&addr.sin_addr.s_addr)+0),
- *((char *)(&addr.sin_addr.s_addr)+1),
- *((char *)(&addr.sin_addr.s_addr)+2),
- *((char *)(&addr.sin_addr.s_addr)+3) );
-
- if( piapi_debug )
- printf( "Connected to agent port %d\n", PIAPI_AGNT_PORT );
-
- return 0;
-}
-
-static int
-piapi_parse_message( char *buf, unsigned int len, struct piapi_sample
*sample )
-{
- char *token;
-
- if( (token = strtok( buf, ":" )) == NULL)
- return -1;
- sample->number = atoi(token);
-
- if( (token = strtok( NULL, ":" )) == NULL)
- return -1;
- sample->total = atoi(token);
-
- if( (token = strtok( NULL, ":" )) == NULL)
- return -1;
- sample->time_sec = atol(token);
-
- if( (token = strtok( NULL, ":" )) == NULL)
- return -1;
- sample->time_usec = atol(token);
-
- if( (token = strtok( NULL, ":" )) == NULL)
- return -1;
- sample->power = atof(token);
-
- if( (token = strtok( NULL, ":" )) == NULL)
- return -1;
- sample->energy = atof(token);
-}
-
-static void
-piapi_worker_thread( void *cntx )
-{
- struct sockaddr_in addr;
- socklen_t socklen = sizeof(addr);
-
- struct piapi_sample sample;
- char buf[ 256 ];
- ssize_t rc;
-
- PIAPI_CNTX(cntx)->worker_run = 1;
- while( PIAPI_CNTX(cntx)->worker_run )
- {
- if( piapi_debug )
- printf( "%d: attempting read\n", PIAPI_CNTX(cntx)->pfd);
-
- rc = read( PIAPI_CNTX(cntx)->pfd, buf, sizeof(buf)-1 );
- if( rc <= 0 )
- {
- if( piapi_debug )
- printf( "%d: closed connection rc=%zd\n", PIAPI_CNTX(cntx)->pfd, rc );
- continue;
- }
-
- if( piapi_debug )
- printf( "%d: checking read length\n", PIAPI_CNTX(cntx)->pfd);
-
- if( rc == 0 )
- continue;
-
- buf[rc] = '\0';
-
- // Trim any newlines off the end
- while( rc > 0 )
- {
- if( !isspace( buf[rc-1] ) )
- break;
- buf[--rc] = '\0';
- }
-
- if( piapi_debug )
- printf( "%d: read %zd bytes: '%s'\n", PIAPI_CNTX(cntx)->pfd, rc, buf);
-
- if( PIAPI_CNTX(cntx)->callback )
- {
- piapi_parse_message(buf, rc, &sample);
- PIAPI_CNTX(cntx)->callback(&sample);
- }
- }
-}
-
-static int
-piapi_control( void *cntx, char *cmd, char *val )
-{
- struct sockaddr_in addr;
- char outbuf[ 32 ] = "";
- unsigned int len;
- int rc;
-
- if( piapi_debug )
- printf( "Sending control command to agent %s:%s\n", cmd, val );
-
- len = snprintf( outbuf, sizeof(outbuf), "%s:%s\n", cmd, val );
- writen( PIAPI_CNTX(cntx)->pfd, outbuf, len );
-
- if( piapi_debug )
- printf( "Successfully configured agent\n");
-
- return 0;
-}
-
-int
-piapi_init( void **cntx, piapi_callback_t callback )
-{
- if( piapi_debug )
- printf("\nPower Communication (Proxy <=> Agent)\n");
-
- *cntx = malloc( sizeof(struct piapi_context) );
- bzero( *cntx, sizeof(struct piapi_context) );
-
- PIAPI_CNTX(*cntx)->callback = callback;
-
- if( piapi_agent_connect( *cntx ) )
- {
- printf( "ERROR: unable to start proxy\n" );
- return -1;
- }
-
- if( piapi_debug )
- printf( "Agent connection established\n" );
-
- pthread_create(&(PIAPI_CNTX(*cntx)->worker), 0x0, (void
*)&piapi_worker_thread, *cntx);
- return 0;
-}
-
-int
-piapi_destroy( void *cntx )
-{
- PIAPI_CNTX(cntx)->worker_run = 0;
-
- close( PIAPI_CNTX(cntx)->pfd );
-
- return 0;
-}
-
-int
-piapi_collect( void *cntx, piapi_port_t port, unsigned int samples,
unsigned int frequency )
-{
- char cmd[ 10 ] = "collect";
- char val[ 20 ] = "";
-
- if( piapi_debug )
- printf( "Setting agent to %s collection on sensor port %u\n", cmd, port);
-
- snprintf( val, 10, "%u:%u:%u", port, samples, frequency );
- if( piapi_control( cntx, cmd, val ) < 0 )
- {
- printf( "ERROR: Control message failed\n");
- return -1;
- }
-
- if( piapi_debug )
- printf( "Successfully started agent\n");
-
- return 0;
-}
=======================================
--- /user/runtime2/libpiapi/piapi.h Wed Jun 5 16:54:54 2013
+++ /dev/null
@@ -1,43 +0,0 @@
-#ifndef PIAPI_H
-#define PIAPI_H
-
-// The well-known powerinsight agent saddr
-#define PIAPI_AGNT_SADDR 0x0a361500
-
-// The well-known powerinsight agent port
-#define PIAPI_AGNT_PORT 20201
-
-typedef enum
-{
- PIAPI_UNKNOWN = 0,
- PIAPI_CPU = 1,
- PIAPI_12V = 2,
- PIAPI_MEM = 3,
- PIAPI_5V = 4,
- PIAPI_3_3V = 5,
- PIAPI_HDD_12V = 6,
- PIAPI_HDD_5V = 7,
- PIAPI_ALL = 8
-} piapi_port_t;
-
-struct piapi_sample {
- unsigned int number;
- unsigned int total;
- unsigned long time_sec;
- unsigned long time_usec;
- float power;
- float energy;
-};
-
-typedef void (*piapi_callback_t)( struct piapi_sample *);
-
-int
-piapi_init( void **cntx, piapi_callback_t callback );
-
-int
-piapi_destroy( void *cntx );
-
-int
-piapi_collect( void *cntx, piapi_port_t port, unsigned int samples,
unsigned int frequency );
-
-#endif
=======================================
--- /user/external/get.pl Wed Apr 3 13:03:12 2013
+++ /user/external/get.pl Mon Jul 1 10:18:52 2013
@@ -40,6 +40,14 @@
#$gperftools{config_cmd} = "./configure --disable-cpu-profiler
--disable-heap-profiler --disable-heap-checker --enable-static
--disable-shared --prefix=$INSTALLDIR";
#push(@packages, \%gperftools);

+#my %piapi;
+#$piapi{name} = "Kratos PIAPI SVN Trunk";
+#$piapi{directory} = "piapi";
+#$piapi{get_cmd} = "svn co
svn+ssh://software.sandia.gov/svn/private/kratos $piapi{directory}";
+#$piapi{preconfig_cmd} = "autoconf";
+#$piapi{config_cmd} = "./configure --prefix=$INSTALLDIR";
+#push(@packages, \%piapi);
+
# Download and build external packages
for (my $i=0; $i < @packages; $i++) {
chdir "$BASEDIR";