X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=converter%2Fbabeltrace-log.c;h=563a90f57f1df018d5f75cd18e70a633aea8811b;hp=8d425be65f9615882ae3ee6d240d1609eca751f2;hb=ca334c7230d120ffe211efbfd6efe467b5d4d794;hpb=08c82b90d94a6dfee1f3da4ec06864c6045c07f7

diff --git a/converter/babeltrace-log.c b/converter/babeltrace-log.c
index 8d425be6..563a90f5 100644
--- a/converter/babeltrace-log.c
+++ b/converter/babeltrace-log.c
@@ -17,6 +17,14 @@
  * The above copyright notice and this permission notice shall be included in
  * all copies or substantial portions of the Software.
  *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ *
  * Depends on glibc 2.10 for getline().
  */
 
@@ -183,6 +191,11 @@ void write_event_header(struct ctf_stream_pos *pos, char *line,
 			}
 			*tlen = len + line - *tline;
 			*ts = (uint64_t) sec * USEC_PER_SEC + (uint64_t) usec;
+			/*
+			 * Default CTF clock has 1GHz frequency. Convert
+			 * from usec to nsec.
+			 */
+			*ts *= 1000;
 		}
 	}
 	/* timestamp */
@@ -239,7 +252,7 @@ void trace_text(FILE *input, int output)
 	int ret;
 
 	memset(&pos, 0, sizeof(pos));
-	ret = ctf_init_pos(&pos, output, O_RDWR);
+	ret = ctf_init_pos(&pos, NULL, output, O_RDWR);
 	if (ret) {
 		fprintf(stderr, "Error in ctf_init_pos\n");
 		return;