- added new server parameter UnavailablePeriod (Alexei)

 - dropped column hosts.network_errors (Alexei)
 - added column hosts.errors_from (Alexei)


git-svn-id: svn://svn.zabbix.com/trunk@2604 97f52cf1-0a1b-0410-bd0e-c28be96e8082

2 files changed, 14 insertions, 9 deletions

diff --git a/src/alphacode/poller/go b/src/alphacode/poller/go
index f2505af8..a38d9819 100755
--- a/src/alphacode/poller/go
+++ b/src/alphacode/poller/go
@@ -1 +1,2 @@
-gcc snmp.c -I/usr/include/net-snmp -lsnmp
+#gcc snmp.c -I/usr/include/net-snmp -lsnmp
+gcc poller_epoll.c -o poller_epoll
diff --git a/src/alphacode/poller/poller_epoll.c b/src/alphacode/poller/poller_epoll.c
index 2841c315..749d67db 100644
--- a/src/alphacode/poller/poller_epoll.c
+++ b/src/alphacode/poller/poller_epoll.c
@@ -26,7 +26,7 @@
 ** Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 **/
 
-#define NUM	5
+#define NUM	1000
 
 int	s;
 
@@ -47,6 +47,7 @@ void	wait_connect()
 		
 		printf("epfd [%d]\n", epfd);
 		printf("NUM [%d]\n", NUM);
+		events=malloc(NUM*sizeof(struct epoll_event));
 		retval = epoll_wait(epfd, events, NUM, -1);
 		if(retval == -1)
 		{
@@ -54,6 +55,9 @@ void	wait_connect()
 			printf("Retval [%d]\n", errno);
 			exit(-1);
 		}
+		printf("Retval [%d]\n", retval);
+		sleep(1);
+		continue;
 
 		for(i=0;i<retval;i++)
 		{
@@ -120,7 +124,7 @@ int	main()
 		{
 			if(errno == EINPROGRESS)
 			{
-				printf("Connection in progress\n");
+//				printf("Connection in progress\n");
 			}
 			else
 			{
@@ -129,11 +133,11 @@ int	main()
 			}
 		}
 
-		if(fcntl(s, F_SETFL, O_NONBLOCK) == -1)
-		{
-			perror("fcntl() failed\n");
-			exit(-1);
-		}
+//		if(fcntl(s, F_SETFL, O_NONBLOCK) == -1)
+//		{
+//			perror("fcntl() failed\n");
+//			exit(-1);
+//		}
 
 		ev.events = EPOLLIN | EPOLLERR | EPOLLHUP | EPOLLOUT;
 		ev.data.fd = s;
@@ -142,7 +146,7 @@ int	main()
 			perror("epoll_ctl, adding listenfd\n");
 			exit(1);
 		} 
-		printf("epoll_ctl ok fd [%d]\n", s);
+//		printf("epoll_ctl ok fd [%d]\n", s);
 	}
 
 	wait_connect();