projects
/
fio.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'fix-cflags' of https://github.com/Hi-Angel/fio
[fio.git]
/
libfio.c
diff --git
a/libfio.c
b/libfio.c
index 14ddc4d03302758d95d08a45a2eb4d740798441b..7348b16491ff266cadb7ba46d75e503984ccbc95 100644
(file)
--- a/
libfio.c
+++ b/
libfio.c
@@
-18,12
+18,11
@@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
*
* 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., 5
9 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Foundation, Inc., 5
1 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*
*/
#include <string.h>
*
*/
#include <string.h>
-#include <sys/types.h>
#include <signal.h>
#include <stdint.h>
#include <locale.h>
#include <signal.h>
#include <stdint.h>
#include <locale.h>
@@
-93,12
+92,13
@@
static void reset_io_counters(struct thread_data *td, int all)
td->bytes_done[ddir] = 0;
td->rate_io_issue_bytes[ddir] = 0;
td->rate_next_io_time[ddir] = 0;
td->bytes_done[ddir] = 0;
td->rate_io_issue_bytes[ddir] = 0;
td->rate_next_io_time[ddir] = 0;
+ td->last_usec[ddir] = 0;
}
}
td->zone_bytes = 0;
}
}
td->zone_bytes = 0;
- td->last_was_sync =
0
;
+ td->last_was_sync =
false
;
td->rwmix_issues = 0;
/*
td->rwmix_issues = 0;
/*
@@
-230,10
+230,10
@@
void fio_mark_td_terminate(struct thread_data *td)
{
fio_gettime(&td->terminate_time, NULL);
write_barrier();
{
fio_gettime(&td->terminate_time, NULL);
write_barrier();
- td->terminate =
1
;
+ td->terminate =
true
;
}
}
-void fio_terminate_threads(unsigned int group_id)
+void fio_terminate_threads(unsigned int group_id
, unsigned int terminate
)
{
struct thread_data *td;
pid_t pid = getpid();
{
struct thread_data *td;
pid_t pid = getpid();
@@
-242,7
+242,10
@@
void fio_terminate_threads(unsigned int group_id)
dprint(FD_PROCESS, "terminate group_id=%d\n", group_id);
for_each_td(td, i) {
dprint(FD_PROCESS, "terminate group_id=%d\n", group_id);
for_each_td(td, i) {
- if (group_id == TERMINATE_ALL || group_id == td->groupid) {
+ if ((terminate == TERMINATE_GROUP && group_id == TERMINATE_ALL) ||
+ (terminate == TERMINATE_GROUP && group_id == td->groupid) ||
+ (terminate == TERMINATE_STONEWALL && td->runstate >= TD_RUNNING) ||
+ (terminate == TERMINATE_ALL)) {
dprint(FD_PROCESS, "setting terminate on %s/%d\n",
td->o.name, (int) td->pid);
dprint(FD_PROCESS, "setting terminate on %s/%d\n",
td->o.name, (int) td->pid);
@@
-365,6
+368,9
@@
int initialize_fio(char *envp[])
compiletime_assert((offsetof(struct thread_options_pack, latency_percentile) % 8) == 0, "latency_percentile");
compiletime_assert((offsetof(struct jobs_eta, m_rate) % 8) == 0, "m_rate");
compiletime_assert((offsetof(struct thread_options_pack, latency_percentile) % 8) == 0, "latency_percentile");
compiletime_assert((offsetof(struct jobs_eta, m_rate) % 8) == 0, "m_rate");
+ compiletime_assert(__TD_F_LAST <= TD_ENG_FLAG_SHIFT, "TD_ENG_FLAG_SHIFT");
+ compiletime_assert(BSSPLIT_MAX <= ZONESPLIT_MAX, "bsssplit/zone max");
+
err = endian_check();
if (err) {
log_err("fio: endianness settings appear wrong.\n");
err = endian_check();
if (err) {
log_err("fio: endianness settings appear wrong.\n");