Changeset 15452

Timestamp:

2013-03-04T00:41:45+01:00 (11 years ago)

Author:

adeas31

Message:

• Use the QHash with QList for OMC commands hashing instead of filling up the Heap.

Location:

branches/OMEdit/OMEditGUI

Files:

• OMC/OMCCommandsCache.cpp (deleted)
• OMC/OMCCommandsCache.h (deleted)
• OMC/OMCProxy.cpp (modified) (2 diffs)
• OMC/OMCProxy.h (modified) (1 diff)
• OMEditGUI.pro (modified) (2 diffs)

branches/OMEdit/OMEditGUI/OMC/OMCProxy.cpp

@@ -42 +42 @@
 #include "OMCProxy.h"
 #include "../../../Compiler/runtime/config.h"
+
+/*!
+  \class OMCCommandsCache
+  \brief Stores the list of cached OMC classes.
+  */
+/*!
+  \param pParent - pointer to QObject
+  */
+OMCCommandsCache::OMCCommandsCache(QObject *pParent)
+  : QObject(pParent)
+{
+
+}
+
+/*!
+  Returns the cached OMC command from the hash.
+  \param className - the name of the class to search for.
+  \param command - the command to search for.
+  \return the OMC command
+  */
+OMCCommand OMCCommandsCache::getOMCCommand(QString className, QString command)
+{
+  if (mOMCCommandsHash.contains(className))
+  {
+    QList<OMCCommand> commandsList = mOMCCommandsHash.value(className);
+    foreach (OMCCommand omcCommand, commandsList)
+    {
+      if (omcCommand.mOMCCommand.compare(command) == 0)
+        return omcCommand;
+    }
+  }
+  return OMCCommand();
+}
+
+/*!
+  Adds the OMC class name to the hash of cached classes.
+  \param className - the name of the class.
+  \param command - the command.
+  \param commandResult - the command result
+  */
+void OMCCommandsCache::addOMCCommand(QString className, QString command, QString commandResult)
+{
+  /* if the className is already in commands hash */
+  if (mOMCCommandsHash.contains(className))
+  {
+    QList<OMCCommand> commandsList = mOMCCommandsHash.value(className);
+    /* if the commands list doesn't contain the command then add it */
+    bool found = false;
+    foreach (OMCCommand omcCommand, commandsList)
+    {
+      if (omcCommand.mOMCCommand.compare(command) == 0)
+      {
+        found = true;
+        break;
+      }
+    }
+    if (!found)
+    {
+      OMCCommand omcCommand;
+      omcCommand.mOMCCommand = command;
+      omcCommand.mOMCCommandResult = commandResult;
+      commandsList.append(omcCommand);
+      mOMCCommandsHash.insert(className, commandsList);
+    }
+  }
+  else
+  {
+    QList<OMCCommand> commandsList;
+    OMCCommand omcCommand;
+    omcCommand.mOMCCommand = command;
+    omcCommand.mOMCCommandResult = commandResult;
+    commandsList.append(omcCommand);
+    mOMCCommandsHash.insert(className, commandsList);
+  }
+}
 
 /*!
@@ -333 +408 @@
     }
   /* if OMC command is find in the cached OMC commands then use it and return. */
-  OMCCommand *pOMCCommand = mpOMCCommandsCache->getOMCCommand(className, expression);
-  if (pOMCCommand)
-  {
-    setResult(pOMCCommand->getOMCCommandResult());
+  OMCCommand pOMCCommand = mpOMCCommandsCache->getOMCCommand(className, expression);
+  if (!pOMCCommand.mOMCCommandResult.isEmpty())
+  {
+    setResult(pOMCCommand.mOMCCommandResult);
     // write command to the commands log.
     QTime commandTime;

branches/OMEdit/OMEditGUI/OMC/OMCProxy.h

@@ -51 +51 @@
 class StringHandler;
 class OMCCommandsCache;
+
+struct OMCCommand
+{
+  QString mOMCCommand;
+  QString mOMCCommandResult;
+};
+
+class OMCCommandsCache : public QObject
+{
+  Q_OBJECT
+public:
+  OMCCommandsCache(QObject *pParent);
+  OMCCommand getOMCCommand(QString className, QString command);
+  void addOMCCommand(QString className, QString command, QString commandResult);
+private:
+  QHash<QString, QList<OMCCommand> > mOMCCommandsHash;
+};
 
 class OMCProxy : public QObject

branches/OMEdit/OMEditGUI/OMEditGUI.pro

@@ -61 +61 @@
     omc_communication.cc \
     OMC/OMCProxy.cpp \
-    OMC/OMCCommandsCache.cpp \
     Util/StringHandler.cpp \
     GUI/Widgets/MessagesWidget.cpp \
@@ -92 +91 @@
     omc_communication.h \
     OMC/OMCProxy.h \
-    OMC/OMCCommandsCache.h \
     Util/StringHandler.h \
     GUI/Widgets/MessagesWidget.h \