X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=src%2Fserver%2Fhandler_coke.c;h=79d0a4697b2bdb4218a43cf119bb7d2a6e84c26e;hb=135e5ad4cc018ec05d1118e4d40be5c51db3f293;hp=09bcc8e95d4482feb17346a6c77b962a1875541d;hpb=ec400f11ebc2e81079e464145915fb2d25602fbc;p=tpg%2Fopendispense2.git

diff --git a/src/server/handler_coke.c b/src/server/handler_coke.c
index 09bcc8e..79d0a46 100644
--- a/src/server/handler_coke.c
+++ b/src/server/handler_coke.c
@@ -23,6 +23,12 @@
 #define READ_TIMEOUT	2	// 2 seconds for ReadChar
 #define TRACE_COKE	1
 
+#if TRACE_COKE
+# define TRACE(v...) do{printf("%s: ",__func__);printf(v);}while(0)
+#else
+# define TRACE(...)
+#endif
+
 // === IMPORTS ===
 
 // === PROTOTYPES ===
@@ -47,17 +53,23 @@ char	*gsCoke_SerialPort = "/dev/ttyS0";
 regex_t	gCoke_StatusRegex;
  int	gaCoke_CachedStatus[7];
 pthread_mutex_t	gCoke_Mutex = PTHREAD_MUTEX_INITIALIZER;
+time_t	gtCoke_LastDispenseTime;
 
 // == CODE ===
 int Coke_InitHandler()
 {
-	printf("connecting to coke machine...\n");
+	CompileRegex(&gCoke_StatusRegex, "^slot\\s+([0-9]+)\\s+([^:]+):([a-zA-Z]+)\\s*", REG_EXTENDED);
+	
+	printf("Connecting to coke machine on '%s'\n", gsCoke_SerialPort);
 	
 	giCoke_SerialFD = InitSerial(gsCoke_SerialPort, 9600);
 	if( giCoke_SerialFD == -1 ) {
 		fprintf(stderr, "ERROR: Unable to open coke serial port ('%s')\n", gsCoke_SerialPort);
 	}
 	else {
+		int i;
+		for( i = 0; i < 7; i ++ )
+			gaCoke_CachedStatus[i] = -1;
 		// Reset the slot names.
 		// - Dunno why this is needed, but the machine plays silly
 		//   sometimes.
@@ -78,11 +90,12 @@ int Coke_InitHandler()
 			
 			Coke_int_UpdateSlotStatuses();
 		}
+		else
+			fprintf(stderr, "Coke machine timed out.\n");
 	}
 	
 	AddPeriodicFunction(Coke_int_UpdateSlotStatuses);
 	
-	CompileRegex(&gCoke_StatusRegex, "^slot\\s+([0-9]+)\\s+([^:]+):([a-zA-Z]+)\\s*", REG_EXTENDED);
 	return 0;
 }
 
@@ -102,9 +115,7 @@ int Coke_int_GetSlotStatus(char *Buffer, int Slot)
 	Buffer[ matches[3].rm_eo ] = '\0';
 	status = &Buffer[ matches[3].rm_so ];
 	
-	#if TRACE_COKE
-	printf("Coke_CanDispense: Machine responded slot status '%s'\n", status);
-	#endif
+	TRACE("Machine responded slot %i status '%s'\n", Slot, status);
 
 	if( strcmp(status, "full") == 0 ) {
 		gaCoke_CachedStatus[Slot] = 0;	// 0: Avaliiable
@@ -116,120 +127,58 @@ int Coke_int_GetSlotStatus(char *Buffer, int Slot)
 	}
 }
 
+/**
+ * \brief Update the status of all coke slots
+ * \note Uses goto to reduce the chance of the lock being kept
+ */
 void Coke_int_UpdateSlotStatuses(void)
 {
-	 int	i;
-	 int	len;
+	 int	i, len;
 	char	tmp[40];
 	
+	if( giCoke_SerialFD == -1 )	return ;
+	
 	pthread_mutex_lock(&gCoke_Mutex);
 	
-	if( WaitForColon() )	return ;
+	while( ReadLine(sizeof tmp, tmp) >= 0 )	;
+	TRACE("send d7\n");
 	Writef("d7\r\n");	// Update slot statuses
-	WaitForColon();
-	Writef("s\n");
-	ReadLine(sizeof tmp, tmp);	// Read back what we just said
+	if( WaitForColon() )	goto ret;
+	TRACE("send s\n");
+	Writef("s\r\n");
+	do {
+		i = ReadLine(sizeof tmp, tmp);	// Read back what we just said
+		if( i == -1 ) {
+			TRACE("Eat read failed");
+			goto ret;
+		}
+	} while(tmp[0] != ':' && tmp[1] != 's');
 	
 	for( i = 0; i <= 6; i ++ )
 	{
-		len = ReadLine(sizeof tmp, tmp);
-		if( len == -1 )	return ;	// I give up :(
+		// Read until non-blank line
+		while( (len = ReadLine(sizeof tmp, tmp)) == 0 )	;
+		if( len == -1 ) {
+			TRACE("Read failed on slot %i\n", i);
+			goto ret;	// I give up :(
+		}
+		TRACE("tmp = '%s'\n", tmp);
 		Coke_int_GetSlotStatus(tmp, i);
 	}
+	// Eat blank line
+	len = ReadLine(sizeof tmp, tmp);
+	if( len == -1 ) {
+		TRACE("Read failed on blank line\n");
+	}
+
+	TRACE("Updated\n");
+
+ret:
 	pthread_mutex_unlock(&gCoke_Mutex);
 }
 
 int Coke_CanDispense(int UNUSED(User), int Item)
 {
-	// Disabled in favor of caching
-	#if 0
-	char	tmp[40], *status;
-	regmatch_t	matches[4];
-	 int	ret;
-
-	// Sanity please
-	if( Item < 0 || Item > 6 )	return -1;	// -EYOURBAD
-	
-	// Can't dispense if the machine is not connected
-	if( giCoke_SerialFD == -1 )
-		return -2;
-	
-	#if TRACE_COKE
-	printf("Coke_CanDispense: Flushing\n");
-	#endif
-	
-	
-	// Wait for a prompt
-	ret = 0;
-	while( WaitForColon() && ret < 3 )
-	{
-		// Flush the input buffer
-		char	tmpbuf[512];
-		read(giCoke_SerialFD, tmpbuf, sizeof(tmpbuf));
-		#if TRACE_COKE
-		printf("Coke_CanDispense: sending 'd7'\n");
-		#endif
-		Writef("d7\r\n");
-		ret ++;
-	}
-	// Check for a timeout error
-	if( !(ret < 3) ) {
-		fprintf(stderr, "Coke machine timed out\n");
-		return -2;	// -EMYBAD
-	}
-	
-	// You need to do a 'd7' before reading the status
-	// - Otherwise it sometimes reports a full slot as empty
-	//   [TPG] (2011-02-19)
-	if( ret == 0 )
-	{
-		Writef("d7\r\n");
-		WaitForColon();
-	}
-
-	// TODO: Handle "not ok" response to D7
-	
-	#if TRACE_COKE
-	printf("Coke_CanDispense: sending 's%i'\n", Item);
-	#endif
-	
-	// Ask the coke machine
-	Writef("s%i\r\n", Item);
-
-	#if TRACE_COKE
-	printf("Coke_CanDispense: reading response\n");
-	#endif
-	// Read from the machine (ignoring empty lines)
-	while( (ret = ReadLine(sizeof(tmp)-1, tmp)) == 0 );
-	#if TRACE_COKE
-	printf("ret = %i, tmp = '%s'\n", ret, tmp);
-	#endif
-	// Read back-echoed lines
-	while( tmp[0] == ':' || tmp[1] != 'l' )
-	{
-		ret = ReadLine(sizeof(tmp)-1, tmp);
-		if( ret == -1 )	return -1;
-		printf("ret = %i, tmp = '%s'\n", ret, tmp);
-	}
-
-	// Catch an error	
-	if( ret <= 0 ) {
-		fprintf(stderr, "Coke machine is not being chatty (read = %i)\n", ret);
-		if( ret == -1 ) {
-			perror("Coke Machine");
-		}
-		return -1;
-	}
-	
-	#if TRACE_COKE
-	printf("Coke_CanDispense: wait for the prompt again\n");
-	#endif
-
-	// Eat rest of response
-	WaitForColon();
-
-	return Coke_GetSlotStatus(tmp, Item);
-	#else
 	// Sanity please
 	if( Item < 0 || Item > 6 )	return -1;	// -EYOURBAD
 	
@@ -238,7 +187,6 @@ int Coke_CanDispense(int UNUSED(User), int Item)
 		return -2;
 	
 	return gaCoke_CachedStatus[Item];
-	#endif
 }
 
 /**
@@ -255,14 +203,21 @@ int Coke_DoDispense(int UNUSED(User), int Item)
 	// Can't dispense if the machine is not connected
 	if( giCoke_SerialFD == -1 )
 		return -2;
+
+	// Make sure there are not two dispenses within n seconds
+	if( time(NULL) - gtCoke_LastDispenseTime < 10 )
+	{
+		printf("Wait %li seconds?\n", 10 - (time(NULL) - gtCoke_LastDispenseTime));
+		sleep( 10 - (time(NULL) - gtCoke_LastDispenseTime) );
+		printf("wait done\n");
+	}
 	
 	// LOCK
 	pthread_mutex_lock(&gCoke_Mutex);
 	
-	#if TRACE_COKE
-	printf("Coke_DoDispense: flushing input\n");
-	#endif
+	TRACE("flushing input\n");
 	
+
 	// Wait for prompt
 	ret = 0;
 	while( WaitForColon() && ret < 3 )
@@ -270,15 +225,18 @@ int Coke_DoDispense(int UNUSED(User), int Item)
 		// Flush the input buffer
 		char	tmpbuf[512];
 		read(giCoke_SerialFD, tmpbuf, sizeof(tmpbuf));
-		#if TRACE_COKE
-		printf("Coke_DoDispense: sending 'd7'\n");
-		#endif
+		TRACE("sending 'd7'\n");
 		Writef("d7\r\n");
+		ret ++;
+	}
+	if( ret == 3 )
+	{
+		TRACE("timed out\n");
+		pthread_mutex_unlock(&gCoke_Mutex);
+		return -1;
 	}
 
-	#if TRACE_COKE
-	printf("Coke_DoDispense: sending 'd%i'\n", Item);
-	#endif
+	TRACE("sending 'd%i'\n", Item);
 	// Dispense
 	Writef("d%i\r\n", Item);
 	
@@ -289,18 +247,14 @@ int Coke_DoDispense(int UNUSED(User), int Item)
 			pthread_mutex_unlock(&gCoke_Mutex);
 			return -1;
 		}
-		#if TRACE_COKE
-		printf("Coke_DoDispense: read %i '%s'\n", ret, tmp);
-		#endif
+		TRACE("read %i '%s'\n", ret, tmp);
 	} while( ret == 0 || tmp[0] == ':' || tmp[0] == 'd' );
 
 	WaitForColon();	// Eat up rest of response
 	
-	#if TRACE_COKE
-	printf("Coke_DoDispense: done\n");
-	#endif
+	TRACE("done\n");
 
-	// TODO: Regex
+	// TODO: Regex instead?
 	if( strcmp(tmp, "ok") == 0 ) {
 		// We think dispense worked
 		// - The machine returns 'ok' if an empty slot is dispensed, even if
@@ -308,20 +262,31 @@ int Coke_DoDispense(int UNUSED(User), int Item)
 		ret = 0;
 	}
 	else {
-		printf("Machine returned unknown value '%s'\n", tmp);
+		printf("Coke_DoDispense: Machine returned unknown value '%s'\n", tmp);
 		ret = -1;
 	}
 	
+	TRACE("Updating slot status\n");
+	
 	// Update status
+	WaitForColon();
 	Writef("s%i\r\n", Item);
 	len = ReadLine(sizeof tmp, tmp);
 	if(len == -1)	gaCoke_CachedStatus[Item] = -1;
 	Coke_int_GetSlotStatus(tmp, Item);
+	{
+		char buf[512];
+		read(giCoke_SerialFD, buf, 512);	// Flush
+	}
+
+	gtCoke_LastDispenseTime = time(NULL);
 	
-	
+	// Release and return
 	pthread_mutex_unlock(&gCoke_Mutex);
 	
-	return ret;
+	//return ret;
+	// HACK!!!
+	return 0;
 }
 
 char ReadChar()
@@ -340,13 +305,13 @@ char ReadChar()
 	ret = select(giCoke_SerialFD+1, &readfs, NULL, NULL, &timeout);
 	if( ret == 0 )	return 0;	// Timeout
 	if( ret != 1 ) {
-		printf("readchar return %i\n", ret);
+		printf("ReadChar: select return %i\n", ret);
 		return 0;
 	}
 	
 	ret = read(giCoke_SerialFD, &ch, 1);
 	if( ret != 1 ) {
-		printf("ret = %i\n", ret);
+		printf("ReadChar: ret != 1 (%i)\n", ret);
 		return 0;
 	}
 	
@@ -413,8 +378,6 @@ int ReadLine(int len, char *output)
 		}
 	}
 
-	//printf("ReadLine: output=%s\n", output);
-
 	if( !ch ) 	return -1;
 	return i;
 }