sanchayanmaity/minix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Graceful exiting for mass storage driver

Browse source 
Exit signal is now correctly handled and allocated memory is freed, before exiting.
This commit is contained in:
Wojciech Zajac 2014-06-18 10:57:40 +02:00 committed by Lionel Sambuc
parent c1ba580ae2
commit 5655b1f1a4
1 changed files with 47 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

62
drivers/usb_storage/usb_storage.c
View file

@ -52,6 +52,9 @@ static int mass_storage_send_bulk_reset(void);
static int mass_storage_sef_hdlr(int, sef_init_info_t *); static int mass_storage_sef_hdlr(int, sef_init_info_t *);
static void mass_storage_signal_handler(int); static void mass_storage_signal_handler(int);
/* DDEKit IPC related */
static void ddekit_usb_task(void *);
/* Mass storage related prototypes */ /* Mass storage related prototypes */
static void mass_storage_task(void *); static void mass_storage_task(void *);
static int mass_storage_try_first_open(void); static int mass_storage_try_first_open(void);
@ -122,7 +125,10 @@ static unsigned int last_cbw_tag = 0; /* What was sent recently */
static ddekit_sem_t * mass_storage_sem = NULL; static ddekit_sem_t * mass_storage_sem = NULL;
/* Mass storage (using libblockdriver) thread */ /* Mass storage (using libblockdriver) thread */
ddekit_thread_t * mass_storage_thread; ddekit_thread_t * mass_storage_thread = NULL;
/* DDEKit USB message handling thread */
ddekit_thread_t * ddekit_usb_thread = NULL;
/* Static URB buffer size (must be multiple of SECTOR_SIZE) */ /* Static URB buffer size (must be multiple of SECTOR_SIZE) */
#define BUFFER_SIZE (64*SECTOR_SIZE) #define BUFFER_SIZE (64*SECTOR_SIZE)
@ -143,7 +149,7 @@ static unsigned char buffer[BUFFER_SIZE];
int int
main(int argc, char * argv[]) main(int argc, char * argv[])
{ {
MASS_DEBUG_MSG(THIS_EXEC_NAME" starting..."); MASS_DEBUG_MSG("Starting...");
/* Store arguments for future parsing */ /* Store arguments for future parsing */
env_setargs(argc, argv); env_setargs(argc, argv);
@ -163,27 +169,38 @@ main(int argc, char * argv[])
/* Semaphore initialization */ /* Semaphore initialization */
mass_storage_sem = ddekit_sem_init(0); mass_storage_sem = ddekit_sem_init(0);
assert(NULL != mass_storage_sem); if (NULL == mass_storage_sem)
panic("Initializing mass_storage_sem failed!");
/* Starting mass storage thread */ /* Starting mass storage thread */
mass_storage_thread = ddekit_thread_create(mass_storage_task, mass_storage_thread = ddekit_thread_create(mass_storage_task, NULL,
NULL, "mass_storage_task"); "mass_storage_task");
MASS_DEBUG_MSG("libblockdriver ready..."); if (NULL == mass_storage_thread)
panic("Initializing mass_storage_thread failed!");
/* Run USB client */ MASS_DEBUG_MSG("Storage task (libblockdriver) ready...");
ddekit_usb_init(&mass_storage_driver, NULL, NULL);
/* TODO: never reached */ /* Run USB IPC task to collect messages */
ddekit_usb_thread = ddekit_thread_create(ddekit_usb_task, NULL,
"ddekit_task" );
if (NULL == ddekit_usb_thread)
panic("Initializing ddekit_usb_thread failed!");
/* Block and wait */ MASS_DEBUG_MSG("USB IPC task ready...");
/* Block and wait until exit signal is received */
ddekit_minix_wait_exit(); ddekit_minix_wait_exit();
MASS_DEBUG_MSG(THIS_EXEC_NAME" exiting..."); MASS_DEBUG_MSG("Exiting...");
/* Semaphore release */ /* Release objects that were explicitly allocated above */
ddekit_thread_terminate(ddekit_usb_thread);
ddekit_thread_terminate(mass_storage_thread);
ddekit_sem_deinit(mass_storage_sem); ddekit_sem_deinit(mass_storage_sem);
/* TODO: no ddekit_deinit for proper cleanup? */ /* TODO: no ddekit_deinit for proper cleanup? */
MASS_DEBUG_MSG("Cleanup completed...");
return EXIT_SUCCESS; return EXIT_SUCCESS;
} }
@ -368,7 +385,7 @@ mass_storage_sef_hdlr(int type, sef_init_info_t * UNUSED(info))
/* Get instance number */ /* Get instance number */
if (EP_UNSET == env_res) { if (EP_UNSET == env_res) {
MASS_MSG("Instance number was not supplied"); MASS_DEBUG_MSG("Instance number was not supplied");
driver_state.instance = 0; driver_state.instance = 0;
} else { } else {
/* Only SET and UNSET are allowed */ /* Only SET and UNSET are allowed */
@ -410,10 +427,25 @@ mass_storage_signal_handler(int this_signal)
MASS_MSG("Handling signal 0x%X", this_signal); MASS_MSG("Handling signal 0x%X", this_signal);
#endif #endif
/* Try graceful DDEKit exit */
ddekit_shutdown(); ddekit_shutdown();
/* TODO: broken shutdown */ /* Unreachable, when ddekit_shutdown works correctly */
exit(0); panic("Calling ddekit_shutdown failed!");
}
/*===========================================================================*
* ddekit_usb_task *
*===========================================================================*/
static void
ddekit_usb_task(void * UNUSED(arg))
{
MASS_DEBUG_DUMP;
/* TODO: This call was meant to return 'int' but loops forever instead,
* so no return value is checked */
ddekit_usb_init(&mass_storage_driver, NULL, NULL);
} }