1
0
mirror of https://github.com/mainflux/mainflux.git synced 2025-04-27 13:48:49 +08:00

174 lines
3.6 KiB
Go
Raw Normal View History

// Copyright (c) Mainflux
// SPDX-License-Identifier: Apache-2.0
package bench
import (
NOISSUE - Simplify MQTT benchmarking tool (#852) * Fix user creation Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Extract client creation to separate method Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Remove message generating in separate goroutine Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Remove runSub and runPub methods Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Refactor benchmark code Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Fix typos Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Update client message handling Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Fix microseconds typo Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Simplify client Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Don't take zero-messages clients int count Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Fix token timeout condition Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Add timeout for publisher Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Update Paho lib version Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Temporary drop SenML and subscribe support Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Calculate payload size Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Remove templates Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com>
2019-09-25 19:02:29 +02:00
"crypto/rand"
"crypto/tls"
NOISSUE - Add measuring time from pub to sub (#839) * refactor code Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com> * connect each thing with each channel Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com> * reverting - structure fields must be exported Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com> * reverting - structure fields must be exported Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com> * revert some names Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com> * move meausuring time start Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com> * add pub-to-sub delivery time measure Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com> * add pub-to-sub delivery time measure Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com> * add pub-to-sub delivery time measure Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com> * add pub-to-sub delivery time measure Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com> * improve sync between pub and sub Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com> * improve sync between pub and sub Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com> * improve sync between pub and sub Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com> * improve sync between pub and sub Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com> * improve sync between pub and sub Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com> * improve sync between pub and sub Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com> * add random payload Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com> * revert changes for config.toml Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com> * add random payload Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com> * remove printfs Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com> * add logging Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com> * add payload Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com> * add payload Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com> * rename variable Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com> * add payload Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com> * small changes Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com> * refactor sync Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com> * refactor sync Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com> * refactor results Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com> * change sync and result collecting for sub Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com> * fix comments Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com>
2019-09-06 12:59:35 +00:00
"encoding/json"
"fmt"
"io/ioutil"
"log"
"os"
"strconv"
"time"
"github.com/pelletier/go-toml"
)
NOISSUE - Simplify MQTT benchmarking tool (#852) * Fix user creation Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Extract client creation to separate method Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Remove message generating in separate goroutine Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Remove runSub and runPub methods Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Refactor benchmark code Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Fix typos Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Update client message handling Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Fix microseconds typo Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Simplify client Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Don't take zero-messages clients int count Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Fix token timeout condition Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Add timeout for publisher Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Update Paho lib version Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Temporary drop SenML and subscribe support Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Calculate payload size Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Remove templates Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com>
2019-09-25 19:02:29 +02:00
// Benchmark - main benchmarking function
func Benchmark(cfg Config) {
checkConnection(cfg.MQTT.Broker.URL, 1)
NOISSUE - Simplify MQTT benchmarking tool (#852) * Fix user creation Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Extract client creation to separate method Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Remove message generating in separate goroutine Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Remove runSub and runPub methods Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Refactor benchmark code Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Fix typos Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Update client message handling Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Fix microseconds typo Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Simplify client Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Don't take zero-messages clients int count Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Fix token timeout condition Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Add timeout for publisher Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Update Paho lib version Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Temporary drop SenML and subscribe support Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Calculate payload size Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Remove templates Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com>
2019-09-25 19:02:29 +02:00
var err error
subsResults := map[string](*[]float64){}
var caByte []byte
if cfg.MQTT.TLS.MTLS {
caFile, err := os.Open(cfg.MQTT.TLS.CA)
defer caFile.Close()
if err != nil {
fmt.Println(err)
}
caByte, _ = ioutil.ReadAll(caFile)
}
data, err := ioutil.ReadFile(cfg.Mf.ConnFile)
if err != nil {
log.Fatalf("Error loading connections file: %s", err)
}
mf := mainflux{}
if err := toml.Unmarshal(data, &mf); err != nil {
NOISSUE - Simplify MQTT benchmarking tool (#852) * Fix user creation Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Extract client creation to separate method Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Remove message generating in separate goroutine Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Remove runSub and runPub methods Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Refactor benchmark code Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Fix typos Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Update client message handling Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Fix microseconds typo Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Simplify client Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Don't take zero-messages clients int count Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Fix token timeout condition Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Add timeout for publisher Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Update Paho lib version Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Temporary drop SenML and subscribe support Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Calculate payload size Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Remove templates Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com>
2019-09-25 19:02:29 +02:00
log.Fatalf("Cannot load Mainflux connections config %s \nUse tools/provision to create file", cfg.Mf.ConnFile)
}
resCh := make(chan *runResults)
NOISSUE - Add measuring time from pub to sub (#839) * refactor code Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com> * connect each thing with each channel Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com> * reverting - structure fields must be exported Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com> * reverting - structure fields must be exported Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com> * revert some names Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com> * move meausuring time start Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com> * add pub-to-sub delivery time measure Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com> * add pub-to-sub delivery time measure Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com> * add pub-to-sub delivery time measure Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com> * add pub-to-sub delivery time measure Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com> * improve sync between pub and sub Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com> * improve sync between pub and sub Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com> * improve sync between pub and sub Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com> * improve sync between pub and sub Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com> * improve sync between pub and sub Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com> * improve sync between pub and sub Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com> * add random payload Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com> * revert changes for config.toml Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com> * add random payload Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com> * remove printfs Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com> * add logging Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com> * add payload Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com> * add payload Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com> * rename variable Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com> * add payload Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com> * small changes Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com> * refactor sync Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com> * refactor sync Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com> * refactor results Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com> * change sync and result collecting for sub Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com> * fix comments Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com>
2019-09-06 12:59:35 +00:00
finishedPub := make(chan bool)
startStamp := time.Now()
n := len(mf.Channels)
var cert tls.Certificate
NOISSUE - Add measuring time from pub to sub (#839) * refactor code Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com> * connect each thing with each channel Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com> * reverting - structure fields must be exported Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com> * reverting - structure fields must be exported Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com> * revert some names Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com> * move meausuring time start Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com> * add pub-to-sub delivery time measure Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com> * add pub-to-sub delivery time measure Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com> * add pub-to-sub delivery time measure Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com> * add pub-to-sub delivery time measure Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com> * improve sync between pub and sub Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com> * improve sync between pub and sub Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com> * improve sync between pub and sub Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com> * improve sync between pub and sub Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com> * improve sync between pub and sub Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com> * improve sync between pub and sub Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com> * add random payload Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com> * revert changes for config.toml Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com> * add random payload Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com> * remove printfs Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com> * add logging Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com> * add payload Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com> * add payload Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com> * rename variable Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com> * add payload Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com> * small changes Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com> * refactor sync Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com> * refactor sync Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com> * refactor results Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com> * change sync and result collecting for sub Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com> * fix comments Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com>
2019-09-06 12:59:35 +00:00
start := time.Now()
NOISSUE - Simplify MQTT benchmarking tool (#852) * Fix user creation Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Extract client creation to separate method Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Remove message generating in separate goroutine Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Remove runSub and runPub methods Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Refactor benchmark code Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Fix typos Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Update client message handling Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Fix microseconds typo Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Simplify client Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Don't take zero-messages clients int count Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Fix token timeout condition Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Add timeout for publisher Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Update Paho lib version Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Temporary drop SenML and subscribe support Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Calculate payload size Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Remove templates Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com>
2019-09-25 19:02:29 +02:00
// Publishers
for i := 0; i < cfg.Test.Pubs; i++ {
NOISSUE - Add measuring time from pub to sub (#839) * refactor code Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com> * connect each thing with each channel Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com> * reverting - structure fields must be exported Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com> * reverting - structure fields must be exported Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com> * revert some names Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com> * move meausuring time start Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com> * add pub-to-sub delivery time measure Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com> * add pub-to-sub delivery time measure Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com> * add pub-to-sub delivery time measure Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com> * add pub-to-sub delivery time measure Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com> * improve sync between pub and sub Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com> * improve sync between pub and sub Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com> * improve sync between pub and sub Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com> * improve sync between pub and sub Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com> * improve sync between pub and sub Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com> * improve sync between pub and sub Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com> * add random payload Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com> * revert changes for config.toml Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com> * add random payload Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com> * remove printfs Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com> * add logging Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com> * add payload Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com> * add payload Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com> * rename variable Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com> * add payload Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com> * small changes Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com> * refactor sync Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com> * refactor sync Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com> * refactor results Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com> * change sync and result collecting for sub Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com> * fix comments Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com>
2019-09-06 12:59:35 +00:00
mfChan := mf.Channels[i%n]
mfThing := mf.Things[i%n]
if cfg.MQTT.TLS.MTLS {
cert, err = tls.X509KeyPair([]byte(mfThing.MTLSCert), []byte(mfThing.MTLSKey))
if err != nil {
log.Fatal(err)
}
}
NOISSUE - Simplify MQTT benchmarking tool (#852) * Fix user creation Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Extract client creation to separate method Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Remove message generating in separate goroutine Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Remove runSub and runPub methods Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Refactor benchmark code Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Fix typos Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Update client message handling Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Fix microseconds typo Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Simplify client Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Don't take zero-messages clients int count Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Fix token timeout condition Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Add timeout for publisher Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Update Paho lib version Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Temporary drop SenML and subscribe support Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Calculate payload size Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Remove templates Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com>
2019-09-25 19:02:29 +02:00
c, err := makeClient(i, cfg, mfChan, mfThing, startStamp, caByte, cert)
if err != nil {
log.Fatalf("Unable to create message payload %s", err.Error())
}
NOISSUE - Simplify MQTT benchmarking tool (#852) * Fix user creation Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Extract client creation to separate method Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Remove message generating in separate goroutine Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Remove runSub and runPub methods Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Refactor benchmark code Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Fix typos Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Update client message handling Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Fix microseconds typo Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Simplify client Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Don't take zero-messages clients int count Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Fix token timeout condition Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Add timeout for publisher Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Update Paho lib version Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Temporary drop SenML and subscribe support Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Calculate payload size Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Remove templates Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com>
2019-09-25 19:02:29 +02:00
go c.publish(resCh)
}
// Collect the results
var results []*runResults
if cfg.Test.Pubs > 0 {
results = make([]*runResults, cfg.Test.Pubs)
}
NOISSUE - Simplify MQTT benchmarking tool (#852) * Fix user creation Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Extract client creation to separate method Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Remove message generating in separate goroutine Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Remove runSub and runPub methods Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Refactor benchmark code Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Fix typos Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Update client message handling Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Fix microseconds typo Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Simplify client Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Don't take zero-messages clients int count Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Fix token timeout condition Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Add timeout for publisher Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Update Paho lib version Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Temporary drop SenML and subscribe support Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Calculate payload size Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Remove templates Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com>
2019-09-25 19:02:29 +02:00
// Wait for publishers to finish
NOISSUE - Add measuring time from pub to sub (#839) * refactor code Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com> * connect each thing with each channel Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com> * reverting - structure fields must be exported Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com> * reverting - structure fields must be exported Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com> * revert some names Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com> * move meausuring time start Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com> * add pub-to-sub delivery time measure Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com> * add pub-to-sub delivery time measure Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com> * add pub-to-sub delivery time measure Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com> * add pub-to-sub delivery time measure Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com> * improve sync between pub and sub Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com> * improve sync between pub and sub Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com> * improve sync between pub and sub Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com> * improve sync between pub and sub Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com> * improve sync between pub and sub Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com> * improve sync between pub and sub Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com> * add random payload Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com> * revert changes for config.toml Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com> * add random payload Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com> * remove printfs Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com> * add logging Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com> * add payload Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com> * add payload Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com> * rename variable Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com> * add payload Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com> * small changes Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com> * refactor sync Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com> * refactor sync Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com> * refactor results Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com> * change sync and result collecting for sub Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com> * fix comments Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com>
2019-09-06 12:59:35 +00:00
go func() {
for i := 0; i < cfg.Test.Pubs; i++ {
NOISSUE - Simplify MQTT benchmarking tool (#852) * Fix user creation Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Extract client creation to separate method Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Remove message generating in separate goroutine Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Remove runSub and runPub methods Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Refactor benchmark code Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Fix typos Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Update client message handling Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Fix microseconds typo Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Simplify client Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Don't take zero-messages clients int count Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Fix token timeout condition Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Add timeout for publisher Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Update Paho lib version Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Temporary drop SenML and subscribe support Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Calculate payload size Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Remove templates Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com>
2019-09-25 19:02:29 +02:00
results[i] = <-resCh
NOISSUE - Add measuring time from pub to sub (#839) * refactor code Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com> * connect each thing with each channel Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com> * reverting - structure fields must be exported Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com> * reverting - structure fields must be exported Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com> * revert some names Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com> * move meausuring time start Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com> * add pub-to-sub delivery time measure Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com> * add pub-to-sub delivery time measure Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com> * add pub-to-sub delivery time measure Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com> * add pub-to-sub delivery time measure Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com> * improve sync between pub and sub Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com> * improve sync between pub and sub Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com> * improve sync between pub and sub Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com> * improve sync between pub and sub Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com> * improve sync between pub and sub Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com> * improve sync between pub and sub Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com> * add random payload Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com> * revert changes for config.toml Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com> * add random payload Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com> * remove printfs Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com> * add logging Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com> * add payload Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com> * add payload Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com> * rename variable Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com> * add payload Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com> * small changes Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com> * refactor sync Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com> * refactor sync Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com> * refactor results Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com> * change sync and result collecting for sub Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com> * fix comments Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com>
2019-09-06 12:59:35 +00:00
}
finishedPub <- true
}()
<-finishedPub
totalTime := time.Since(start)
NOISSUE - Add measuring time from pub to sub (#839) * refactor code Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com> * connect each thing with each channel Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com> * reverting - structure fields must be exported Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com> * reverting - structure fields must be exported Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com> * revert some names Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com> * move meausuring time start Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com> * add pub-to-sub delivery time measure Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com> * add pub-to-sub delivery time measure Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com> * add pub-to-sub delivery time measure Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com> * add pub-to-sub delivery time measure Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com> * improve sync between pub and sub Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com> * improve sync between pub and sub Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com> * improve sync between pub and sub Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com> * improve sync between pub and sub Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com> * improve sync between pub and sub Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com> * improve sync between pub and sub Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com> * add random payload Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com> * revert changes for config.toml Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com> * add random payload Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com> * remove printfs Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com> * add logging Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com> * add payload Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com> * add payload Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com> * rename variable Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com> * add payload Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com> * small changes Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com> * refactor sync Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com> * refactor sync Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com> * refactor results Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com> * change sync and result collecting for sub Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com> * fix comments Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com>
2019-09-06 12:59:35 +00:00
totals := calculateTotalResults(results, totalTime, subsResults)
if totals == nil {
return
}
// Print sats
printResults(results, totals, cfg.MQTT.Message.Format, cfg.Log.Quiet)
}
NOISSUE - Add measuring time from pub to sub (#839) * refactor code Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com> * connect each thing with each channel Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com> * reverting - structure fields must be exported Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com> * reverting - structure fields must be exported Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com> * revert some names Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com> * move meausuring time start Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com> * add pub-to-sub delivery time measure Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com> * add pub-to-sub delivery time measure Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com> * add pub-to-sub delivery time measure Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com> * add pub-to-sub delivery time measure Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com> * improve sync between pub and sub Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com> * improve sync between pub and sub Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com> * improve sync between pub and sub Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com> * improve sync between pub and sub Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com> * improve sync between pub and sub Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com> * improve sync between pub and sub Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com> * add random payload Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com> * revert changes for config.toml Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com> * add random payload Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com> * remove printfs Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com> * add logging Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com> * add payload Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com> * add payload Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com> * rename variable Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com> * add payload Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com> * small changes Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com> * refactor sync Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com> * refactor sync Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com> * refactor results Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com> * change sync and result collecting for sub Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com> * fix comments Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com>
2019-09-06 12:59:35 +00:00
NOISSUE - Simplify MQTT benchmarking tool (#852) * Fix user creation Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Extract client creation to separate method Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Remove message generating in separate goroutine Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Remove runSub and runPub methods Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Refactor benchmark code Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Fix typos Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Update client message handling Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Fix microseconds typo Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Simplify client Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Don't take zero-messages clients int count Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Fix token timeout condition Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Add timeout for publisher Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Update Paho lib version Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Temporary drop SenML and subscribe support Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Calculate payload size Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Remove templates Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com>
2019-09-25 19:02:29 +02:00
func getBytePayload(size int, m message) (handler, error) {
// Calculate payload size.
var b []byte
s, err := json.Marshal(&m)
NOISSUE - Add measuring time from pub to sub (#839) * refactor code Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com> * connect each thing with each channel Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com> * reverting - structure fields must be exported Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com> * reverting - structure fields must be exported Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com> * revert some names Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com> * move meausuring time start Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com> * add pub-to-sub delivery time measure Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com> * add pub-to-sub delivery time measure Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com> * add pub-to-sub delivery time measure Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com> * add pub-to-sub delivery time measure Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com> * improve sync between pub and sub Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com> * improve sync between pub and sub Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com> * improve sync between pub and sub Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com> * improve sync between pub and sub Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com> * improve sync between pub and sub Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com> * improve sync between pub and sub Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com> * add random payload Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com> * revert changes for config.toml Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com> * add random payload Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com> * remove printfs Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com> * add logging Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com> * add payload Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com> * add payload Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com> * rename variable Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com> * add payload Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com> * small changes Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com> * refactor sync Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com> * refactor sync Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com> * refactor results Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com> * change sync and result collecting for sub Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com> * fix comments Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com>
2019-09-06 12:59:35 +00:00
if err != nil {
return nil, err
}
NOISSUE - Simplify MQTT benchmarking tool (#852) * Fix user creation Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Extract client creation to separate method Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Remove message generating in separate goroutine Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Remove runSub and runPub methods Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Refactor benchmark code Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Fix typos Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Update client message handling Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Fix microseconds typo Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Simplify client Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Don't take zero-messages clients int count Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Fix token timeout condition Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Add timeout for publisher Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Update Paho lib version Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Temporary drop SenML and subscribe support Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Calculate payload size Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Remove templates Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com>
2019-09-25 19:02:29 +02:00
n := len(s)
if n < size {
sz := size - n
for {
b = make([]byte, sz)
rand.Read(b)
m.Payload = b
content, err := json.Marshal(&m)
if err != nil {
return nil, err
}
l := len(content)
// Use range because the size of generated JSON
// depends on current time and random byte array.
if l <= size+5 && l >= size-5 {
break
}
if l > size {
sz--
}
if l < size {
sz++
}
}
}
NOISSUE - Add measuring time from pub to sub (#839) * refactor code Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com> * connect each thing with each channel Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com> * reverting - structure fields must be exported Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com> * reverting - structure fields must be exported Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com> * revert some names Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com> * move meausuring time start Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com> * add pub-to-sub delivery time measure Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com> * add pub-to-sub delivery time measure Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com> * add pub-to-sub delivery time measure Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com> * add pub-to-sub delivery time measure Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com> * improve sync between pub and sub Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com> * improve sync between pub and sub Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com> * improve sync between pub and sub Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com> * improve sync between pub and sub Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com> * improve sync between pub and sub Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com> * improve sync between pub and sub Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com> * add random payload Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com> * revert changes for config.toml Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com> * add random payload Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com> * remove printfs Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com> * add logging Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com> * add payload Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com> * add payload Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com> * rename variable Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com> * add payload Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com> * small changes Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com> * refactor sync Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com> * refactor sync Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com> * refactor results Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com> * change sync and result collecting for sub Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com> * fix comments Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com>
2019-09-06 12:59:35 +00:00
NOISSUE - Simplify MQTT benchmarking tool (#852) * Fix user creation Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Extract client creation to separate method Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Remove message generating in separate goroutine Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Remove runSub and runPub methods Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Refactor benchmark code Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Fix typos Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Update client message handling Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Fix microseconds typo Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Simplify client Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Don't take zero-messages clients int count Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Fix token timeout condition Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Add timeout for publisher Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Update Paho lib version Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Temporary drop SenML and subscribe support Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Calculate payload size Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Remove templates Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com>
2019-09-25 19:02:29 +02:00
ret := func(m *message) ([]byte, error) {
m.Payload = b
m.Sent = time.Now()
return json.Marshal(m)
}
return ret, nil
}
func makeClient(i int, cfg Config, mfChan mfChannel, mfThing mfThing, start time.Time, caCert []byte, clientCert tls.Certificate) (*Client, error) {
c := &Client{
ID: strconv.Itoa(i),
BrokerURL: cfg.MQTT.Broker.URL,
BrokerUser: mfThing.ThingID,
BrokerPass: mfThing.ThingKey,
MsgTopic: fmt.Sprintf("channels/%s/messages/%d/test", mfChan.ChannelID, start.UnixNano()),
MsgSize: cfg.MQTT.Message.Size,
MsgCount: cfg.Test.Count,
MsgQoS: byte(cfg.MQTT.Message.QoS),
Quiet: cfg.Log.Quiet,
MTLS: cfg.MQTT.TLS.MTLS,
SkipTLSVer: cfg.MQTT.TLS.SkipTLSVer,
CA: caCert,
timeout: cfg.MQTT.Timeout,
ClientCert: clientCert,
Retain: cfg.MQTT.Message.Retain,
}
msg := message{
Topic: c.MsgTopic,
QoS: c.MsgQoS,
ID: c.ID,
Sent: time.Now(),
}
h, err := getBytePayload(cfg.MQTT.Message.Size, msg)
NOISSUE - Add measuring time from pub to sub (#839) * refactor code Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com> * connect each thing with each channel Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com> * reverting - structure fields must be exported Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com> * reverting - structure fields must be exported Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com> * revert some names Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com> * move meausuring time start Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com> * add pub-to-sub delivery time measure Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com> * add pub-to-sub delivery time measure Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com> * add pub-to-sub delivery time measure Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com> * add pub-to-sub delivery time measure Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com> * improve sync between pub and sub Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com> * improve sync between pub and sub Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com> * improve sync between pub and sub Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com> * improve sync between pub and sub Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com> * improve sync between pub and sub Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com> * improve sync between pub and sub Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com> * add random payload Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com> * revert changes for config.toml Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com> * add random payload Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com> * remove printfs Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com> * add logging Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com> * add payload Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com> * add payload Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com> * rename variable Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com> * add payload Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com> * small changes Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com> * refactor sync Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com> * refactor sync Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com> * refactor results Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com> * change sync and result collecting for sub Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com> * fix comments Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com>
2019-09-06 12:59:35 +00:00
if err != nil {
return nil, err
}
NOISSUE - Simplify MQTT benchmarking tool (#852) * Fix user creation Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Extract client creation to separate method Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Remove message generating in separate goroutine Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Remove runSub and runPub methods Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Refactor benchmark code Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Fix typos Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Update client message handling Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Fix microseconds typo Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Simplify client Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Don't take zero-messages clients int count Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Fix token timeout condition Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Add timeout for publisher Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Update Paho lib version Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Temporary drop SenML and subscribe support Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Calculate payload size Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com> * Remove templates Signed-off-by: Dušan Borovčanin <dusan.borovcanin@mainflux.com>
2019-09-25 19:02:29 +02:00
c.SendMsg = h
return c, nil
NOISSUE - Add measuring time from pub to sub (#839) * refactor code Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com> * connect each thing with each channel Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com> * reverting - structure fields must be exported Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com> * reverting - structure fields must be exported Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com> * revert some names Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com> * move meausuring time start Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com> * add pub-to-sub delivery time measure Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com> * add pub-to-sub delivery time measure Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com> * add pub-to-sub delivery time measure Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com> * add pub-to-sub delivery time measure Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com> * improve sync between pub and sub Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com> * improve sync between pub and sub Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com> * improve sync between pub and sub Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com> * improve sync between pub and sub Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com> * improve sync between pub and sub Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com> * improve sync between pub and sub Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com> * add random payload Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com> * revert changes for config.toml Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com> * add random payload Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com> * remove printfs Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com> * add logging Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com> * add payload Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com> * add payload Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com> * rename variable Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com> * add payload Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com> * small changes Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com> * refactor sync Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com> * refactor sync Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com> * refactor results Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com> * change sync and result collecting for sub Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com> * fix comments Signed-off-by: Mirko Teodorovic <mirko.teodorovic@gmail.com>
2019-09-06 12:59:35 +00:00
}