Update simulation and fix norme errors

1 files changed, 87 insertions, 75 deletions

diff --git a/philo/src/main.c b/philo/src/main.c
index 879bf0b..c455f0d 100644
--- a/philo/src/main.c
+++ b/philo/src/main.c
@@ -6,94 +6,106 @@
 /*   By: dkaiser <dkaiser@student.42heilbronn.de    +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2025/01/14 17:13:30 by dkaiser           #+#    #+#             */
-/*   Updated: 2025/01/18 17:09:26 by dkaiser          ###   ########.fr       */
+/*   Updated: 2025/01/26 12:05:55 by dkaiser          ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
 #include "philo.h"
 
+int	load_data(t_phdata *data, int argc, char *argv[])
+{
+	data->nbr_of_philos = ft_atoi(argv[1]);
+	data->time_to_die = ft_atoi(argv[2]);
+	data->time_to_eat = ft_atoi(argv[3]);
+	data->time_to_sleep = ft_atoi(argv[4]);
+	if (argc == 6)
+		data->times_must_eat = ft_atoi(argv[5]);
+	else
+		data->times_must_eat = -1;
+	if (data->nbr_of_philos <= 0)
+		return (ft_err("Must have at least one philosopher"));
+	if (data->time_to_die < 0)
+		return (ft_err("ttd can't be negative"));
+	if (data->time_to_eat < 0)
+		return (ft_err("tte can't be negative"));
+	if (data->time_to_sleep < 0)
+		return (ft_err("tts can't be negative"));
+	data->philos_must_eat = data->nbr_of_philos;
+	return (EXIT_SUCCESS);
+}
+
+void	init_philo(t_philo *philo, t_phdata *data, int id)
+{
+	philo->id = id;
+	philo->is_alive = 1;
+	philo->times_must_eat = data->times_must_eat;
+	philo->data = data;
+	philo->last_time_eaten = ft_cur_time_in_ms();
+}
 
-int load_data(t_phdata *data, int argc, char *argv[])
+int	init_philos(t_philo **philos, t_phdata *data)
 {
-    data->nbr_of_philos = ft_atoi(argv[1]);
-    data->time_to_die = ft_atoi(argv[2]);
-    data->time_to_eat = ft_atoi(argv[3]);
-    data->time_to_sleep = ft_atoi(argv[4]);
-    if (argc == 6)
-        data->times_must_eat = ft_atoi(argv[5]);
-    else
-        data->times_must_eat = -1;
-    if (data->nbr_of_philos <= 0)
-        return (ft_err("Must have at least one philosopher"));
-    if (data->time_to_die < 0)
-        return (ft_err("ttd can't be negative"));
-    if (data->time_to_eat < 0)
-        return (ft_err("tte can't be negative"));
-    if (data->time_to_sleep < 0)
-        return (ft_err("tts can't be negative"));
-    data->philos_must_eat = data->nbr_of_philos;
-    return (EXIT_SUCCESS);
+	int	i;
+	int	result;
+
+	i = 0;
+	while (i < data->nbr_of_philos)
+	{
+		init_philo(&(*philos)[i], data, i + 1);
+		data->forks[i].owner = 0;
+		result = pthread_mutex_init(&(data->forks[i].mutex), NULL);
+		if (result != 0)
+		{
+			free(*philos);
+			free(data->forks);
+			return (result);
+		}
+		i++;
+	}
+	return (EXIT_SUCCESS);
 }
 
-int init(t_philo **philos, t_phdata *data)
+int	init(t_philo **philos, t_phdata *data)
 {
-    int i;
-    int result;
+	int	result;
 
-    *philos = (t_philo *)malloc(sizeof(t_philo) * data->nbr_of_philos);
-    if (*philos == NULL)
-        return (ft_err(ERR_MALLOC));
-    data->forks = (t_fork *)malloc(sizeof(t_fork) * data->nbr_of_philos);
-    if (data->forks == NULL)
-    {
-        free(*philos);
-        return (ft_err(ERR_MALLOC));
-    }
-    i = 0;
-    result = pthread_mutex_init(&(data->forks[i].mutex), NULL);
-    if (result != 0)
-    {
-        free(*philos);
-        free(data->forks);
-        return (result);
-    }
-    while (i < data->nbr_of_philos)
-    {
-        (*philos)[i].id = i + 1;
-        (*philos)[i].is_alive = 1;
-        (*philos)[i].times_must_eat = data->times_must_eat;
-        (*philos)[i].data = data;
-        (*philos)[i].last_time_eaten = ft_cur_time_in_ms();
-        data->forks[i].available = 1;
-        result = pthread_mutex_init(&(data->forks[i].mutex), NULL);
-        if (result != 0)
-        {
-            free(*philos);
-            free(data->forks);
-            return (result);
-        }
-        i++;
-    }
-    return (EXIT_SUCCESS);
+	*philos = (t_philo *)malloc(sizeof(t_philo) * data->nbr_of_philos);
+	if (*philos == NULL)
+		return (ft_err(ERR_MALLOC));
+	data->forks = (t_fork *)malloc(sizeof(t_fork) * data->nbr_of_philos);
+	if (data->forks == NULL)
+	{
+		free(*philos);
+		return (ft_err(ERR_MALLOC));
+	}
+	result = pthread_mutex_init(&(data->pme_mutex), NULL);
+	if (result != 0)
+	{
+		free(*philos);
+		free(data->forks);
+		return (result);
+	}
+	result = init_philos(philos, data);
+	return (result);
 }
 
-int main(int argc, char *argv[])
+int	main(int argc, char *argv[])
 {
-    t_phdata data;
-    t_philo *philos;
-    int result;
+	t_phdata	data;
+	t_philo		*philos;
+	int			result;
 
-    if (argc != 5 && argc != 6)
-        return(ft_err(ERR_USAGE));
-    result = load_data(&data, argc, argv);
-    if (result != EXIT_SUCCESS)
-        return (result);
-    result = init(&philos, &data);
-    if (result != EXIT_SUCCESS)
-        return (result);
-    data.simulation_running = 1;
-    result = run_simulation(data.nbr_of_philos, philos, &data);
-    free(philos);
-    free(data.forks);
-    return (result);
+	if (argc != 5 && argc != 6)
+		return (ft_err(ERR_USAGE));
+	result = load_data(&data, argc, argv);
+	if (result != EXIT_SUCCESS)
+		return (result);
+	result = init(&philos, &data);
+	if (result != EXIT_SUCCESS)
+		return (result);
+	data.simulation_running = 1;
+	result = run_simulation(data.nbr_of_philos, philos, &data);
+	free(philos);
+	free(data.forks);
+	return (result);
 }