aniani/elinks
1
0
Fork 0
mirror of https://github.com/rkd77/elinks.git synced 2024-06-29 01:45:34 +00:00
Code

Revert "ipc: Added two semaphores and a shared memory block."

Browse Source 
This reverts commit 199232b501.
This commit is contained in:
Witold Filipczyk 2007-09-02 17:00:15 +02:00 committed by Witold Filipczyk
parent 0ee52be73f
commit 9680714765
3 changed files with 0 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

63
src/main/main.c
View File

@ -54,17 +54,12 @@
#include "util/file.h"
#include "util/memdebug.h"
#include "util/memory.h"
#include "util/sem.h"
#include "viewer/dump/dump.h"
#include "viewer/text/festival.h"
#include "viewer/text/marks.h"
struct program program;
int epoll_fd;
int master_sem = -1;
int slave_sem = -1;
int shared_mem_ipc = -1;
unsigned char *shared_mem = NULL;
static int ac;
static unsigned char **av;
@ -112,60 +107,6 @@ check_cwd(void)
mem_free_if(cwd);
}
static void
init_master_ipc(void)
{
struct string filename;
key_t k1, k2, k3;
if (!get_sun_path(&filename))
return;
k1 = ftok(filename.source, 1);
k2 = ftok(filename.source, 2);
k3 = ftok(filename.source, 3);
master_sem = sem_create(k1, 0);
slave_sem = sem_create(k2, 0);
shared_mem_ipc = shmget(k3, 4096, 0600 | IPC_CREAT | IPC_EXCL);
if (shared_mem_ipc == -1 && errno == EEXIST)
shared_mem_ipc = shmget(k3, 4096, 0600);
if (shared_mem_ipc >= 0) {
shared_mem = shmat(shared_mem_ipc, NULL, 0);
}
done_string(&filename);
}
static void
init_slave_ipc(void)
{
struct string filename;
key_t k1, k2, k3;
if (!get_sun_path(&filename))
return;
k1 = ftok(filename.source, 1);
k2 = ftok(filename.source, 2);
k3 = ftok(filename.source, 3);
master_sem = sem_open(k1);
slave_sem = sem_open(k2);
shared_mem_ipc = shmget(k3, 4096, 0600);
if (shared_mem_ipc >= 0) {
shared_mem = shmat(shared_mem_ipc, NULL, 0);
}
done_string(&filename);
}
static void
done_ipc(void)
{
if (shared_mem)
shmdt(shared_mem);
if (master_sem >= 0)
sem_close(master_sem);
if (slave_sem >= 0)
sem_close(slave_sem);
/* shared_mem_ipc will be automatically done by sem_close() */
}
static void
init(void)
{
@ -310,7 +251,6 @@ init(void)
handle_trm(get_input_handle(), get_output_handle(),
fd, fd, get_ctl_handle(), info.source, info.length,
remote_session_flags);
init_slave_ipc();
} else {
/* Setup a master terminal */
term = attach_terminal(get_input_handle(), get_output_handle(),
@ -319,8 +259,6 @@ init(void)
ERROR(gettext("Unable to attach_terminal()."));
program.retval = RET_FATAL;
program.terminate = 1;
} else {
init_master_ipc();
}
}
@ -339,7 +277,6 @@ static void
terminate_all_subsystems(void)
{
done_interlink();
done_ipc();
check_bottom_halves();
abort_all_downloads();
check_bottom_halves();

6
src/util/sem.c
View File

@ -28,7 +28,6 @@ or use of these programs.
#include "util/sem.h"
extern int shared_mem_ipc;
/*
* Provide an simpler and easier to understand interface to the System V
* semaphore system calls. There are 7 routines available to the user:
@ -227,11 +226,6 @@ sem_rm(int id)
{
semctl(id, 0, IPC_RMID, 0);
/* err_sys("can't IPC_RMID"); */
/* Stupid, but this is the best place. */
if (shared_mem_ipc >= 0) {
shmctl(shared_mem_ipc, IPC_RMID, NULL);
shared_mem_ipc = -1;
}
}
/****************************************************************************

1
src/util/sem.h
View File

@ -4,7 +4,6 @@
#include <sys/types.h>
#include <sys/ipc.h>
#include <sys/sem.h>
#include <sys/shm.h>
int sem_create(key_t key, int initval);
int sem_open(key_t key);