acpc_dealer 2.1.0 → 2.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 84b73326801489cffe4fff1438b8afc890e36d7f
-  data.tar.gz: bfd427d17ccbc771a118140a6535d1d7604bca7f
+  metadata.gz: 00bbd47995a7c97603b156001d76276e59ab27c2
+  data.tar.gz: 826b3f4488fb64a04010fd2429b002f942cbcca4
 SHA512:
-  metadata.gz: e2f156daf439f1cb7d0993f81ddd173582ab56ef26e34290522f4f148f5028150937a26be240ce91eff5089bc035c2feb4e76b6c3b5df31ea4c51e77633b1bfb
-  data.tar.gz: 38133b40d10f1c3613dba9a705a27ab805bbb492694bbaf32ac0fda20a60e5d379ffe52117bde395da4fc0680e2fb7d205168d7045355d0fa028a9d3fd1852e9
+  metadata.gz: 0d665782f2e464c27fef0012bc0a8a355beec06a9459d11ac04be46706050bf7691447d94d3e0c749275156172ac94196b0a46647825423e563da7c42ee01c08
+  data.tar.gz: 2df7ccbf5153837c5f075d038b2f0fbab23ae5101b064ddeb6b5bc5fc292eb735356f8df60c7b43502c63cb3e55e54c881b5a9eed2aceb521b52efcfdbc4fce6

data/lib/acpc_dealer/version.rb

@@ -1,3 +1,3 @@
 module AcpcDealer
-  VERSION = "2.1.0"
+  VERSION = "2.1.1"
 end

data/vendor/project_acpc_server/Makefile

@@ -22,6 +22,9 @@ bm_server: bm_server.c game.c game.h rng.c rng.h net.c net.h
 bm_widget: bm_widget.c net.c net.h
 	$(CC) $(CFLAGS) -o $@ bm_widget.c net.c
 
+bm_run_matches: bm_run_matches.c net.c net.h
+	$(CC) $(CFLAGS) -o $@ bm_run_matches.c net.c
+
 dealer: game.c game.h evalHandTables rng.c rng.h dealer.c net.c net.h
 	$(CC) $(CFLAGS) -o $@ game.c rng.c dealer.c net.c
 

data/vendor/project_acpc_server/README

@@ -111,4 +111,3 @@ If you are creating your own game definitions, please note that game.h defines
 some constants for maximums in games (e.g., number of rounds).  These may need
 to be changed for games outside of the what is being run for the Annual
 Computer Poker Competition.
-

data/vendor/project_acpc_server/bm_run_matches.c

@@ -0,0 +1,238 @@
+#include <stdlib.h>
+#include <stdio.h>
+#define __STDC_FORMAT_MACROS
+#include <inttypes.h>
+#include <assert.h>
+#include <string.h>
+#include <unistd.h>
+#include <netdb.h>
+#include <sys/socket.h>
+#include <netinet/in.h>
+#include <netinet/tcp.h>
+#include <sys/wait.h>
+#include <errno.h>
+#include "net.h"
+
+#define ARG_SERVERNAME 1
+#define ARG_SERVERPORT 2
+#define ARG_BOT_COMMAND 7
+#define ARG_MIN_ARGS 6
+
+static void printUsage( FILE *file )
+{
+  fprintf( file, "Sample usages:\n" );
+  fprintf( file, "  bm_run_matches <bm_hostname> <bm_port> <username> <pw> "
+	   "games\n" );
+  fprintf( file, "    See a list of possible opponents\n" );
+  fprintf( file, "  bm_run_matches <bm_hostname> <bm_port> <username> <pw> "
+	   "run 2pl <local script> <# runs> <tag> <seed> <player1> "
+	   "<player2>\n" );
+  fprintf( file, "    Run two-player limit matches\n" );
+  fprintf( file, "  bm_run_matches <bm_hostname> <bm_port> <username> <pw> "
+	   "run 2pn <local script> <# runs> <tag> <seed> <player1> "
+	   "<player2>\n" );
+  fprintf( file, "    Run two-player no-limit matches\n" );
+  fprintf( file, "  bm_run_matches <bm_hostname> <bm_port> <username> <pw> "
+	   "run 3pl <local script> <# runs> <tag> <seed> <player1> <player2> "
+	   "<player3>\n" );
+  fprintf( file, "    Run three-player limit matches\n" );
+  fprintf( file, "  bm_run_matches <bm_hostname> <bm_port> <username> <pw> "
+	   "rerun 2pl <local script> <match index> <tag> <seed> <player1> "
+	   "<player2> (<player3>)\n" );
+  fprintf( file, "    Rerun a match that failed\n" );
+  fprintf( file, "\n" );
+  fprintf( file, "<username> is your benchmark server username assigned to "
+	   "you by the competition chair\n" );
+  fprintf( file, "<pw> is your benchmark server password assigned to you by "
+	   "the competition chair\n" );
+  fprintf( file, "<local script> is the script that runs your agent locally.  "
+	   "It must take a hostname/IP and a port\n" );
+  fprintf( file, "<num runs> is the number of matches you want to run\n" );
+  fprintf( file, "<tag> is a name for this set of matches which will appear "
+	   "in the names of the log files\n" );
+  fprintf( file, "<seed> is a seed used to generate the random seeds that "
+	   "determine the cards in each match\n" );
+  fprintf( file, "<player-n> is either the name of an opponent or \"local\" "
+	   "for your local agent\n" );
+  fprintf( file, "\n" );
+  fprintf( file, "To run N duplicate heads-up matches, do one run of N "
+	   "matches with a given seed, then run a second set of N matches "
+	   "with the same seed but the order of the players reversed\n" );
+  fprintf( file, "\n" );
+  fprintf( file, "If one match in a set fails, you can use the \"rerun\" "
+	   "command to rerun the specified match with the specified seed.  "
+	   "For example, if you tried to run twenty matches with seed 0 and "
+	   "the last match failed, you could use the \"rerun\" command with "
+	   "seed 0 and match index 19.\n" );
+}
+
+int main( int argc, char **argv )
+{
+  int sock, i;
+  pid_t childPID;
+  uint16_t port;
+  ReadBuf *fromServer;
+  fd_set readfds;
+  char line[ READBUF_LEN ];
+
+  if( argc < ARG_MIN_ARGS ) {
+
+    printUsage( stderr );
+    exit( EXIT_FAILURE );
+  }
+
+  /* connect to the server */
+  if( sscanf( argv[ ARG_SERVERPORT ], "%"SCNu16, &port ) < 1 ) {
+
+    fprintf( stderr, "ERROR: invalid port %s\n", argv[ ARG_SERVERPORT ] );
+    exit( EXIT_FAILURE );
+  }
+  sock = connectTo( argv[ ARG_SERVERNAME ], port );
+  if( sock < 0 ) {
+
+    exit( EXIT_FAILURE );
+  }
+
+  // EJ additions 9/3/2012
+  // Turn on keep-alive for socket connection with more frequent checking
+  // than the Linux default.  What I've observed is that if a socket
+  // connection is idle for long enough it gets dropped.  This only
+  // happens for some users.
+  int on = 1;
+  if (setsockopt(sock, SOL_SOCKET, SO_KEEPALIVE, &on, sizeof(on)) == -1) {
+    fprintf( stderr, "ERROR: setsockopt failed; errno %i\n", errno );
+    exit( EXIT_FAILURE );
+  }
+  // Not sure what this should be
+  int num_before_failure = 2;
+  if (setsockopt(sock, SOL_TCP, TCP_KEEPCNT, &num_before_failure,
+		 sizeof(num_before_failure)) == -1) {
+    fprintf( stderr, "ERROR: setsockopt failed; errno %i\n", errno );
+    exit( EXIT_FAILURE );
+  }
+  // First check after 60 seconds
+  int initial_secs = 60;
+  if (setsockopt(sock, SOL_TCP, TCP_KEEPIDLE, &initial_secs,
+		 sizeof(initial_secs)) == -1) {
+    fprintf( stderr, "ERROR: setsockopt failed; errno %i\n", errno );
+    exit( EXIT_FAILURE );
+  }
+  // Thereafter, also check every 60 seconds
+  int interval_secs = 60;
+  if (setsockopt(sock, SOL_TCP, TCP_KEEPINTVL, &interval_secs,
+		 sizeof(interval_secs)) == -1) {
+    fprintf( stderr, "ERROR: setsockopt failed; errno %i\n", errno );
+    exit( EXIT_FAILURE );
+  }
+
+  /* set up read buffers */
+  fromServer = createReadBuf( sock );
+
+  /* write to server */
+  line[0] = 0;
+  for( i = 3; i < argc; ++i ) {
+    strcat( line, argv[i] );
+    if ( i < argc - 1 ) {
+      strcat( line, " " );
+    }
+  }
+  strcat( line, "\n" );
+  int len = strlen(line);
+  if( write( sock, line, len ) < 0 ) {
+    
+    fprintf( stderr, "ERROR: failed while sending to server\n" );
+    exit( EXIT_FAILURE );
+  }
+
+  /* main loop */
+  while( 1 ) {
+
+    /* clean up any children */
+    while( waitpid( -1, NULL, WNOHANG ) > 0 );
+
+    /* wait for input */
+    FD_ZERO( &readfds );
+    FD_SET( sock, &readfds );
+    i = select( sock + 1, &readfds, NULL, NULL, NULL );
+    if( i < 0 ) {
+
+      fprintf( stderr, "ERROR: select failed\n" );
+      exit( EXIT_FAILURE );
+    }
+    if( i == 0 ) {
+      /* nothing ready - shouldn't happen without timeout */
+
+      continue;
+    }
+
+    /* handle server messages */
+    if( FD_ISSET( sock, &readfds ) ) {
+
+      /* get the input */
+      while( ( i = getLine( fromServer, READBUF_LEN, line, 0 ) ) >= 0 ) {
+
+	if( i == 0 ) {
+
+	  /* This could be an error or could just signify successful
+	     completion of all matches */
+	  fprintf( stderr, "Server closed connection\n" );
+	  exit( EXIT_SUCCESS );
+	}
+
+	/* check for server commands */
+	if( strncasecmp( line, "run ", 4 ) == 0 ) {
+
+	  /* split the rest of the line into name ' ' port */
+	  for( i = 4; line[ i ]; ++i ) {
+
+	    if( line[ i ] == ' ' ) {
+	      /* found the separator */
+
+	      line[ i ] = 0;
+	      break;
+	    }
+	  }
+
+	  printf( "starting match %s:%s", &line[ 4 ], &line[ i + 1 ] );
+	  fflush( stdout );
+
+	  /* run `command machine port` */
+	  childPID = fork();
+	  if( childPID < 0 ) {
+
+	    fprintf( stderr, "ERROR: fork() failed\n" );
+	    exit( EXIT_FAILURE );
+	  }
+	  if( childPID == 0 ) {
+	    /* child runs the command */
+
+	    execl( argv[ ARG_BOT_COMMAND ],
+		   argv[ ARG_BOT_COMMAND ],
+		   &line[ 4 ],
+		   &line[ i + 1 ],
+		   NULL );
+	    fprintf( stderr,
+		     "ERROR: could not run %s\n",
+		     argv[ ARG_BOT_COMMAND ] );
+	    exit( EXIT_FAILURE );
+	  }
+	} else {
+	  /* just a message, print it out */
+
+	  if( fwrite( line, 1, i, stdout ) < 0 ) {
+
+	    fprintf( stderr, "ERROR: failed while printing server message\n" );
+	    exit( EXIT_FAILURE );
+	  }
+	  fflush( stdout );
+
+	  if( ! strcmp( line, "Matches finished\n") ) {
+	    exit( EXIT_SUCCESS );
+	  }
+	}
+      }
+    }
+  }
+
+  return EXIT_SUCCESS;
+}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: acpc_dealer
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.1.1
 platform: ruby
 authors:
 - Dustin Morrill
@@ -284,6 +284,7 @@ files:
 - vendor/project_acpc_server/tags
 - vendor/project_acpc_server/holdem.limit.2p.reverse_blinds.game
 - vendor/project_acpc_server/kuhn_3p_equilibrium_player.sf1.sh
+- vendor/project_acpc_server/bm_run_matches.c
 - vendor/project_acpc_server/holdem.limit.3p.game
 - vendor/project_acpc_server/example_player.nolimit.2p.sh
 - vendor/project_acpc_server/game.h