修改回调函数参数，在close fd时flush掉缓存内容

5 files changed, 46 insertions, 5 deletions

diff --git a/example/demo/hos_upload_complete.cpp b/example/demo/hos_upload_complete.cpp
index c53f50e8..bb76db52 100644
--- a/example/demo/hos_upload_complete.cpp
+++ b/example/demo/hos_upload_complete.cpp
@@ -50,7 +50,7 @@ int file_to_buffer(const char *file, char *buffer, size_t *len)
     return 0;
 }
 
-void callback(bool result, const char *error, void *userdata)
+void callback(bool result, const char *error, const char *bucket, const char *object, void *userdata)
 {
     userdata_t *data = (userdata_t *)userdata;
     clock_gettime(CLOCK_MONOTONIC, data->finished);
diff --git a/example/demo/hos_write_complete.cpp b/example/demo/hos_write_complete.cpp
index 00a78109..f96b16b9 100644
--- a/example/demo/hos_write_complete.cpp
+++ b/example/demo/hos_write_complete.cpp
@@ -50,7 +50,7 @@ int file_to_buffer(const char *file, char *buffer, size_t *len)
     return 0;
 }
 
-void callback(bool result, const char *error, void *userdata)
+void callback(bool result, const char *error, const char *bucket, const char *object, void *userdata)
 {
     userdata_t *data = (userdata_t *)userdata;
     clock_gettime(CLOCK_MONOTONIC, data->finished);
diff --git a/example/performance/HosClientPerformance.cpp b/example/performance/HosClientPerformance.cpp
index e2aa7b23..043fb58b 100644
--- a/example/performance/HosClientPerformance.cpp
+++ b/example/performance/HosClientPerformance.cpp
@@ -102,7 +102,7 @@ int read_file_list(const char *path, char file_name[][256])
     return 0;
 }
 
-static void callback(bool result, const char *error, void *userdata)
+static void callback(bool result, const char *error, const char *bucket, const char *object, void *userdata)
 {
 #if 0
     userdata_t *data = (userdata_t *)userdata;
diff --git a/src/hos_client.cpp b/src/hos_client.cpp
index 5d251aeb..9b1fa454 100644
--- a/src/hos_client.cpp
+++ b/src/hos_client.cpp
@@ -91,7 +91,7 @@ static void PutObjectAsyncFinished(const Aws::S3::S3Client* S3Client,
         return ; 
     }
     put_finished_callback callback = (put_finished_callback)hos_info->callback;
-    callback(result, error, hos_info->userdata);
+    callback(result, hos_info->bucket, hos_info->object, error, hos_info->userdata);
     if (hos_info->mode & APPEND_MODE)
     {
         //APPEND MODE 保留fd
@@ -612,10 +612,51 @@ int hos_write(size_t fd, const char *stream, size_t stream_len, size_t thread_id
 
 int hos_close_fd(size_t fd, size_t thread_id)
 {
+    hos_info_t *hos_info;
+    char num[128];
+    char buf[128];
     if (fd == 0)
     {
         return HOS_PARAMETER_ERROR;
     }
+    if (fd_info[thread_id][fd])
+    {
+        hos_info = find_info_by_fd(hash_hos_info[thread_id], fd);
+    }
+    if (hos_info == NULL)
+    {
+        return HOS_CLIENT_OK; 
+    }
+
+    //close fd 之前发送append的缓存中内容
+    if ((hos_info->mode & BUFF_MODE) && (hos_info->mode & APPEND_MODE))
+    {
+        if (hos_info->cache_rest != hos_info->handle->cache_size)
+        {
+            //handle = (hos_client_handle)hos_info->handle;
+            Aws::S3::S3Client& S3Client = *(hos_info->handle->S3Client);
+
+            // Create and configure the asynchronous put object request.
+            Aws::S3::Model::PutObjectRequest request;
+            request.SetBucket(hos_info->bucket);
+            request.SetKey(hos_info->object);
+            request.SetBody(hos_info->cache);
+
+            // add headers
+            snprintf(num, 128, "%lu", ++hos_info->position);
+            Aws::Map<Aws::String, Aws::String> headers;
+            headers["x-hos-upload-type"] = "append";
+            headers["x-hos-position"] = num;
+            request.SetMetadata(headers);
+
+            std::shared_ptr<Aws::Client::AsyncCallerContext> context = 
+                Aws::MakeShared<Aws::Client::AsyncCallerContext>("");
+            sprintf(buf, "%lu %lu", thread_id, fd);
+            context->SetUUID(buf);
+
+            S3Client.PutObjectAsync(request, PutObjectAsyncFinished, context);
+        }
+    }
 
     delete_info_by_fd(&hash_hos_info[thread_id], fd);
     fd_info[thread_id][fd] = 0;
diff --git a/src/hos_client.h b/src/hos_client.h
index 438b5be7..a53d23b5 100644
--- a/src/hos_client.h
+++ b/src/hos_client.h
@@ -73,7 +73,7 @@ enum s3errors
   OBJECT_NOT_IN_ACTIVE_TIER
 };
 
-typedef void (*put_finished_callback)(bool, const char *, void *);
+typedef void (*put_finished_callback)(bool, const char *, const char *, const char *, void *);
 
 
 /*************************************************************************************