Added multiple meal, Removing bloat

1 files changed, 7 insertions, 9 deletions

diff --git a/philo_one/routine.c b/philo_one/routine.c
index 69952b1..d52fe2e 100644
--- a/philo_one/routine.c
+++ b/philo_one/routine.c
@@ -6,22 +6,20 @@
 /*   By: cacharle <marvin@42.fr>                    +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2020/02/10 01:11:27 by cacharle          #+#    #+#             */
-/*   Updated: 2020/04/22 13:39:48 by charles          ###   ########.fr       */
+/*   Updated: 2020/09/27 10:25:56 by charles          ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
 #include "philo_one.h"
 
-void	*routine_philo(void *void_arg)
+void	*routine_philo(t_routine_arg *arg)
 {
-	t_routine_arg	*arg;
 	pthread_t		thread_death;
 
-	arg = (t_routine_arg*)void_arg;
 	if (!arg->conf->all_alive)
 		return (NULL);
 	arg->philo->time_last_eat = h_time_now();
-	if (pthread_create(&thread_death, NULL, routine_death, arg) != 0)
+	if (pthread_create(&thread_death, NULL, (void *(*)(void*))routine_death, arg) != 0)
 		return (NULL);
 	io_think(arg);
 	while (arg->conf->all_alive)
@@ -39,18 +37,18 @@ void	*routine_philo(void *void_arg)
 	return (NULL);
 }
 
-void	*routine_death(void *void_arg)
+void	*routine_death(t_routine_arg *arg)
 {
-	t_routine_arg	*arg;
 	t_time			current;
 
-	arg = (t_routine_arg*)void_arg;
 	current = h_time_now();
 	while (arg->conf->all_alive &&
 			current - arg->philo->time_last_eat < arg->conf->timeout_death)
 		current = h_time_now();
-	io_die(arg);
+	if (!arg->conf->all_alive)
+		return (NULL);
 	pthread_mutex_lock(&arg->conf->mutex_all_alive);
+	io_die(arg);
 	arg->conf->all_alive = false;
 	pthread_mutex_unlock(&arg->conf->mutex_all_alive);
 	return (NULL);