Skip to content

Commit

Permalink
Fix ptp_free_object_service, rename object service struct
Browse files Browse the repository at this point in the history
  • Loading branch information
@petabyt
petabyt committed Nov 10, 2024
1 parent 5e48784 commit 284af83
Show file tree
Hide file tree
Showing 3 changed files with 68 additions and 69 deletions.
27 changes: 13 additions & 14 deletions lib/object.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
#include <pthread.h>
#include "object.h"

struct ObjectCache {
struct PtpObjectCache {
/// @brief Should be locked while iterating the status list and other fields here
pthread_mutex_t mutex;

Expand Down Expand Up @@ -44,7 +44,7 @@ static int sort_filename_a_z(const void *a, const void *b) {
return strcmp(((const struct CachedObject *)a)->info.filename, ((const struct CachedObject *)a)->info.filename);
}

void ptp_object_service_sort(struct PtpRuntime *r, struct ObjectCache *oc, enum PtpSortBy s) {
void ptp_object_service_sort(struct PtpRuntime *r, struct PtpObjectCache *oc, enum PtpSortBy s) {
pthread_mutex_lock(&oc->mutex);

if (s == PTP_SORT_BY_ALPHA_A_Z) {
Expand All @@ -54,7 +54,7 @@ void ptp_object_service_sort(struct PtpRuntime *r, struct ObjectCache *oc, enum
pthread_mutex_unlock(&oc->mutex);
}

void ptp_object_service_add_priority(struct PtpRuntime *r, struct ObjectCache *oc, int handle) {
void ptp_object_service_add_priority(struct PtpRuntime *r, struct PtpObjectCache *oc, int handle) {
pthread_mutex_lock(&oc->mutex);

for (int i = 0; i < oc->status_length; i++) {
Expand All @@ -67,7 +67,7 @@ void ptp_object_service_add_priority(struct PtpRuntime *r, struct ObjectCache *o
pthread_mutex_unlock(&oc->mutex);
}

int ptp_object_service_step(struct PtpRuntime *r, struct ObjectCache *oc) {
int ptp_object_service_step(struct PtpRuntime *r, struct PtpObjectCache *oc) {
pthread_mutex_lock(&oc->mutex);

if (oc->curr > oc->status_length) ptp_panic("Illegal state oc->curr");
Expand Down Expand Up @@ -116,20 +116,20 @@ int ptp_object_service_step(struct PtpRuntime *r, struct ObjectCache *oc) {
return obj->handle;
}

int ptp_object_service_length_filled(struct PtpRuntime *r, struct ObjectCache *oc) {
int ptp_object_service_length_filled(struct PtpRuntime *r, struct PtpObjectCache *oc) {
return oc->num_downloaded;
}

int ptp_object_service_length(struct PtpRuntime *r, struct ObjectCache *oc) {
int ptp_object_service_length(struct PtpRuntime *r, struct PtpObjectCache *oc) {
return oc->status_length;
}

int ptp_object_service_get_handle_at(struct PtpRuntime *r, struct ObjectCache *oc, int index) {
int ptp_object_service_get_handle_at(struct PtpRuntime *r, struct PtpObjectCache *oc, int index) {
if (index > oc->status_length) return -1;
return oc->status[index]->handle;
}

struct PtpObjectInfo *ptp_object_service_get_index(struct PtpRuntime *r, struct ObjectCache *oc, int req_i) {
struct PtpObjectInfo *ptp_object_service_get_index(struct PtpRuntime *r, struct PtpObjectCache *oc, int req_i) {
int count = 0;
pthread_mutex_lock(&oc->mutex);
for (int i = 0; i < oc->status_length; i++) {
Expand All @@ -148,7 +148,7 @@ struct PtpObjectInfo *ptp_object_service_get_index(struct PtpRuntime *r, struct
return NULL;
}

struct PtpObjectInfo *ptp_object_service_get(struct PtpRuntime *r, struct ObjectCache *oc, int handle) {
struct PtpObjectInfo *ptp_object_service_get(struct PtpRuntime *r, struct PtpObjectCache *oc, int handle) {
pthread_mutex_lock(&oc->mutex);
for (int i = 0; i < oc->status_length; i++) {
if (oc->status[i]->handle == handle) {
Expand All @@ -165,8 +165,8 @@ struct PtpObjectInfo *ptp_object_service_get(struct PtpRuntime *r, struct Object
return NULL;
}

struct ObjectCache *ptp_create_object_service(int *handles, int length, ptp_object_found_callback *callback, void *arg) {
struct ObjectCache *oc = malloc(sizeof(struct ObjectCache));
struct PtpObjectCache *ptp_create_object_service(int *handles, int length, ptp_object_found_callback *callback, void *arg) {
struct PtpObjectCache *oc = malloc(sizeof(struct PtpObjectCache));
oc->callback = callback;
oc->status_length = length;
oc->curr = 0;
Expand All @@ -192,12 +192,11 @@ struct ObjectCache *ptp_create_object_service(int *handles, int length, ptp_obje
return oc;
}

void ptp_free_object_service(struct ObjectCache *oc) {
pthread_mutex_lock(&oc->mutex);
void ptp_free_object_service(struct PtpObjectCache *oc) {
for (int i = 0; i < oc->status_length; i++) {
free(oc->status[i]);
}
free(oc->status);
pthread_mutex_destroy(&oc->mutex);
free(oc);
pthread_mutex_unlock(&oc->mutex);
}
108 changes: 54 additions & 54 deletions lib/object.h
View file
Original file line number Diff line number Diff line change
@@ -1,54 +1,54 @@
#ifndef OBJECT_H
#define OBJECT_H

#include <camlib.h>

enum PtpSortBy {
PTP_SORT_BY_OLDEST = 1,
PTP_SORT_BY_NEWEST,
PTP_SORT_BY_ALPHA_A_Z,
PTP_SORT_BY_ALPHA_Z_A,
PTP_SORT_BY_JPEGS_FIRST,
PTP_SORT_BY_MOVS_FIRST,
PTP_SORT_BY_RAWS_FIRST,
};

typedef void ptp_object_found_callback(struct PtpRuntime *r, struct PtpObjectInfo *oi, void *arg);

/// @brief Create an object info downloader service. Designed to be used with multithreaded applications.
/// @param callback Will be called when the service downloads a new object. Used to update the UI.
struct ObjectCache *ptp_create_object_service(int *handles, int length, ptp_object_found_callback *callback, void *arg);

/// @brief Get ObjectInfo from the PTP handle.
/// @returns NULL if not downloaded yet by the service.
struct PtpObjectInfo *ptp_object_service_get(struct PtpRuntime *r, struct ObjectCache *oc, int handle);

/// @brief Use with ptp_object_service_length_filled. Returns object by index.
/// @returns NULL if the device didn't return an object info. (returned InvalidObjectHandle)
/// Will skip any objects that haven't been downloaded yet.
struct PtpObjectInfo *ptp_object_service_get_index(struct PtpRuntime *r, struct ObjectCache *oc, int req_i);

/// @brief Get the current length of the array of downloaded objects
int ptp_object_service_length_filled(struct PtpRuntime *r, struct ObjectCache *oc);

/// @brief Step the object service once. This should normally result in one transaction.
/// @returns Object handle of info that was downloaded
int ptp_object_service_step(struct PtpRuntime *r, struct ObjectCache *oc);

/// @brief Set an object by handle as priority - it will be downloaded on the next ptp_object_service_step call.
/// This can be called multiple times, it will add the objects to a priority queue.
void ptp_object_service_add_priority(struct PtpRuntime *r, struct ObjectCache *oc, int handle);

/// @brief Sort all objects in the list.
void ptp_object_service_sort(struct PtpRuntime *r, struct ObjectCache *oc, enum PtpSortBy s);

/// @brief Return length of list
int ptp_object_service_length(struct PtpRuntime *r, struct ObjectCache *oc);

/// @brief Get object handle at list index
/// @returns -1 if invalid
int ptp_object_service_get_handle_at(struct PtpRuntime *r, struct ObjectCache *oc, int index);

void ptp_free_object_service(struct ObjectCache *oc);

#endif
#ifndef OBJECT_H
#define OBJECT_H

#include <camlib.h>

enum PtpSortBy {
PTP_SORT_BY_OLDEST = 1,
PTP_SORT_BY_NEWEST,
PTP_SORT_BY_ALPHA_A_Z,
PTP_SORT_BY_ALPHA_Z_A,
PTP_SORT_BY_JPEGS_FIRST,
PTP_SORT_BY_MOVS_FIRST,
PTP_SORT_BY_RAWS_FIRST,
};

typedef void ptp_object_found_callback(struct PtpRuntime *r, struct PtpObjectInfo *oi, void *arg);

/// @brief Create an object info downloader service. Designed to be used with multithreaded applications.
/// @param callback Will be called when the service downloads a new object. Used to update the UI.
struct PtpObjectCache *ptp_create_object_service(int *handles, int length, ptp_object_found_callback *callback, void *arg);

/// @brief Get ObjectInfo from the PTP handle.
/// @returns NULL if not downloaded yet by the service.
struct PtpObjectInfo *ptp_object_service_get(struct PtpRuntime *r, struct PtpObjectCache *oc, int handle);

/// @brief Use with ptp_object_service_length_filled. Returns object by index.
/// @returns NULL if the device didn't return an object info. (returned InvalidObjectHandle)
/// Will skip any objects that haven't been downloaded yet.
struct PtpObjectInfo *ptp_object_service_get_index(struct PtpRuntime *r, struct PtpObjectCache *oc, int req_i);

/// @brief Get the current length of the array of downloaded objects
int ptp_object_service_length_filled(struct PtpRuntime *r, struct PtpObjectCache *oc);

/// @brief Step the object service once. This should normally result in one transaction.
/// @returns Object handle of info that was downloaded
int ptp_object_service_step(struct PtpRuntime *r, struct PtpObjectCache *oc);

/// @brief Set an object by handle as priority - it will be downloaded on the next ptp_object_service_step call.
/// This can be called multiple times, it will add the objects to a priority queue.
void ptp_object_service_add_priority(struct PtpRuntime *r, struct PtpObjectCache *oc, int handle);

/// @brief Sort all objects in the list.
void ptp_object_service_sort(struct PtpRuntime *r, struct PtpObjectCache *oc, enum PtpSortBy s);

/// @brief Return length of list
int ptp_object_service_length(struct PtpRuntime *r, struct PtpObjectCache *oc);

/// @brief Get object handle at list index
/// @returns -1 if invalid
int ptp_object_service_get_handle_at(struct PtpRuntime *r, struct PtpObjectCache *oc, int index);

void ptp_free_object_service(struct PtpObjectCache *oc);

#endif
2 changes: 1 addition & 1 deletion lib/tester.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -199,7 +199,7 @@ int fuji_simulate_app(struct PtpRuntime *r) {
tester_fail("Failed to get object handles");
return rc;
}
struct ObjectCache *c = ptp_create_object_service((int *)a->data, a->length, NULL, NULL);
struct PtpObjectCache *c = ptp_create_object_service((int *)a->data, a->length, NULL, NULL);
free(a);

srand(382);
Expand Down

0 comments on commit 284af83

Please sign in to comment.