/* Functions related to the java file API. */
-/* Copyright (c) 2012. The SimGrid Team.
+/* Copyright (c) 2012-2013. The SimGrid Team.
* All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
#include "jmsg_file.h"
#include "jxbt_utilities.h"
-void jfile_bind(JNIEnv *env, jobject jfile, msg_file_t stream) {
- (*env)->SetLongField(env, jfile, jfile_field_bind, (intptr_t)stream);
+void jfile_bind(JNIEnv *env, jobject jfile, msg_file_t fd) {
+ (*env)->SetLongField(env, jfile, jfile_field_bind, (intptr_t)fd);
}
msg_file_t jfile_get_native(JNIEnv *env, jobject jfile) {
const char *path = (*env)->GetStringUTFChars(env, jpath, 0);
msg_file_t file;
- file = MSG_file_open(storage, path);
+ file = MSG_file_open(storage, path, NULL);
jfile_bind(env, jfile, file);
(*env)->ReleaseStringUTFChars(env, jstorage, storage);
(*env)->ReleaseStringUTFChars(env, jpath, path);
}
JNIEXPORT jlong JNICALL
-Java_org_simgrid_msg_File_read(JNIEnv *env, jobject jfile, jlong jsize, jlong jnmemb) {
+Java_org_simgrid_msg_File_read(JNIEnv *env, jobject jfile, jlong jsize) {
msg_file_t file = jfile_get_native(env, jfile);
size_t n;
- n = MSG_file_read(NULL,(size_t)jsize, (size_t)jnmemb, file);
+ n = MSG_file_read(file, (size_t)jsize);
return (jlong)n;
}
JNIEXPORT jlong JNICALL
-Java_org_simgrid_msg_File_write(JNIEnv *env, jobject jfile, jlong jsize, jlong jnmemb) {
+Java_org_simgrid_msg_File_write(JNIEnv *env, jobject jfile, jlong jsize) {
msg_file_t file = jfile_get_native(env, jfile);
size_t n;
- n = MSG_file_write(NULL, (size_t)jsize, (size_t)jnmemb, file);
+ n = MSG_file_write(file, (size_t)jsize);
return (jlong)n;
}
JNIEXPORT void JNICALL