Merge branch 'master' of https://github.com/celestinechen/fio

[fio.git] / fio.c

diff --git a/fio.c b/fio.c
index 44354e289ee873dc52eeffca2385ee76a1d5db85..3d6ce59703743c9d2313045162a2a0e3b2e20d80 100644 (file)
--- a/fio.c
+++ b/fio.c
@@ -18,15 +18,10 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
  */
-#include <unistd.h>
-#include <locale.h>
-#include <time.h>
-
 #include "fio.h"
-#include "smalloc.h"
 
 int main(int argc, char *argv[], char *envp[])
 {
@@ -43,7 +38,7 @@ int main(int argc, char *argv[], char *envp[])
                goto done;
 
        if (parse_options(argc, argv))
-               goto done;
+               goto done_key;
 
        /*
         * line buffer stdout to avoid output lines from multiple
@@ -57,11 +52,13 @@ int main(int argc, char *argv[], char *envp[])
                set_genesis_time();
 
                if (fio_start_all_clients())
-                       goto done;
+                       goto done_key;
                ret = fio_handle_clients(&fio_client_ops);
        } else
                ret = fio_backend(NULL);
 
+done_key:
+       fio_server_destroy_sk_key();
 done:
        deinitialize_fio();
        return ret;