Move stap_system for bminstall into its own function

*tapset-method.cxx: move the duplicate code into its own function

diff --git a/tapset-method.cxx b/tapset-method.cxx
index b7b7cb0963f2f2f235c6b276f9fce198ed1a99f1..6c7c52a7f8ab5305c164e877f4748c398d827442 100644 (file)
--- a/tapset-method.cxx
+++ b/tapset-method.cxx
@@ -59,6 +59,8 @@ public:
   bool get_param (std::map<std::string, literal*> const & params,
                  const std::string& key,
                  std::string& value);
+  void bminstall (systemtap_session & sess,
+                std::string java_proc);
 
 };
 
@@ -87,6 +89,22 @@ java_builder::get_param (std::map<std::string, literal*> const & params,
   return true;
 }
 
+void
+java_builder::bminstall (systemtap_session & sess, std::string java_proc)
+{
+  std::vector<std::string> bminstall_cmd;
+  bminstall_cmd.push_back(sess.bminstall_path);
+  bminstall_cmd.push_back(java_proc);
+  int ret = stap_system(sess.verbose, bminstall_cmd);
+  if (sess.verbose > 2)
+    {
+      if (ret)
+       clog << _F("WARNING: stap_system for bminstall.sh returned error: %d", ret) << endl;
+      else
+       clog << _F("stap_system for bminstall.sh returned: %d", ret) << endl;
+    }
+}
+
 void
 java_builder::build (systemtap_session & sess,
                     probe * base,
@@ -246,33 +264,13 @@ java_builder::build (systemtap_session & sess,
          else if ((*it != _java_pid) && ++it == sess.java_pid.end())
            {
              sess.java_pid.push_back(_java_pid);
-             vector<string> bminstall_cmd;
-             bminstall_cmd.push_back(sess.bminstall_path);
-             bminstall_cmd.push_back(java_pid_str);
-             int ret = stap_system(sess.verbose, bminstall_cmd);
-             if (sess.verbose > 2)
-               {
-                 if (ret)
-                   clog << _F("WARNING: stap_system for bminstall.sh returned error: %d", ret) << endl;
-                 else
-                   clog << _F("stap_system for bminstall.sh returned: %d", ret) << endl;
-               }
+             bminstall(sess, java_pid_str);
            }
        }
       if (sess.java_pid.size() == 0)
        {
          sess.java_pid.push_back(_java_pid);
-         vector<string> bminstall_cmd;
-         bminstall_cmd.push_back(sess.bminstall_path);
-         bminstall_cmd.push_back(java_pid_str);
-         int ret = stap_system(sess.verbose, bminstall_cmd);
-         if (sess.verbose > 2)
-           {
-             if (ret)
-               clog << _F("WARNING: stap_system for bminstall.sh returned error: %d", ret) << endl;
-             else
-               clog << _F("stap_system for bminstall.sh returned: %d", ret) << endl;
-           }
+         bminstall(sess, java_pid_str);
        }
     }
   else
@@ -284,33 +282,13 @@ java_builder::build (systemtap_session & sess,
          else if ((*is != _java_proc_class) && (++is == sess.java_proc_class.end()))
            {
              sess.java_proc_class.push_back(_java_proc_class);
-             vector<string> bminstall_cmd;
-             bminstall_cmd.push_back(sess.bminstall_path);
-             bminstall_cmd.push_back(_java_proc_class);
-             int ret = stap_system(sess.verbose, bminstall_cmd);
-             if (sess.verbose > 2)
-               {
-                 if (ret)
-                   clog << _F("WARNING: stap_system for bminstall.sh returned error: %d", ret) << endl;
-                 else
-                   clog << _F("stap_system for bminstall.sh returned: %d", ret) << endl;
-               }
+             bminstall(sess, _java_proc_class);
            }
        }
       if (sess.java_proc_class.size() == 0)
        {
          sess.java_proc_class.push_back(_java_proc_class);
-         vector<string> bminstall_cmd;
-         bminstall_cmd.push_back(sess.bminstall_path);
-         bminstall_cmd.push_back(_java_proc_class);
-         int ret = stap_system(sess.verbose, bminstall_cmd);
-         if (sess.verbose > 2)
-           {
-             if (ret)
-               clog << _F("WARNING: stap_system for bminstall.sh returned error: %d", ret) << endl;
-             else
-               clog << _F("stap_system for bminstall.sh returned: %d", ret) << endl;
-           }
+         bminstall(sess, _java_proc_class);
        }
     }
   vector<string> bmsubmit_cmd;