Changes in forced polling
authorVictor Kirhenshtein <victor@netxms.org>
Sun, 26 Sep 2004 14:29:00 +0000 (14:29 +0000)
committerVictor Kirhenshtein <victor@netxms.org>
Sun, 26 Sep 2004 14:29:00 +0000 (14:29 +0000)
.gitattributes
src/console/win32/PollNodeDlg.cpp [deleted file]
src/console/win32/PollNodeDlg.h [deleted file]
src/console/win32/comm.cpp
src/console/win32/globals.h
src/console/win32/nxcon.clw

index 15a2819..6d82c94 100644 (file)
@@ -192,8 +192,6 @@ src/console/win32/ObjectSelDlg.cpp -text
 src/console/win32/ObjectSelDlg.h -text
 src/console/win32/PasswordChangeDlg.cpp -text
 src/console/win32/PasswordChangeDlg.h -text
-src/console/win32/PollNodeDlg.cpp -text
-src/console/win32/PollNodeDlg.h -text
 src/console/win32/RequestProcessingDlg.cpp -text
 src/console/win32/RequestProcessingDlg.h -text
 src/console/win32/RuleAlarmDlg.cpp -text
diff --git a/src/console/win32/PollNodeDlg.cpp b/src/console/win32/PollNodeDlg.cpp
deleted file mode 100644 (file)
index 6b46b4b..0000000
+++ /dev/null
@@ -1,104 +0,0 @@
-// PollNodeDlg.cpp : implementation file
-//
-
-#include "stdafx.h"
-#include "nxcon.h"
-#include "PollNodeDlg.h"
-
-#ifdef _DEBUG
-#define new DEBUG_NEW
-#undef THIS_FILE
-static char THIS_FILE[] = __FILE__;
-#endif
-
-/////////////////////////////////////////////////////////////////////////////
-// CPollNodeDlg dialog
-
-
-CPollNodeDlg::CPollNodeDlg(CWnd* pParent /*=NULL*/)
-       : CDialog(CPollNodeDlg::IDD, pParent)
-{
-       //{{AFX_DATA_INIT(CPollNodeDlg)
-               // NOTE: the ClassWizard will add member initialization here
-       //}}AFX_DATA_INIT
-   m_hThread = NULL;
-   m_dwResult = RCC_SYSTEM_FAILURE;
-}
-
-
-void CPollNodeDlg::DoDataExchange(CDataExchange* pDX)
-{
-       CDialog::DoDataExchange(pDX);
-       //{{AFX_DATA_MAP(CPollNodeDlg)
-       DDX_Control(pDX, IDCANCEL, m_wndCloseButton);
-       DDX_Control(pDX, IDC_EDIT_MSG, m_wndMsgBox);
-       DDX_Control(pDX, IDC_POLL_PROGRESS, m_wndProgressBar);
-       //}}AFX_DATA_MAP
-}
-
-
-BEGIN_MESSAGE_MAP(CPollNodeDlg, CDialog)
-       //{{AFX_MSG_MAP(CPollNodeDlg)
-       //}}AFX_MSG_MAP
-   ON_MESSAGE(WM_REQUEST_COMPLETED, OnRequestCompleted)
-   ON_MESSAGE(WM_POLLER_MESSAGE, OnPollerMessage)
-END_MESSAGE_MAP()
-
-/////////////////////////////////////////////////////////////////////////////
-// CPollNodeDlg message handlers
-
-
-//
-// WM_INITDIALOG message handler
-//
-
-BOOL CPollNodeDlg::OnInitDialog() 
-{
-       CDialog::OnInitDialog();
-       
-   // Setup message area
-   m_font.CreateFont(-MulDiv(8, GetDeviceCaps(GetDC()->m_hDC, LOGPIXELSY), 72),
-                     0, 0, 0, FW_NORMAL, FALSE, FALSE, FALSE, ANSI_CHARSET,
-                     OUT_DEFAULT_PRECIS, CLIP_DEFAULT_PRECIS, PROOF_QUALITY,
-                     FIXED_PITCH | FF_DONTCARE, "Courier");
-   m_wndMsgBox.SetFont(&m_font);
-
-   *m_phWnd = m_hWnd;
-   m_wndCloseButton.EnableWindow(FALSE);
-   ResumeThread(m_hThread);
-       return TRUE;
-}
-
-
-//
-// WM_REQUEST_COMPLETED message handler
-//
-
-void CPollNodeDlg::OnRequestCompleted(WPARAM wParam, LPARAM lParam)
-{
-   m_dwResult = lParam;
-   m_wndCloseButton.EnableWindow(TRUE);
-}
-
-
-//
-// WM_POLLER_MESSAGE message handler
-//
-
-void CPollNodeDlg::OnPollerMessage(WPARAM wParam, LPARAM lParam)
-{
-   m_wndMsgBox.SetSel(0, -1);
-   m_wndMsgBox.SetSel(-1, -1);
-   m_wndMsgBox.ReplaceSel((LPCTSTR)lParam);
-   free((void *)lParam);
-}
-
-
-//
-// Handler for "Close" button
-//
-
-void CPollNodeDlg::OnCancel() 
-{
-   EndDialog(m_dwResult);
-}
diff --git a/src/console/win32/PollNodeDlg.h b/src/console/win32/PollNodeDlg.h
deleted file mode 100644 (file)
index ca81829..0000000
+++ /dev/null
@@ -1,56 +0,0 @@
-#if !defined(AFX_POLLNODEDLG_H__7C404C49_8BF3_492B_8E8C_C53EAE704C76__INCLUDED_)
-#define AFX_POLLNODEDLG_H__7C404C49_8BF3_492B_8E8C_C53EAE704C76__INCLUDED_
-
-#if _MSC_VER > 1000
-#pragma once
-#endif // _MSC_VER > 1000
-// PollNodeDlg.h : header file
-//
-
-/////////////////////////////////////////////////////////////////////////////
-// CPollNodeDlg dialog
-
-class CPollNodeDlg : public CDialog
-{
-// Construction
-public:
-       HWND *m_phWnd;
-       HANDLE m_hThread;
-       CPollNodeDlg(CWnd* pParent = NULL);   // standard constructor
-
-// Dialog Data
-       //{{AFX_DATA(CPollNodeDlg)
-       enum { IDD = IDD_POLL_NODE };
-       CButton m_wndCloseButton;
-       CEdit   m_wndMsgBox;
-       CProgressCtrl   m_wndProgressBar;
-       //}}AFX_DATA
-
-
-// Overrides
-       // ClassWizard generated virtual function overrides
-       //{{AFX_VIRTUAL(CPollNodeDlg)
-       protected:
-       virtual void DoDataExchange(CDataExchange* pDX);    // DDX/DDV support
-       //}}AFX_VIRTUAL
-
-// Implementation
-protected:
-
-       // Generated message map functions
-       //{{AFX_MSG(CPollNodeDlg)
-       virtual BOOL OnInitDialog();
-       virtual void OnCancel();
-       //}}AFX_MSG
-   afx_msg void OnRequestCompleted(WPARAM wParam, LPARAM lParam);
-   afx_msg void OnPollerMessage(WPARAM wParam, LPARAM lParam);
-       DECLARE_MESSAGE_MAP()
-private:
-       CFont m_font;
-       DWORD m_dwResult;
-};
-
-//{{AFX_INSERT_LOCATION}}
-// Microsoft Visual C++ will insert additional declarations immediately before the previous line.
-
-#endif // !defined(AFX_POLLNODEDLG_H__7C404C49_8BF3_492B_8E8C_C53EAE704C76__INCLUDED_)
index 5d3bddf..d1d3921 100644 (file)
@@ -24,7 +24,6 @@
 
 #include "stdafx.h"
 #include "nxcon.h"
-#include "PollNodeDlg.h"
 
 
 //
 #define UI_THREAD_WAIT_TIME   300
 
 
-//
-// Request parameters structure
-//
-
-struct RqData
-{
-   HWND hWnd;
-   DWORD (* pFunc)(...);
-   DWORD dwNumParams;
-   void *pArg1;
-   void *pArg2;
-   void *pArg3;
-   void *pArg4;
-   void *pArg5;
-   void *pArg6;
-};
-
-
 //
 // Set status text in wait window
 //
@@ -405,44 +386,15 @@ static void PollerCallback(TCHAR *pszMsg, void *pArg)
 // Poller thread
 //
 
-static DWORD WINAPI PollerThread(void *pArg)
+DWORD WINAPI PollerThread(void *pArg)
 {
    RqData *pData = (RqData *)pArg;
    DWORD dwResult;
 
+theApp.DebugPrintf("Starting poll...");
    dwResult = NXCPollNode((DWORD)pData->pArg1, (int)pData->pArg2, PollerCallback, pArg);
+theApp.DebugPrintf("poll complete: %d", dwResult);
    if (pData->hWnd != NULL)
       PostMessage(pData->hWnd, WM_REQUEST_COMPLETED, 0, dwResult);
    return dwResult;
 }
-
-
-//
-// Perform forced node poll
-//
-
-DWORD DoNodePoll(DWORD dwObjectId, int iPollType)
-{
-   HANDLE hThread;
-   DWORD dwThreadId, dwResult;
-   RqData data;
-
-   data.pArg1 = (void *)dwObjectId;
-   data.pArg2 = (void *)iPollType;
-   hThread = CreateThread(NULL, 0, PollerThread, &data, CREATE_SUSPENDED, &dwThreadId);
-   if (hThread != NULL)
-   {
-      CPollNodeDlg wndPollDlg;
-
-      wndPollDlg.m_phWnd = &data.hWnd;
-      wndPollDlg.m_hThread = hThread;
-      dwResult = (DWORD)wndPollDlg.DoModal();
-      CloseHandle(hThread);
-   }
-   else
-   {
-      dwResult = RCC_SYSTEM_FAILURE;
-   }
-
-   return dwResult;
-}
index bdabca2..bcac083 100644 (file)
@@ -90,6 +90,24 @@ extern CConsoleApp theApp;
 #define WORKDIR_IMAGECACHE "\\ImageCache"
 
 
+//
+// Request parameters structure
+//
+
+struct RqData
+{
+   HWND hWnd;
+   DWORD (* pFunc)(...);
+   DWORD dwNumParams;
+   void *pArg1;
+   void *pArg2;
+   void *pArg3;
+   void *pArg4;
+   void *pArg5;
+   void *pArg6;
+};
+
+
 //
 // Code translation structure
 //
@@ -124,7 +142,7 @@ DWORD DoRequestArg2(void *pFunc, void *pArg1, void *pArg2, char *pszInfoText);
 DWORD DoRequestArg3(void *pFunc, void *pArg1, void *pArg2, void *pArg3, char *pszInfoText);
 DWORD DoRequestArg6(void *pFunc, void *pArg1, void *pArg2, void *pArg3, void *pArg4, 
                     void *pArg5, void *pArg6, char *pszInfoText);
-DWORD DoNodePoll(DWORD dwObjectId, int iPollType);
+DWORD WINAPI PollerThread(void *pArg);
 
 
 //
index 6010a35..28592da 100644 (file)
@@ -2,35 +2,35 @@
 
 [General Info]
 Version=1
-LastClass=CPollNodeDlg
-LastTemplate=CDialog
+LastClass=CNodePoller
+LastTemplate=CMDIChildWnd
 NewFileInclude1=#include "stdafx.h"
 NewFileInclude2=#include "nxcon.h"
 LastPage=0
 
-ClassCount=64
+ClassCount=65
 Class1=CConsoleApp
 Class3=CMainFrame
 Class4=CChildFrame
 Class7=CEventBrowser
 Class9=CMapView
 
-ResourceCount=82
+ResourceCount=83
 Resource1=IDD_THRESHOLD (English (U.S.))
-Resource2=IDD_REQUEST_PROCESSING
+Resource2=IDR_MAINFRAME
 Resource3=IDM_VIEW_SPECIFIC (English (U.S.))
-Resource4=IDD_OBJECT_CAPS
-Resource5=IDD_NEW_ACTION
+Resource4=IDD_SELECT_EVENT
+Resource5=IDD_DCI_THRESHOLDS
 Class2=CChildView
 Class5=CAboutDlg
 Class6=CControlPanel
 Class8=CMapFrame
 Class10=CLoginDialog
-Resource6=IDD_EDIT_RULE_COMMENT
+Resource6=IDD_SELECT_USER
 Class11=CProgressDialog
-Resource7=IDR_MAINFRAME
+Resource7=IDD_OBJECT_PRESENTATION
 Class12=CObjectBrowser
-Resource8=IDD_CP_GENERAL
+Resource8=IDD_DCI_COLLECTION
 Class13=CObjectPropDlg
 Resource9=IDD_CP_GENERAL (English (U.S.))
 Resource10=IDA_OBJECT_BROWSER (English (U.S.))
@@ -46,7 +46,7 @@ Resource17=IDD_SET_PASSWORD (English (U.S.))
 Class16=CDebugFrame
 Resource18=IDD_OBJECT_SECURITY (English (U.S.))
 Resource19=IDD_OBJECT_PROPERTIES (English (U.S.))
-Resource20=IDD_USER_PROPERTIES
+Resource20=IDD_ABOUTBOX
 Class17=CObjectPreview
 Resource21=IDD_DCI_TRANSFORM (English (U.S.))
 Class18=CToolBox
@@ -59,32 +59,32 @@ Class23=CNodePropsGeneral
 Resource23=IDD_LOGIN (English (U.S.))
 Class24=CObjectPropCaps
 Class25=CObjectPropSheet
-Resource24=IDD_SELECT_USER
+Resource24=IDA_EPP
 Class26=CRequestProcessingDlg
 Resource25=IDD_EDIT_EVENT (English (U.S.))
 Resource26=IDD_PROGRESS (English (U.S.))
-Resource27=IDA_OBJECT_BROWSER
+Resource27=IDD_EDIT_RULE_ALARM
 Resource28=IDD_USER_PROPERTIES (English (U.S.))
 Class27=CObjectPropsGeneral
 Resource29=IDA_ALARM_BROWSER (English (U.S.))
 Class28=CObjectPropsSecurity
 Resource30=IDD_CREATE_NODE (English (U.S.))
-Resource31=IDD_EDIT_RULE_SEVERITY
-Resource32=IDA_MDI_DEFAULT
+Resource31=IDD_GROUP_PROPERTIES
+Resource32=IDD_EDIT_RULE_SEVERITY
 Class29=CUserSelectDlg
-Resource33=IDD_SELECT_OBJECT
+Resource33=IDD_OBJECT_SECURITY
 Class30=CUserEditor
 Resource34=IDD_DCI_PROPERTIES
 Class31=CNewUserDlg
-Resource35=IDD_MIB_BROWSER
-Resource36=IDD_NEW_USER
+Resource35=IDD_OBJECT_GENERAL
+Resource36=IDA_ALARM_BROWSER
 Class32=CUserPropDlg
 Resource37=IDM_CONTEXT (English (U.S.))
-Resource38=IDM_CONTEXT
+Resource38=IDD_CP_GENERAL
 Class33=CGroupPropDlg
-Resource39=IDD_CREATE_CONTAINER
-Resource40=IDD_OBJECT_GENERAL
-Resource41=IDD_LOGIN
+Resource39=IDD_SELECT_OBJECT
+Resource40=IDA_MDI_DEFAULT
+Resource41=IDD_SELECT_ACTION
 Resource42=IDD_SELECT_OBJECT (English (U.S.))
 Class34=CPasswordChangeDlg
 Class35=CNodeSummary
@@ -100,55 +100,55 @@ Class41=CGraphFrame
 Class42=CDCIThresholdsPage
 Resource46=IDA_MDI_DEFAULT (English (U.S.))
 Resource47=IDD_OBJECT_CAPS (English (U.S.))
-Resource48=IDD_DCI_THRESHOLDS
+Resource48=IDD_OBJECT_CAPS
 Class43=CThresholdDlg
 Resource49=IDD_SELECT_USER (English (U.S.))
-Resource50=IDD_SELECT_EVENT
+Resource50=IDD_NEW_USER
 Class44=CMIBBrowserDlg
 Class45=CEventPolicyEditor
 Class46=CRuleList
 Class47=CRuleHeader
 Resource51=IDR_MAINFRAME (English (U.S.))
-Resource52=IDM_VIEW_SPECIFIC
+Resource52=IDM_CONTEXT
 Class48=CObjectSelDlg
-Resource53=IDD_EDIT_EVENT
-Resource54=IDA_ALARM_BROWSER
+Resource53=IDD_CREATE_CONTAINER
+Resource54=IDD_NEW_ACTION
 Class49=CRuleCommentDlg
-Resource55=IDD_THRESHOLD
+Resource55=IDD_REQUEST_PROCESSING
 Class50=CEventSelDlg
-Resource56=IDD_OBJECT_PRESENTATION
+Resource56=IDD_USER_PROPERTIES
 Resource57=IDD_REQUEST_PROCESSING (English (U.S.))
-Resource58=IDD_CREATE_NODE
+Resource58=IDD_EDIT_RULE_COMMENT
 Resource59=IDD_ABOUTBOX (English (U.S.))
 Resource60=IDD_MIB_BROWSER (English (U.S.))
 Class51=CObjectPropsPresentation
 Resource61=IDD_OBJECT_PRESENTATION (English (U.S.))
-Resource62=IDD_DCI_COLLECTION
+Resource62=IDD_OBJECT_NODE_GENERAL
 Class52=CRuleSeverityDlg
-Resource63=IDD_SELECT_ACTION
+Resource63=IDD_MIB_BROWSER
 Class53=CRuleAlarmDlg
 Class54=CAlarmBrowser
 Resource64=IDD_SELECT_EVENT (English (U.S.))
-Resource65=IDD_OBJECT_NODE_GENERAL
+Resource65=IDD_CREATE_NODE
 Resource66=IDD_NEW_ACTION (English (U.S.))
 Resource67=IDD_DCI_COLLECTION (English (U.S.))
 Resource68=IDD_NEW_USER (English (U.S.))
 Class55=CConsolePropsGeneral
 Class56=CActionEditor
-Resource69=IDD_GROUP_PROPERTIES
-Resource70=IDD_ABOUTBOX
+Resource69=IDD_LOGIN
+Resource70=IDD_ACTION_PROPERTIES
 Class57=CNewActionDlg
-Resource71=IDD_ACTION_PROPERTIES
+Resource71=IDD_THRESHOLD
 Class58=CEditActionDlg
-Resource72=IDD_OBJECT_SECURITY
+Resource72=IDA_OBJECT_BROWSER
 Class59=CActionSelDlg
-Resource73=IDD_EDIT_RULE_ALARM
+Resource73=IDD_SET_PASSWORD
 Resource74=IDD_EDIT_RULE_COMMENT (English (U.S.))
 Resource75=IDD_EDIT_RULE_ALARM (English (U.S.))
-Resource76=IDA_EPP
+Resource76=IDM_VIEW_SPECIFIC
 Class60=CCreateObjectDlg
 Class61=CCreateContainerDlg
-Resource77=IDD_SET_PASSWORD
+Resource77=IDD_EDIT_EVENT
 Class62=CCreateNodeDlg
 Resource78=IDA_EPP (English (U.S.))
 Resource79=IDD_CREATE_CONTAINER (English (U.S.))
@@ -157,6 +157,8 @@ Class63=CDCITransformPage
 Resource81=IDD_ACTION_PROPERTIES (English (U.S.))
 Class64=CPollNodeDlg
 Resource82=IDD_POLL_NODE (English (U.S.))
+Class65=CNodePoller
+Resource83=IDD_DCI_TRANSFORM
 
 [CLS:CConsoleApp]
 Type=0
@@ -590,40 +592,43 @@ Command14=ID_OBJECT_RENAME
 Command15=ID_OBJECT_DELETE
 Command16=ID_OBJECT_MANAGE
 Command17=ID_OBJECT_UNMANAGE
-Command18=ID_OBJECT_DATACOLLECTION
-Command19=ID_OBJECT_PROPERTIES
-Command20=ID_USER_CREATE_USER
-Command21=ID_USER_CREATE_GROUP
-Command22=ID_USER_DELETE
-Command23=ID_USER_SETPASSWORD
-Command24=ID_USER_PROPERTIES
-Command25=ID_ITEM_NEW
-Command26=ID_ITEM_EDIT
-Command27=ID_ITEM_DELETE
-Command28=ID_ITEM_ACTIVATE
-Command29=ID_ITEM_DISABLE
-Command30=ID_ITEM_SHOWDATA
-Command31=ID_ITEM_GRAPH
-Command32=ID_POLICY_ADD
-Command33=ID_POLICY_DELETE
-Command34=ID_POLICY_EDIT
-Command35=ID_POLICY_NEGATECELL
-Command36=ID_POLICY_INSERTRULE_ABOVE
-Command37=ID_POLICY_INSERTRULE_BELOW
-Command38=ID_POLICY_INSERTRULE_TOP
-Command39=ID_POLICY_INSERTRULE_BOTTOM
-Command40=ID_POLICY_DELETERULE
-Command41=ID_POLICY_ENABLERULE
-Command42=ID_POLICY_DISABLERULE
-Command43=ID_ALARM_ACKNOWLEGE
-Command44=ID_ALARM_DELETE
-Command45=ID_ALARM_GOTOSOURCE
-Command46=ID_UPDATE_EVENT_LIST
-Command47=ID_CONTROLPANEL_ACTIONS
-Command48=ID_CONTROLPANEL_EVENTS
-Command49=ID_CONTROLPANEL_EVENTPOLICY
-Command50=ID_CONTROLPANEL_USERS
-CommandCount=50
+Command18=ID_OBJECT_POLL_STATUS
+Command19=ID_OBJECT_POLL_CONFIGURATION
+Command20=ID_OBJECT_DATACOLLECTION
+Command21=ID_OBJECT_PROPERTIES
+Command22=ID_USER_CREATE_USER
+Command23=ID_USER_CREATE_GROUP
+Command24=ID_USER_DELETE
+Command25=ID_USER_SETPASSWORD
+Command26=ID_USER_PROPERTIES
+Command27=ID_ITEM_NEW
+Command28=ID_ITEM_EDIT
+Command29=ID_ITEM_DELETE
+Command30=ID_ITEM_ACTIVATE
+Command31=ID_ITEM_DISABLE
+Command32=ID_ITEM_SHOWDATA
+Command33=ID_ITEM_GRAPH
+Command34=ID_POLICY_ADD
+Command35=ID_POLICY_DELETE
+Command36=ID_POLICY_EDIT
+Command37=ID_POLICY_NEGATECELL
+Command38=ID_POLICY_INSERTRULE_ABOVE
+Command39=ID_POLICY_INSERTRULE_BELOW
+Command40=ID_POLICY_INSERTRULE_TOP
+Command41=ID_POLICY_INSERTRULE_BOTTOM
+Command42=ID_POLICY_DELETERULE
+Command43=ID_POLICY_ENABLERULE
+Command44=ID_POLICY_DISABLERULE
+Command45=ID_ALARM_ACKNOWLEGE
+Command46=ID_ALARM_DELETE
+Command47=ID_ALARM_GOTOSOURCE
+Command48=ID_UPDATE_EVENT_LIST
+Command49=ID_CONTROLPANEL_ACTIONS
+Command50=ID_CONTROLPANEL_EVENTS
+Command51=ID_CONTROLPANEL_EVENTPOLICY
+Command52=ID_CONTROLPANEL_USERS
+Command53=ID_CONTROLPANEL_DCT
+CommandCount=53
 
 [ACL:IDA_MDI_DEFAULT]
 Type=1
@@ -733,12 +738,14 @@ VirtualFilter=WC
 Type=1
 Class=?
 Command1=ID_OBJECT_BIND
-Command2=ID_OBJECT_FIND
-Command3=ID_OBJECT_VIEW_SELECTION
-Command4=ID_OBJECT_VIEW_VIEWASLIST
-Command5=ID_OBJECT_VIEW_SHOWPREVIEWPANE
-Command6=ID_OBJECT_VIEW_VIEWASTREE
-CommandCount=6
+Command2=ID_OBJECT_POLL_CONFIGURATION
+Command3=ID_OBJECT_FIND
+Command4=ID_OBJECT_VIEW_SELECTION
+Command5=ID_OBJECT_VIEW_VIEWASLIST
+Command6=ID_OBJECT_VIEW_SHOWPREVIEWPANE
+Command7=ID_OBJECT_POLL_STATUS
+Command8=ID_OBJECT_VIEW_VIEWASTREE
+CommandCount=8
 
 [CLS:CToolBox]
 Type=0
@@ -1187,48 +1194,51 @@ Command10=ID_OBJECT_RENAME
 Command11=ID_OBJECT_DELETE
 Command12=ID_OBJECT_MANAGE
 Command13=ID_OBJECT_UNMANAGE
-Command14=ID_OBJECT_DATACOLLECTION
-Command15=ID_OBJECT_PROPERTIES
-Command16=ID_ITEM_NEW
-Command17=ID_ITEM_EDIT
-Command18=ID_ITEM_DELETE
-Command19=ID_ITEM_ACTIVATE
-Command20=ID_ITEM_DISABLE
-Command21=ID_ITEM_SHOWDATA
-Command22=ID_ITEM_GRAPH
-Command23=ID_POLICY_INSERTRULE_ABOVE
-Command24=ID_POLICY_INSERTRULE_BELOW
-Command25=ID_POLICY_INSERTRULE_TOP
-Command26=ID_POLICY_INSERTRULE_BOTTOM
-Command27=ID_POLICY_DELETERULE
-Command28=ID_POLICY_ENABLERULE
-Command29=ID_POLICY_DISABLERULE
-Command30=ID_POLICY_ADD
-Command31=ID_POLICY_DELETE
-Command32=ID_POLICY_NEGATECELL
-Command33=ID_POLICY_INSERTRULE_ABOVE
-Command34=ID_POLICY_INSERTRULE_BELOW
-Command35=ID_POLICY_INSERTRULE_TOP
-Command36=ID_POLICY_INSERTRULE_BOTTOM
-Command37=ID_POLICY_DELETERULE
-Command38=ID_POLICY_ENABLERULE
-Command39=ID_POLICY_DISABLERULE
-Command40=ID_POLICY_EDIT
-Command41=ID_POLICY_INSERTRULE_ABOVE
-Command42=ID_POLICY_INSERTRULE_BELOW
-Command43=ID_POLICY_INSERTRULE_TOP
-Command44=ID_POLICY_INSERTRULE_BOTTOM
-Command45=ID_POLICY_DELETERULE
-Command46=ID_POLICY_ENABLERULE
-Command47=ID_POLICY_DISABLERULE
-Command48=ID_ALARM_ACKNOWLEGE
-Command49=ID_ALARM_DELETE
-Command50=ID_ALARM_GOTOSOURCE
-Command51=ID_ACTION_NEW
-Command52=ID_ACTION_RENAME
-Command53=ID_ACTION_DELETE
-Command54=ID_ACTION_PROPERTIES
-CommandCount=54
+Command14=ID_OBJECT_POLL_STATUS
+Command15=ID_OBJECT_POLL_CONFIGURATION
+Command16=ID_OBJECT_DATACOLLECTION
+Command17=ID_OBJECT_PROPERTIES
+Command18=ID_ITEM_NEW
+Command19=ID_ITEM_EDIT
+Command20=ID_ITEM_DELETE
+Command21=ID_ITEM_ACTIVATE
+Command22=ID_ITEM_DISABLE
+Command23=ID_ITEM_SHOWDATA
+Command24=ID_ITEM_GRAPH
+Command25=ID_POLICY_INSERTRULE_ABOVE
+Command26=ID_POLICY_INSERTRULE_BELOW
+Command27=ID_POLICY_INSERTRULE_TOP
+Command28=ID_POLICY_INSERTRULE_BOTTOM
+Command29=ID_POLICY_DELETERULE
+Command30=ID_POLICY_ENABLERULE
+Command31=ID_POLICY_DISABLERULE
+Command32=ID_POLICY_ADD
+Command33=ID_POLICY_DELETE
+Command34=ID_POLICY_NEGATECELL
+Command35=ID_POLICY_INSERTRULE_ABOVE
+Command36=ID_POLICY_INSERTRULE_BELOW
+Command37=ID_POLICY_INSERTRULE_TOP
+Command38=ID_POLICY_INSERTRULE_BOTTOM
+Command39=ID_POLICY_DELETERULE
+Command40=ID_POLICY_ENABLERULE
+Command41=ID_POLICY_DISABLERULE
+Command42=ID_POLICY_EDIT
+Command43=ID_POLICY_INSERTRULE_ABOVE
+Command44=ID_POLICY_INSERTRULE_BELOW
+Command45=ID_POLICY_INSERTRULE_TOP
+Command46=ID_POLICY_INSERTRULE_BOTTOM
+Command47=ID_POLICY_DELETERULE
+Command48=ID_POLICY_ENABLERULE
+Command49=ID_POLICY_DISABLERULE
+Command50=ID_ALARM_ACKNOWLEGE
+Command51=ID_ALARM_DELETE
+Command52=ID_ALARM_GOTOSOURCE
+Command53=ID_ACTION_NEW
+Command54=ID_ACTION_RENAME
+Command55=ID_ACTION_DELETE
+Command56=ID_ACTION_PROPERTIES
+Command57=ID_POLL_RESTART
+CommandCount=57
 
 [MNU:IDM_CONTEXT (English (U.S.))]
 Type=1
@@ -1361,26 +1371,28 @@ VirtualFilter=dWC
 [DLG:IDD_DCI_COLLECTION]
 Type=1
 Class=CDCIPropPage
-ControlCount=19
-Control1=IDC_EDIT_NAME,edit,1350631552
-Control2=IDC_BUTTON_SELECT,button,1342242816
-Control3=IDC_COMBO_ORIGIN,combobox,1344339971
-Control4=IDC_COMBO_DT,combobox,1344339971
-Control5=IDC_EDIT_INTERVAL,edit,1350639744
-Control6=IDC_EDIT_RETENTION,edit,1350639744
-Control7=IDC_RADIO_ACTIVE,button,1342373897
-Control8=IDC_RADIO_DISABLED,button,1342242825
-Control9=IDC_RADIO_NOT_SUPPORTED,button,1342242825
-Control10=IDC_STATIC,button,1342177287
+ControlCount=21
+Control1=IDC_EDIT_DESCRIPTION,edit,1350631552
+Control2=IDC_EDIT_NAME,edit,1350631552
+Control3=IDC_BUTTON_SELECT,button,1342242816
+Control4=IDC_COMBO_ORIGIN,combobox,1344339971
+Control5=IDC_COMBO_DT,combobox,1344339971
+Control6=IDC_EDIT_INTERVAL,edit,1350639744
+Control7=IDC_EDIT_RETENTION,edit,1350639744
+Control8=IDC_RADIO_ACTIVE,button,1342373897
+Control9=IDC_RADIO_DISABLED,button,1342242825
+Control10=IDC_RADIO_NOT_SUPPORTED,button,1342242825
 Control11=IDC_STATIC,button,1342177287
-Control12=IDC_STATIC,static,1342308352
+Control12=IDC_STATIC,button,1342177287
 Control13=IDC_STATIC,static,1342308352
 Control14=IDC_STATIC,static,1342308352
 Control15=IDC_STATIC,static,1342308352
-Control16=IDC_STATIC,button,1342177287
-Control17=IDC_STATIC,static,1342308352
+Control16=IDC_STATIC,static,1342308352
+Control17=IDC_STATIC,button,1342177287
 Control18=IDC_STATIC,static,1342308352
 Control19=IDC_STATIC,static,1342308352
+Control20=IDC_STATIC,static,1342308352
+Control21=IDC_STATIC,button,1342177287
 
 [CLS:CDCIDataView]
 Type=0
@@ -1497,7 +1509,7 @@ LastObject=CThresholdDlg
 [DLG:IDD_THRESHOLD]
 Type=1
 Class=CThresholdDlg
-ControlCount=11
+ControlCount=16
 Control1=IDC_COMBO_FUNCTION,combobox,1344339971
 Control2=IDC_EDIT_ARG1,edit,1350639744
 Control3=IDC_COMBO_OPERATION,combobox,1344339971
@@ -1509,6 +1521,11 @@ Control8=IDC_STATIC_COMPARE,static,1342308352
 Control9=IDC_STATIC,static,1342308352
 Control10=IDC_STATIC_FOR,static,1342308352
 Control11=IDC_STATIC_SAMPLES,static,1342308352
+Control12=IDC_STATIC,button,1342177287
+Control13=IDC_STATIC,button,1342177287
+Control14=IDC_STATIC,static,1342308352
+Control15=IDC_EDIT_EVENT,edit,1350633600
+Control16=IDC_BUTTON_SELECT,button,1342242816
 
 [DLG:IDD_MIB_BROWSER]
 Type=1
@@ -2105,3 +2122,21 @@ Filter=D
 VirtualFilter=dWC
 LastObject=CPollNodeDlg
 
+[DLG:IDD_DCI_TRANSFORM]
+Type=1
+Class=CDCITransformPage
+ControlCount=5
+Control1=IDC_STATIC,static,1342308352
+Control2=IDC_COMBO_DELTA,combobox,1344339971
+Control3=IDC_STATIC,static,1342308352
+Control4=IDC_EDIT_FORMULA,edit,1350631552
+Control5=IDC_BUTTON_CREATE,button,1342242816
+
+[CLS:CNodePoller]
+Type=0
+HeaderFile=NodePoller.h
+ImplementationFile=NodePoller.cpp
+BaseClass=CMDIChildWnd
+Filter=W
+VirtualFilter=mfWC
+