Skip to content

Commit

Permalink
Move mono-mutex.c from io-layer to utils. Killing the io-layer, softly.
Browse files Browse the repository at this point in the history
  • Loading branch information
@kumpera
kumpera committed Apr 22, 2013
1 parent a57d728 commit 9d79602
Show file tree
Hide file tree
Showing 18 changed files with 20 additions and 18 deletions.
3 changes: 0 additions & 3 deletions mono/io-layer/Makefile.am
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ OTHER_H = \
io-portability.h \
macros.h \
messages.h \
mono-mutex.h \
mutexes.h \
processes.h \
security.h \
Expand Down Expand Up @@ -70,8 +69,6 @@ OTHER_SRC = \
mutexes.c \
mutexes.h \
mutex-private.h \
mono-mutex.c \
mono-mutex.h \
posix.c \
processes.c \
processes.h \
Expand Down
2 changes: 1 addition & 1 deletion mono/io-layer/critical-sections.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
#include <mono/io-layer/wapi.h>
#include <mono/io-layer/critical-section-private.h>

#include "mono-mutex.h"
#include <mono/utils/mono-mutex.h>

/* A critical section is really just like a lightweight mutex. It
* can't be waited for, and doesn't have a handle.
Expand Down
2 changes: 1 addition & 1 deletion mono/io-layer/critical-sections.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
#include <glib.h>
#include <pthread.h>

#include "mono-mutex.h"
#include <mono/utils/mono-mutex.h>

G_BEGIN_DECLS

Expand Down
2 changes: 1 addition & 1 deletion mono/io-layer/event-private.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
#include <glib.h>
#include <pthread.h>

#include <mono/io-layer/mono-mutex.h>
#include <mono/utils/mono-mutex.h>

extern struct _WapiHandleOps _wapi_event_ops;
extern struct _WapiHandleOps _wapi_namedevent_ops;
Expand Down
3 changes: 1 addition & 2 deletions mono/io-layer/events.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,9 @@
#include <mono/io-layer/handles-private.h>
#include <mono/io-layer/misc-private.h>

#include <mono/io-layer/mono-mutex.h>

#include <mono/io-layer/event-private.h>

#include <mono/utils/mono-mutex.h>
#if 0
#define DEBUG(...) g_message(__VA_ARGS__)
#else
Expand Down
2 changes: 1 addition & 1 deletion mono/io-layer/handles.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,13 +32,13 @@
#include <mono/io-layer/wapi.h>
#include <mono/io-layer/wapi-private.h>
#include <mono/io-layer/handles-private.h>
#include <mono/io-layer/mono-mutex.h>
#include <mono/io-layer/misc-private.h>
#include <mono/io-layer/shared.h>
#include <mono/io-layer/collection.h>
#include <mono/io-layer/process-private.h>
#include <mono/io-layer/critical-section-private.h>

#include <mono/utils/mono-mutex.h>
#undef DEBUG_REFS

#if 0
Expand Down
4 changes: 3 additions & 1 deletion mono/io-layer/io-portability.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,11 +25,13 @@
#include <utime.h>
#include <sys/stat.h>

#include <mono/io-layer/mono-mutex.h>
#include <mono/io-layer/error.h>
#include <mono/io-layer/wapi_glob.h>
#include <mono/io-layer/io-portability.h>
#include <mono/utils/mono-io-portability.h>

#include <mono/utils/mono-mutex.h>

#undef DEBUG

int _wapi_open (const char *pathname, int flags, mode_t mode)
Expand Down
2 changes: 1 addition & 1 deletion mono/io-layer/mutexes.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@
#include <mono/io-layer/wapi-private.h>
#include <mono/io-layer/misc-private.h>
#include <mono/io-layer/handles-private.h>
#include <mono/io-layer/mono-mutex.h>
#include <mono/io-layer/mutex-private.h>
#include <mono/utils/mono-mutex.h>

#if 0
#define DEBUG(...) g_message(__VA_ARGS__)
Expand Down
2 changes: 1 addition & 1 deletion mono/io-layer/processes.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -68,14 +68,14 @@
#include <mono/io-layer/wapi-private.h>
#include <mono/io-layer/handles-private.h>
#include <mono/io-layer/misc-private.h>
#include <mono/io-layer/mono-mutex.h>
#include <mono/io-layer/process-private.h>
#include <mono/io-layer/threads.h>
#include <mono/utils/strenc.h>
#include <mono/utils/mono-path.h>
#include <mono/io-layer/timefuncs-private.h>
#include <mono/utils/mono-time.h>
#include <mono/utils/mono-membar.h>
#include <mono/utils/mono-mutex.h>

/* The process' environment strings */
#if defined(__APPLE__) && !defined (__arm__)
Expand Down
3 changes: 2 additions & 1 deletion mono/io-layer/semaphores.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,10 @@
#include <mono/io-layer/wapi-private.h>
#include <mono/io-layer/misc-private.h>
#include <mono/io-layer/handles-private.h>
#include <mono/io-layer/mono-mutex.h>
#include <mono/io-layer/semaphore-private.h>

#include <mono/utils/mono-mutex.h>

#if 0
#define DEBUG(...) g_message(__VA_ARGS__)
#else
Expand Down
3 changes: 2 additions & 1 deletion mono/io-layer/wait.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,10 @@
#include <mono/io-layer/wapi.h>
#include <mono/io-layer/handles-private.h>
#include <mono/io-layer/wapi-private.h>
#include <mono/io-layer/mono-mutex.h>
#include <mono/io-layer/misc-private.h>

#include <mono/utils/mono-mutex.h>

#if 0
#define DEBUG(...) g_message(__VA_ARGS__)
#else
Expand Down
2 changes: 1 addition & 1 deletion mono/io-layer/wthreads.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,13 +25,13 @@
#include <mono/io-layer/wapi-private.h>
#include <mono/io-layer/handles-private.h>
#include <mono/io-layer/misc-private.h>
#include <mono/io-layer/mono-mutex.h>
#include <mono/io-layer/thread-private.h>
#include <mono/io-layer/mutex-private.h>

#include <mono/utils/mono-threads.h>
#include <mono/utils/gc_wrapper.h>
#include <mono/utils/atomic.h>
#include <mono/utils/mono-mutex.h>

#ifdef HAVE_VALGRIND_MEMCHECK_H
#include <valgrind/memcheck.h>
Expand Down
2 changes: 1 addition & 1 deletion mono/metadata/sgen-gc.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ typedef struct _SgenThreadInfo SgenThreadInfo;
#include <mono/utils/dtrace.h>
#include <mono/utils/mono-logger-internal.h>
#include <mono/utils/atomic.h>
#include <mono/io-layer/mono-mutex.h>
#include <mono/utils/mono-mutex.h>
#include <mono/metadata/class-internals.h>
#include <mono/metadata/object-internals.h>
#include <mono/metadata/sgen-conf.h>
Expand Down
2 changes: 1 addition & 1 deletion mono/mini/debugger-agent.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ shutdown sequence.

#ifndef DISABLE_DEBUGGER_AGENT

#include <mono/io-layer/mono-mutex.h>
#include <mono/utils/mono-mutex.h>

/* Definitions to make backporting to 2.6 easier */
//#define MonoInternalThread MonoThread
Expand Down
2 changes: 1 addition & 1 deletion mono/profiler/mono-profiler-iomap.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
#include <mono/metadata/threads.h>
#include <mono/metadata/profiler.h>
#include <mono/metadata/loader.h>
#include <mono/io-layer/mono-mutex.h>
#include <mono/utils/mono-mutex.h>

#define LOCATION_INDENT " "
#define BACKTRACE_SIZE 64
Expand Down
2 changes: 2 additions & 0 deletions mono/utils/Makefile.am
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,8 @@ monoutils_sources = \
mono-math.c \
mono-mmap.c \
mono-mmap.h \
mono-mutex.c \
mono-mutex.h \
mono-networkinterfaces.c \
mono-networkinterfaces.h \
mono-proclib.c \
Expand Down
0 mono/io-layer/mono-mutex.c → mono/utils/mono-mutex.c
View file
File renamed without changes.
0 mono/io-layer/mono-mutex.h → mono/utils/mono-mutex.h
View file
File renamed without changes.

0 comments on commit 9d79602

Please sign in to comment.