*
* 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.
*/
#include <babeltrace/babeltrace.h>
ctx->current_iterator = NULL;
ctx->tc = g_new0(struct trace_collection, 1);
- init_trace_collection(ctx->tc);
+ bt_init_trace_collection(ctx->tc);
return ctx;
}
int bt_context_add_trace(struct bt_context *ctx, const char *path,
const char *format_name,
- void (*packet_seek)(struct stream_pos *pos, size_t index,
+ void (*packet_seek)(struct bt_stream_pos *pos, size_t index,
int whence),
struct mmap_stream_list *stream_list,
FILE *metadata)
{
- struct trace_descriptor *td;
+ struct bt_trace_descriptor *td;
struct format *fmt;
struct bt_trace_handle *handle;
int ret, closeret;
if (path) {
td = fmt->open_trace(path, O_RDONLY, packet_seek, NULL);
if (!td) {
- fprintf(stderr, "[warning] [Context] Cannot open_trace of the format %s .\n\n",
- path);
+ fprintf(stderr, "[warning] [Context] Cannot open_trace of format %s at path %s.\n",
+ format_name, path);
ret = -1;
goto end;
}
} else {
td = fmt->open_mmap_trace(stream_list, packet_seek, metadata);
if (!td) {
- fprintf(stderr, "[error] [Context] Cannot open_trace of the format %s .\n\n",
- path);
+ fprintf(stderr, "[error] [Context] Cannot open_mmap_trace of format %s.\n\n",
+ format_name);
ret = -1;
goto end;
}
g_hash_table_insert(ctx->trace_handles,
(gpointer) (unsigned long) handle->id,
handle);
- ret = trace_collection_add(ctx->tc, td);
+ ret = bt_trace_collection_add(ctx->tc, td);
if (ret != 0)
goto error;
return -ENOENT;
/* Remove from containers */
- trace_collection_remove(ctx->tc, handle->td);
+ bt_trace_collection_remove(ctx->tc, handle->td);
/* Close the trace */
ret = handle->format->close_trace(handle->td);
if (ret) {
void bt_context_destroy(struct bt_context *ctx)
{
assert(ctx);
- finalize_trace_collection(ctx->tc);
+ bt_finalize_trace_collection(ctx->tc);
/*
* Remove all traces. The g_hash_table_destroy will call