CommServer.DA.Server - create installation package - working on ProtocolHub.MonitorInterface - refactoring

- fixed compilation errors after namespace modification
- fixed wrong listener type declamation 
Issue #: 4862

Author: Mariusz

CommServer.ProtocolHub.sln

@@ -3,6 +3,9 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 VisualStudioVersion = 14.0.25420.1
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{2174EF99-7D4B-45EE-87F7-D5912F3DFB5D}"
+	ProjectSection(SolutionItems) = preProject
+		..\..\..\svn.CommServer.DA\CommServer.DA.Server\CommServer.DA.Server\Server.NETServerUnitTest\app.config = ..\..\..\svn.CommServer.DA\CommServer.DA.Server\CommServer.DA.Server\Server.NETServerUnitTest\app.config
+	EndProjectSection
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "T4Definitions", "..\PR39-CommonResources\T4Definitions\T4Definitions.csproj", "{D506423B-BA21-49E6-8C3B-88A771CA444E}"
 EndProject

ProtocolHub.Communication/BaseStation/Channel.cs

@@ -14,6 +14,7 @@
 //_______________________________________________________________
 
 using CAS.CommServer.ProtocolHub.Communication.LicenseControl;
+using CAS.CommServer.ProtocolHub.MonitorInterface;
 using CAS.Lib.CommonBus;
 using CAS.Lib.CommonBus.ApplicationLayer;
 using CAS.Lib.CommonBus.Management;
@@ -24,19 +25,13 @@
 using System.Collections;
 using System.ComponentModel;
 using System.Xml;
-using Statistics = global::BaseStation.Management.Statistics;
 
 namespace CAS.CommServer.ProtocolHub.Communication.BaseStation
 {
   /// <summary>
   /// Channel implementation
   /// </summary>
-#if COMMSERVER
   internal class Channel : HandlerWaitTimeList<SegmentStateMachine>
-#endif
-#if SNIFFER
-  internal class Channel
-#endif
   {
 
     #region private
@@ -96,19 +91,8 @@ private IApplicationLayerMaster CreateApplicationProtocol(ComunicationNet.Protoc
       }
       return null;
     }
-#if SNIFFER
-    private Segment mySegment;
-    private void Scanner() 
-    {
-      lock(this) 
-      {
-        mySegment.SwitchOn();
-      }
-    }//Scanner
-#endif
-#if COMMSERVER
     private SegmentStateMachine CurrSegment = null;
-    #region HandlerWaitTimeList implementation
+    #region 
     public override void NewOvertimeCoefficient(long min, long max, long avr)
     {
       //      base.NewOvertimeCoefficient (min, max, avr);
@@ -123,52 +107,24 @@ protected override void Handler(SegmentStateMachine myDsc)
       CurrSegment.ConnectRequest();
     }//Scanner
     #endregion
-#endif
+
     #region creator
-#if COMMSERVER
     private Channel(ComunicationNet.ChannelsRow myCDsc, CommServerComponent parent, bool demoVersion)
       : base(false, "ChannelSegTOL_" + myCDsc.Name)
     {
       CommServerComponent.Tracer.TraceVerbose(150, m_src, "Creating channel: " + myCDsc.Name);
       Multichannel.NextChannnel();
       myStatistics = new Statistics.ChannelStatistics(myCDsc);
-#endif
-      #region Sniffer
-#if SNIFFER
-    private Channel(NetworkConfig.ComunicationNet.ChannelsRow myCDsc) 
-    {
-#endif
-      #endregion Sniffer
       PluginCollection m_Plugins = new PluginCollection(parent.m_CommonBusControl);
       foreach (ComunicationNet.ProtocolRow proto in myCDsc.GetProtocolRows())
       {
-        #region SNIFFER
-#if SNIFFER
-        try
-        {
-          //*******************************************************
-          //tutaj kreowanie odpowiedniego protokolu nasluchujacego
-          //*******************************************************
-          ApplicationLayer.IApplicationLayerSniffer chnProtocol = (ApplicationLayer.IApplicationLayerSniffer)
-            NetworkConfig.ApplicationProtocol.CreateApplicationProtocol(typeof(IApplicationLayerPluginHelperSniffer), proto);
-          mySegment = new Segment(chnProtocol);
-          //*******************************************************
-          //tutaj start scannera dla channela i segmentu w bussnifferze
-          //*******************************************************
-          Processes.Manager.StartProcess
-            (new System.Threading.ThreadStart(Scanner), "ChScanner" + myCDsc.Name, true);
-        }
-        catch ( NetworkConfig.InterfaceNotImplementedException ) { } //(Assertion) {}
-#endif
-        #endregion
-#if COMMSERVER
         IApplicationLayerMaster chnProtocol = CreateApplicationProtocol(proto, parent, m_Plugins);
         if (chnProtocol != null)
         {
           foreach (ComunicationNet.SegmentsRow currDSC in proto.GetSegmentsRows())
           {
             SegmentParameters parameters = new SegmentParameters(currDSC);
-            Diagnostic.Segment segmentStatistic = new Diagnostic.Segment(currDSC, myStatistics);
+            Diagnostic.Segment segmentStatistic = new Diagnostic.Segment(currDSC,  myStatistics);
             Segment segment = new Segment
               (currDSC, (byte)proto.MaxNumberOfRetries, chnProtocol, parameters, demoVersion, segmentStatistic, this);
             segment.Cycle = parameters.TimeReconnect;
@@ -180,11 +136,11 @@ private Channel(NetworkConfig.ComunicationNet.ChannelsRow myCDsc)
           string name = proto != null ? proto.Name : "---not set---";
           CommServerComponent.Tracer.TraceWarning(199, m_src, "Cannot find component implementing the required protocol: " + name);
         }
-#endif
       }//foreach (NetworkConfig.ComunicationNet.ProtocolRow proto in myCDsc.GetProtocolRows)
       CommServerComponent.Tracer.TraceVerbose(203, m_src, "Channel: " + myCDsc.Name + " has been created.");
     }//Channel
     #endregion
+
     #endregion
 
     #region API
@@ -198,7 +154,7 @@ internal static void InitializeChannels(ComunicationNet.ChannelsDataTable channe
         }
         catch (LicenseException ex)
         {
-          string msg = "Cannot create channel {0} becaose of {1}";
+          string msg = "Cannot create channel {0} because of {1}";
           CommServerComponent.Tracer.TraceVerbose(220, m_src, string.Format(msg, currRow.Name, ex.Message));
         }
     }

ProtocolHub.Communication/BaseStation/ConsoleIterface.cs

@@ -6,32 +6,30 @@
 //  $LastChangedBy$
 //  $URL$
 //  $Id$
-//  History :
-//    MZbrzezny 2006-03-01: created
 //
 //  Copyright (C)2006, CAS LODZ POLAND.
 //  TEL: +48 (42) 686 25 47
 //  mailto:techsupp@cas.eu
 //  http://www.cas.eu
 //</summary>
 
-using BaseStation.Management;
 using CAS.CommServer.ProtocolHub.Communication.Properties;
+using CAS.CommServer.ProtocolHub.MonitorInterface;
 using CAS.Lib.RTLib.Management;
 using CAS.Lib.RTLib.Processes;
 using System;
 using System.Collections.Generic;
 using System.Runtime.Remoting;
 using System.Runtime.Remoting.Channels;
 using System.Runtime.Remoting.Channels.Tcp;
-using Statistics = BaseStation.Management.Statistics;
+using static CAS.CommServer.ProtocolHub.MonitorInterface.Statistics.InterfaceStatistics;
 
 namespace CAS.CommServer.ProtocolHub.Communication.BaseStation
 {
   /// <summary>
   /// Summary description for ConsoleIterface.
   /// </summary>
-  public class ConsoleIterface : global::BaseStation.ConsoleIterfaceAbstract
+  public class ConsoleIterface : ConsoleInterfaceAbstract
   {
     private class StatisticAndIUpdatePair<StatT>
     {
@@ -145,7 +143,7 @@ public override SortedList<long, int> GetStationStates()
     /// </summary>
     /// <param name="index">The index.</param>
     /// <returns>selected (by index) interface</returns>
-    public override Statistics.InterfaceStatistics.InterfaceStatisticsInternal GetInterface(ulong index)
+    public override InterfaceStatisticsInternal GetInterface(ulong index)
     {
       Statistics.InterfaceStatistics.InterfaceStatisticsInternal Interface =
        interfacelistpairs[index].GetStatisticsObjectUpdated();

ProtocolHub.Communication/BaseStation/DataBlock.cs

@@ -76,11 +76,7 @@ protected Tag[] createdTags
     #endregion //IBlockDescription
 
     #region PUBLIC
-#if OPCCLIENT
-		internal abstract class Tag: OPC.OPC_Interface.OPC_Interface_Tag
-#elif COMMSERVER
     internal abstract class Tag : Device.TagInDevice
-#endif
     {
 
       #region PRIVATE
@@ -168,37 +164,15 @@ internal static System.Type GetDataTypeFromConfig(ComunicationNet.TagsRow myDSC)
         else
           return typeof(object);
       }
-#if OPCCLIENT
-			internal override bool 
-#elif COMMSERVER
-      public override void
-#endif
- UpdateTag(object Val)
+      public override void UpdateTag(object Val)
       {
-#if OPCCLIENT
-	if ( ! base.UpdateTag(Val) ) return false;
-#elif COMMSERVER
         base.UpdateTag(Val);
-#endif
         CheckTagAlarm(Val);
-#if OPCCLIENT
-				return true;
-#endif
       }
-#if OPCCLIENT
-			internal
-#elif COMMSERVER
-      public override
-#endif
- bool GetVal(ref object Val)
+      public override bool GetVal(ref object Val)
       {
-#if OPCCLIENT
-				Val=base.Value.Value;
-				if(base.Value.Quality.QualityBits != Opc.Da.qualityBits.good)return false;
-#elif COMMSERVER
         if (!base.GetVal(ref Val))
           return false;
-#endif
         CheckTagAlarm(Val);
         return true;
       }
@@ -207,18 +181,8 @@ bool GetVal(ref object Val)
       /// </summary>
       /// <param name="myDSC">params from Tags table</param>
       /// <param name="myStation">pointer to interface that allow to change priority of the station</param>
-#if OPCCLIENT
-			internal Tag
-				( BaseStation.Management.Tag myDSC, IStationState myStation )
-				:base(myDSC,//myDSC.Name,  
-				null, // MPTD raczej empy wariant
-				Opc.Da.qualityBits.badNotConnected, 
-				myDSC.Writeable ,null,"") //MZTD: - dodac opisy dla tagow i ew. path
-#elif COMMSERVER
-      internal Tag
-          (ComunicationNet.TagsRow myDSC, IStationState myStation)
+      internal Tag(ComunicationNet.TagsRow myDSC, IStationState myStation)
           : base(myDSC.Name, null, Opc.Da.qualityBits.badNotConnected, (ItemAccessRights)myDSC.AccessRights, GetDataTypeFromConfig(myDSC))
-#endif
       {
         switch ((StateTrigger)myDSC.StateTrigger)
         {
@@ -233,21 +197,20 @@ internal Tag
         }
         stateMask = (int)myDSC.StateMask;
         this.myStation = myStation;
-#if COMMSERVER
         this.EuType = Opc.Da.euType.noEnum;
         ItemPropertyCollection itemPropertyCollection = new ItemPropertyCollection();
         foreach (ComunicationNet.ItemPropertiesTableRow row_property in myDSC.GetItemPropertiesTableRows())
         {
           try
           {
-            Opc.Da.PropertyDescription prop_dsc =
-                Opc.Da.PropertyDescription.Find(
-                new Opc.Da.PropertyID(
+            PropertyDescription prop_dsc =
+                PropertyDescription.Find(
+                new PropertyID(
                     new XmlQualifiedName(row_property.ID_Name_Name, row_property.ID_Name_Namespace)
                     ));
-            Opc.Da.ItemProperty itemprop = new Opc.Da.ItemProperty();
-            itemprop.ID = prop_dsc.ID;
-            itemprop.Value = row_property.Value;
+            ItemProperty _itemProperty = new ItemProperty();
+            _itemProperty.ID = prop_dsc.ID;
+            _itemProperty.Value = row_property.Value;
             if (prop_dsc.ID != Opc.Da.Property.DATATYPE) //this property is managed differently 
                                                          // as GetDataTypeFromConfig( myDSC ) 
                                                          // at the constructor
@@ -264,24 +227,24 @@ internal Tag
                 // this property contains double value
                 double prop_value = 0;
                 if (double.TryParse(row_property.Value, out prop_value))
-                  itemprop.Value = prop_value;
+                  _itemProperty.Value = prop_value;
               }
               if (prop_dsc.ID == Opc.Da.Property.EUTYPE)
               {
-                itemprop.Value = Opc.Da.euType.noEnum;
+                _itemProperty.Value = Opc.Da.euType.noEnum;
                 // this property contains vale from enum: Opc.Da.euType
                 foreach (Opc.Da.euType NEWeuType in Enum.GetValues(typeof(Opc.Da.euType)))
                 {
                   if (NEWeuType.ToString() == row_property.Value)
-                    itemprop.Value = NEWeuType;
+                    _itemProperty.Value = NEWeuType;
                 }
               }
               if (prop_dsc.ID == Opc.Da.Property.EUINFO)
               {
-                //I assume that this is table of strings splited by ;
-                itemprop.Value = row_property.Value.Split(';');
+                //I assume that this is table of strings spited by ;
+                _itemProperty.Value = row_property.Value.Split(';');
               }
-              itemPropertyCollection.Add(itemprop);
+              itemPropertyCollection.Add(_itemProperty);
             }
           }
           catch (Exception ex)
@@ -301,20 +264,11 @@ internal Tag
           "Problem with many properties for item : " + myDSC.Name + ": " +
             TraceEvent.GetMessageWithExceptionNameFromExceptionIncludingInnerException(ex));
         }
-#endif
       }
       #endregion PUBLIC
 
     }//Tag
 
-#if OPCCLIENT
-		internal virtual bool UpdateAllTags(ReadValue val)
-		{
-			for (ushort idx = 0; (idx < mylength); idx++) 
-				if ( ! tagHendlers[idx].UpdateTag( val[idx]) ) return false;
-			return true;
-		}
-#elif COMMSERVER
     internal virtual void UpdateAllTags(IReadValue val)
     {
       for (ushort idx = 0; (idx < mylength); idx++)
@@ -331,7 +285,6 @@ internal virtual void UpdateAllTags(IReadValue val)
         }
       }
     }
-#endif
 
     /// <summary>
     /// Initializes a new instance of the <see cref="DataBlock"/> class.
@@ -358,7 +311,7 @@ internal DataBlock(ComunicationNet.DataBlocksRow myRow, IDataWrite myWriteInt, I
     /// </returns>
     public override string ToString()
     {
-      return String.Format("{0}: startaddress={1}; datatype={2}; length={3};", base.ToString(),
+      return String.Format("{0}: start address={1}; data type={2}; length={3};", base.ToString(),
         myStartAddress, myDataType, mylength);
     }
     #endregion PUBLIC

ProtocolHub.Communication/BaseStation/Interface.cs

@@ -13,11 +13,10 @@
 //  http://www.cas.eu
 //_______________________________________________________________
 
+using CAS.CommServer.ProtocolHub.MonitorInterface;
 using CAS.Lib.CommonBus.ApplicationLayer;
-using CAS.Lib.CommServerConsoleInterface;
 using CAS.Lib.RTLib.Processes;
 using CAS.NetworkConfigLib;
-using Statistics = global::BaseStation.Management.Statistics;
 
 namespace CAS.CommServer.ProtocolHub.Communication.BaseStation
 {

ProtocolHub.Communication/BaseStation/Pipe.cs

@@ -14,8 +14,8 @@
 //_______________________________________________________________
 
 using CAS.CommServer.ProtocolHub.Communication.LicenseControl;
+using CAS.CommServer.ProtocolHub.MonitorInterface;
 using CAS.Lib.CommonBus.ApplicationLayer;
-using CAS.Lib.CommServerConsoleInterface;
 using CAS.Lib.RTLib.Processes;
 using CAS.NetworkConfigLib;
 using System;

ProtocolHub.Communication/BaseStation/Segment.cs

@@ -155,8 +155,8 @@ internal Segment(IApplicationLayerSniffer protocol)
 //_______________________________________________________________
 
 using CAS.CommServer.ProtocolHub.Communication.LicenseControl;
+using CAS.CommServer.ProtocolHub.MonitorInterface;
 using CAS.Lib.CommonBus.ApplicationLayer;
-using CAS.Lib.CommServerConsoleInterface;
 using CAS.Lib.RTLib.Processes;
 using CAS.NetworkConfigLib;
 using System;
@@ -287,9 +287,11 @@ internal SegmentWaitTimeList(Segment parent, InterfacesRowDSC[] interfacesList,
       }
       #endregion
     }//SegmentWaitTimeList
+
     private ISegmentStatistics myStatistics;
     private SegmentWaitTimeList dataQueue;
     private void PickUpHandler() { }
+
     #endregion
 
     #region creator