From: Jens Axboe <axboe@kernel.dk>
Date: Mon, 4 Mar 2013 11:27:07 +0000 (+0100)
Subject: Merge branch 'master' into gfio
X-Git-Tag: fio-2.1~57^2~18
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=8ea39c32d29428b17bfe9c806fc33f0c8adfe118;p=fio.git

Merge branch 'master' into gfio

Conflicts:
	init.c

Signed-off-by: Jens Axboe <axboe@kernel.dk>
---

8ea39c32d29428b17bfe9c806fc33f0c8adfe118
diff --cc configure
index 71faf918,d1f277d0..5d576e10
--- a/configure
+++ b/configure
@@@ -1068,8 -1035,10 +1086,11 @@@ f
  if test "$tcp_nodelay" = "yes" ; then
    output_sym "CONFIG_TCP_NODELAY"
  fi
+ if test "$rlimit_memlock" = "yes" ; then
+   output_sym "CONFIG_RLIMIT_MEMLOCK"
+ fi
  
  echo "LIBS+=$LIBS" >> $config_host_mak
 +echo "CFLAGS+=$CFLAGS" >> $config_host_mak
  echo "CC=$cc" >> $config_host_mak
  echo "EXTFLAGS=$EXTFLAGS $CFLAGS" >> $config_host_mak
diff --cc eta.c
index a724fe63,f90d4281..531b8762
--- a/eta.c
+++ b/eta.c
@@@ -439,12 -440,17 +440,17 @@@ void display_thread_status(struct jobs_
  		eta_to_str(eta_str, je->eta_sec);
  	}
  
+ 	if (eta_new_line_pending) {
+ 		eta_new_line_pending = 0;
+ 		p += sprintf(p, "\n");
+ 	}
+ 
  	p += sprintf(p, "Jobs: %d (f=%d)", je->nr_running, je->files_open);
 -	if (je->m_rate || je->t_rate) {
 +	if (je->m_rate[0] || je->m_rate[1] || je->t_rate[0] || je->t_rate[1]) {
  		char *tr, *mr;
  
 -		mr = num2str(je->m_rate, 4, 0, je->is_pow2);
 -		tr = num2str(je->t_rate, 4, 0, je->is_pow2);
 +		mr = num2str(je->m_rate[0] + je->m_rate[1], 4, 0, je->is_pow2);
 +		tr = num2str(je->t_rate[0] + je->t_rate[1], 4, 0, je->is_pow2);
  		p += sprintf(p, ", CR=%s/%s KB/s", tr, mr);
  		free(tr);
  		free(mr);
diff --cc memory.c
index e969221f,ee5f895d..f1cd2d77
--- a/memory.c
+++ b/memory.c
@@@ -171,12 -173,13 +171,13 @@@ static int alloc_mem_mmap(struct thread
  
  static void free_mem_mmap(struct thread_data *td, size_t total_mem)
  {
- 	dprint(FD_MEM, "munmap %u %p\n", total_mem, td->orig_buffer);
+ 	dprint(FD_MEM, "munmap %llu %p\n", (unsigned long long) total_mem,
+ 						td->orig_buffer);
  	munmap(td->orig_buffer, td->orig_buffer_size);
 -	if (td->mmapfile) {
 +	if (td->o.mmapfile) {
  		close(td->mmapfd);
 -		unlink(td->mmapfile);
 -		free(td->mmapfile);
 +		unlink(td->o.mmapfile);
 +		free(td->o.mmapfile);
  	}
  }