aboutsummaryrefslogtreecommitdiff
path: root/libphobos/src/std/experimental/logger/multilogger.d
diff options
context:
space:
mode:
authorIain Buclaw <ibuclaw@gcc.gnu.org>2018-10-28 19:51:47 +0000
committerIain Buclaw <ibuclaw@gcc.gnu.org>2018-10-28 19:51:47 +0000
commitb4c522fabd0df7be08882d2207df8b2765026110 (patch)
treeb5ffc312b0a441c1ba24323152aec463fdbe5e9f /libphobos/src/std/experimental/logger/multilogger.d
parent01ce9e31a02c8039d88e90f983735104417bf034 (diff)
downloadgcc-b4c522fabd0df7be08882d2207df8b2765026110.zip
gcc-b4c522fabd0df7be08882d2207df8b2765026110.tar.gz
gcc-b4c522fabd0df7be08882d2207df8b2765026110.tar.bz2
Add D front-end, libphobos library, and D2 testsuite.
ChangeLog: * Makefile.def (target_modules): Add libphobos. (flags_to_pass): Add GDC, GDCFLAGS, GDC_FOR_TARGET and GDCFLAGS_FOR_TARGET. (dependencies): Make libphobos depend on libatomic, libbacktrace configure, and zlib configure. (language): Add language d. * Makefile.in: Rebuild. * Makefile.tpl (BUILD_EXPORTS): Add GDC and GDCFLAGS. (HOST_EXPORTS): Add GDC. (POSTSTAGE1_HOST_EXPORTS): Add GDC and GDC_FOR_BUILD. (BASE_TARGET_EXPORTS): Add GDC. (GDC_FOR_BUILD, GDC, GDCFLAGS): New variables. (GDC_FOR_TARGET, GDC_FLAGS_FOR_TARGET): New variables. (EXTRA_HOST_FLAGS): Add GDC. (STAGE1_FLAGS_TO_PASS): Add GDC. (EXTRA_TARGET_FLAGS): Add GDC and GDCFLAGS. * config-ml.in: Treat GDC and GDCFLAGS like other compiler/flag environment variables. * configure: Rebuild. * configure.ac: Add target-libphobos to target_libraries. Set and substitute GDC_FOR_BUILD and GDC_FOR_TARGET. config/ChangeLog: * multi.m4: Set GDC. gcc/ChangeLog: * Makefile.in (tm_d_file_list, tm_d_include_list): New variables. (TM_D_H, D_TARGET_DEF, D_TARGET_H, D_TARGET_OBJS): New variables. (tm_d.h, cs-tm_d.h, default-d.o): New rules. (d/d-target-hooks-def.h, s-d-target-hooks-def-h): New rules. (s-tm-texi): Also check timestamp on d-target.def. (generated_files): Add TM_D_H and d-target-hooks-def.h. (build/genhooks.o): Also depend on D_TARGET_DEF. * config.gcc (tm_d_file, d_target_objs, target_has_targetdm): New variables. * config/aarch64/aarch64-d.c: New file. * config/aarch64/aarch64-linux.h (GNU_USER_TARGET_D_CRITSEC_SIZE): Define. * config/aarch64/aarch64-protos.h (aarch64_d_target_versions): New prototype. * config/aarch64/aarch64.h (TARGET_D_CPU_VERSIONS): Define. * config/aarch64/t-aarch64 (aarch64-d.o): New rule. * config/arm/arm-d.c: New file. * config/arm/arm-protos.h (arm_d_target_versions): New prototype. * config/arm/arm.h (TARGET_D_CPU_VERSIONS): Define. * config/arm/linux-eabi.h (EXTRA_TARGET_D_OS_VERSIONS): Define. * config/arm/t-arm (arm-d.o): New rule. * config/default-d.c: New file. * config/glibc-d.c: New file. * config/gnu.h (GNU_USER_TARGET_D_OS_VERSIONS): Define. * config/i386/i386-d.c: New file. * config/i386/i386-protos.h (ix86_d_target_versions): New prototype. * config/i386/i386.h (TARGET_D_CPU_VERSIONS): Define. * config/i386/linux-common.h (EXTRA_TARGET_D_OS_VERSIONS): Define. (GNU_USER_TARGET_D_CRITSEC_SIZE): Define. * config/i386/t-i386 (i386-d.o): New rule. * config/kfreebsd-gnu.h (GNU_USER_TARGET_D_OS_VERSIONS): Define. * config/kopensolaris-gnu.h (GNU_USER_TARGET_D_OS_VERSIONS): Define. * config/linux-android.h (ANDROID_TARGET_D_OS_VERSIONS): Define. * config/linux.h (GNU_USER_TARGET_D_OS_VERSIONS): Define. * config/mips/linux-common.h (EXTRA_TARGET_D_OS_VERSIONS): Define. * config/mips/mips-d.c: New file. * config/mips/mips-protos.h (mips_d_target_versions): New prototype. * config/mips/mips.h (TARGET_D_CPU_VERSIONS): Define. * config/mips/t-mips (mips-d.o): New rule. * config/powerpcspe/linux.h (GNU_USER_TARGET_D_OS_VERSIONS): Define. * config/powerpcspe/linux64.h (GNU_USER_TARGET_D_OS_VERSIONS): Define. * config/powerpcspe/powerpcspe-d.c: New file. * config/powerpcspe/powerpcspe-protos.h (rs6000_d_target_versions): New prototype. * config/powerpcspe/powerpcspe.c (rs6000_output_function_epilogue): Support GNU D by using 0 as the language type. * config/powerpcspe/powerpcspe.h (TARGET_D_CPU_VERSIONS): Define. * config/powerpcspe/t-powerpcspe (powerpcspe-d.o): New rule. * config/riscv/riscv-d.c: New file. * config/riscv/riscv-protos.h (riscv_d_target_versions): New prototype. * config/riscv/riscv.h (TARGET_D_CPU_VERSIONS): Define. * config/riscv/t-riscv (riscv-d.o): New rule. * config/rs6000/linux.h (GNU_USER_TARGET_D_OS_VERSIONS): Define. * config/rs6000/linux64.h (GNU_USER_TARGET_D_OS_VERSIONS): Define. * config/rs6000/rs6000-d.c: New file. * config/rs6000/rs6000-protos.h (rs6000_d_target_versions): New prototype. * config/rs6000/rs6000.c (rs6000_output_function_epilogue): Support GNU D by using 0 as the language type. * config/rs6000/rs6000.h (TARGET_D_CPU_VERSIONS): Define. * config/rs6000/t-rs6000 (rs6000-d.o): New rule. * config/s390/s390-d.c: New file. * config/s390/s390-protos.h (s390_d_target_versions): New prototype. * config/s390/s390.h (TARGET_D_CPU_VERSIONS): Define. * config/s390/t-s390 (s390-d.o): New rule. * config/sparc/sparc-d.c: New file. * config/sparc/sparc-protos.h (sparc_d_target_versions): New prototype. * config/sparc/sparc.h (TARGET_D_CPU_VERSIONS): Define. * config/sparc/t-sparc (sparc-d.o): New rule. * config/t-glibc (glibc-d.o): New rule. * configure: Regenerated. * configure.ac (tm_d_file): New variable. (tm_d_file_list, tm_d_include_list, d_target_objs): Add substitutes. * doc/contrib.texi (Contributors): Add self for the D frontend. * doc/frontends.texi (G++ and GCC): Mention D as a supported language. * doc/install.texi (Configuration): Mention libphobos as an option for --enable-shared. Mention d as an option for --enable-languages. (Testing): Mention check-d as a target. * doc/invoke.texi (Overall Options): Mention .d, .dd, and .di as file name suffixes. Mention d as a -x option. * doc/sourcebuild.texi (Top Level): Mention libphobos. * doc/standards.texi (Standards): Add section on D language. * doc/tm.texi: Regenerated. * doc/tm.texi.in: Add @node for D language and ABI, and @hook for TARGET_CPU_VERSIONS, TARGET_D_OS_VERSIONS, and TARGET_D_CRITSEC_SIZE. * dwarf2out.c (is_dlang): New function. (gen_compile_unit_die): Use DW_LANG_D for D. (declare_in_namespace): Return module die for D, instead of adding extra declarations into the namespace. (gen_namespace_die): Generate DW_TAG_module for D. (gen_decl_die): Handle CONST_DECLSs for D. (dwarf2out_decl): Likewise. (prune_unused_types_walk_local_classes): Handle DW_tag_interface_type. (prune_unused_types_walk): Handle DW_tag_interface_type same as other kinds of aggregates. * gcc.c (default_compilers): Add entries for .d, .dd and .di. * genhooks.c: Include d/d-target.def. gcc/po/ChangeLog: * EXCLUDES: Add sources from d/dmd. gcc/testsuite/ChangeLog: * gcc.misc-tests/help.exp: Add D to option descriptions check. * gdc.dg/asan/asan.exp: New file. * gdc.dg/asan/gdc272.d: New test. * gdc.dg/compilable.d: New test. * gdc.dg/dg.exp: New file. * gdc.dg/gdc254.d: New test. * gdc.dg/gdc260.d: New test. * gdc.dg/gdc270a.d: New test. * gdc.dg/gdc270b.d: New test. * gdc.dg/gdc282.d: New test. * gdc.dg/gdc283.d: New test. * gdc.dg/imports/gdc170.d: New test. * gdc.dg/imports/gdc231.d: New test. * gdc.dg/imports/gdc239.d: New test. * gdc.dg/imports/gdc241a.d: New test. * gdc.dg/imports/gdc241b.d: New test. * gdc.dg/imports/gdc251a.d: New test. * gdc.dg/imports/gdc251b.d: New test. * gdc.dg/imports/gdc253.d: New test. * gdc.dg/imports/gdc254a.d: New test. * gdc.dg/imports/gdc256.d: New test. * gdc.dg/imports/gdc27.d: New test. * gdc.dg/imports/gdcpkg256/package.d: New test. * gdc.dg/imports/runnable.d: New test. * gdc.dg/link.d: New test. * gdc.dg/lto/lto.exp: New file. * gdc.dg/lto/ltotests_0.d: New test. * gdc.dg/lto/ltotests_1.d: New test. * gdc.dg/runnable.d: New test. * gdc.dg/simd.d: New test. * gdc.test/gdc-test.exp: New file. * lib/gdc-dg.exp: New file. * lib/gdc.exp: New file. libphobos/ChangeLog: * Makefile.am: New file. * Makefile.in: New file. * acinclude.m4: New file. * aclocal.m4: New file. * config.h.in: New file. * configure: New file. * configure.ac: New file. * d_rules.am: New file. * libdruntime/Makefile.am: New file. * libdruntime/Makefile.in: New file. * libdruntime/__entrypoint.di: New file. * libdruntime/__main.di: New file. * libdruntime/gcc/attribute.d: New file. * libdruntime/gcc/backtrace.d: New file. * libdruntime/gcc/builtins.d: New file. * libdruntime/gcc/config.d.in: New file. * libdruntime/gcc/deh.d: New file. * libdruntime/gcc/libbacktrace.d.in: New file. * libdruntime/gcc/unwind/arm.d: New file. * libdruntime/gcc/unwind/arm_common.d: New file. * libdruntime/gcc/unwind/c6x.d: New file. * libdruntime/gcc/unwind/generic.d: New file. * libdruntime/gcc/unwind/package.d: New file. * libdruntime/gcc/unwind/pe.d: New file. * m4/autoconf.m4: New file. * m4/druntime.m4: New file. * m4/druntime/cpu.m4: New file. * m4/druntime/libraries.m4: New file. * m4/druntime/os.m4: New file. * m4/gcc_support.m4: New file. * m4/gdc.m4: New file. * m4/libtool.m4: New file. * src/Makefile.am: New file. * src/Makefile.in: New file. * src/libgphobos.spec.in: New file. * testsuite/Makefile.am: New file. * testsuite/Makefile.in: New file. * testsuite/config/default.exp: New file. * testsuite/lib/libphobos-dg.exp: New file. * testsuite/lib/libphobos.exp: New file. * testsuite/testsuite_flags.in: New file. From-SVN: r265573
Diffstat (limited to 'libphobos/src/std/experimental/logger/multilogger.d')
-rw-r--r--libphobos/src/std/experimental/logger/multilogger.d197
1 files changed, 197 insertions, 0 deletions
diff --git a/libphobos/src/std/experimental/logger/multilogger.d b/libphobos/src/std/experimental/logger/multilogger.d
new file mode 100644
index 0000000..ed9cfd9
--- /dev/null
+++ b/libphobos/src/std/experimental/logger/multilogger.d
@@ -0,0 +1,197 @@
+///
+module std.experimental.logger.multilogger;
+
+import std.experimental.logger.core;
+import std.experimental.logger.filelogger;
+
+/** This Element is stored inside the $(D MultiLogger) and associates a
+$(D Logger) to a $(D string).
+*/
+struct MultiLoggerEntry
+{
+ string name; /// The name if the $(D Logger)
+ Logger logger; /// The stored $(D Logger)
+}
+
+/** MultiLogger logs to multiple $(D Logger). The $(D Logger)s are stored in an
+$(D Logger[]) in their order of insertion.
+
+Every data logged to this $(D MultiLogger) will be distributed to all the $(D
+Logger)s inserted into it. This $(D MultiLogger) implementation can
+hold multiple $(D Logger)s with the same name. If the method $(D removeLogger)
+is used to remove a $(D Logger) only the first occurrence with that name will
+be removed.
+*/
+class MultiLogger : Logger
+{
+ /** A constructor for the $(D MultiLogger) Logger.
+
+ Params:
+ lv = The $(D LogLevel) for the $(D MultiLogger). By default the
+ $(D LogLevel) for $(D MultiLogger) is $(D LogLevel.all).
+
+ Example:
+ -------------
+ auto l1 = new MultiLogger(LogLevel.trace);
+ -------------
+ */
+ this(const LogLevel lv = LogLevel.all) @safe
+ {
+ super(lv);
+ }
+
+ /** This member holds all $(D Logger)s stored in the $(D MultiLogger).
+
+ When inheriting from $(D MultiLogger) this member can be used to gain
+ access to the stored $(D Logger).
+ */
+ protected MultiLoggerEntry[] logger;
+
+ /** This method inserts a new Logger into the $(D MultiLogger).
+
+ Params:
+ name = The name of the $(D Logger) to insert.
+ newLogger = The $(D Logger) to insert.
+ */
+ void insertLogger(string name, Logger newLogger) @safe
+ {
+ this.logger ~= MultiLoggerEntry(name, newLogger);
+ }
+
+ /** This method removes a Logger from the $(D MultiLogger).
+
+ Params:
+ toRemove = The name of the $(D Logger) to remove. If the $(D Logger)
+ is not found $(D null) will be returned. Only the first occurrence of
+ a $(D Logger) with the given name will be removed.
+
+ Returns: The removed $(D Logger).
+ */
+ Logger removeLogger(in char[] toRemove) @safe
+ {
+ import std.algorithm.mutation : copy;
+ import std.range.primitives : back, popBack;
+ for (size_t i = 0; i < this.logger.length; ++i)
+ {
+ if (this.logger[i].name == toRemove)
+ {
+ Logger ret = this.logger[i].logger;
+ this.logger[i] = this.logger.back;
+ this.logger.popBack();
+
+ return ret;
+ }
+ }
+
+ return null;
+ }
+
+ /* The override to pass the payload to all children of the
+ $(D MultiLoggerBase).
+ */
+ override protected void writeLogMsg(ref LogEntry payload) @safe
+ {
+ foreach (it; this.logger)
+ {
+ /* We don't perform any checks here to avoid race conditions.
+ Instead the child will check on its own if its log level matches
+ and assume LogLevel.all for the globalLogLevel (since we already
+ know the message passes this test).
+ */
+ it.logger.forwardMsg(payload);
+ }
+ }
+}
+
+@safe unittest
+{
+ import std.exception : assertThrown;
+ import std.experimental.logger.nulllogger;
+ auto a = new MultiLogger;
+ auto n0 = new NullLogger();
+ auto n1 = new NullLogger();
+ a.insertLogger("zero", n0);
+ a.insertLogger("one", n1);
+
+ auto n0_1 = a.removeLogger("zero");
+ assert(n0_1 is n0);
+ auto n = a.removeLogger("zero");
+ assert(n is null);
+
+ auto n1_1 = a.removeLogger("one");
+ assert(n1_1 is n1);
+ n = a.removeLogger("one");
+ assert(n is null);
+}
+
+@safe unittest
+{
+ auto a = new MultiLogger;
+ auto n0 = new TestLogger;
+ auto n1 = new TestLogger;
+ a.insertLogger("zero", n0);
+ a.insertLogger("one", n1);
+
+ a.log("Hello TestLogger"); int line = __LINE__;
+ assert(n0.msg == "Hello TestLogger");
+ assert(n0.line == line);
+ assert(n1.msg == "Hello TestLogger");
+ assert(n1.line == line);
+}
+
+// Issue #16
+@system unittest
+{
+ import std.file : deleteme;
+ import std.stdio : File;
+ import std.string : indexOf;
+ string logName = deleteme ~ __FUNCTION__ ~ ".log";
+ auto logFileOutput = File(logName, "w");
+ scope(exit)
+ {
+ import std.file : remove;
+ logFileOutput.close();
+ remove(logName);
+ }
+ auto traceLog = new FileLogger(logFileOutput, LogLevel.all);
+ auto infoLog = new TestLogger(LogLevel.info);
+
+ auto root = new MultiLogger(LogLevel.all);
+ root.insertLogger("fileLogger", traceLog);
+ root.insertLogger("stdoutLogger", infoLog);
+
+ string tMsg = "A trace message";
+ root.trace(tMsg); int line1 = __LINE__;
+
+ assert(infoLog.line != line1);
+ assert(infoLog.msg != tMsg);
+
+ string iMsg = "A info message";
+ root.info(iMsg); int line2 = __LINE__;
+
+ assert(infoLog.line == line2);
+ assert(infoLog.msg == iMsg, infoLog.msg ~ ":" ~ iMsg);
+
+ logFileOutput.close();
+ logFileOutput = File(logName, "r");
+ assert(logFileOutput.isOpen);
+ assert(!logFileOutput.eof);
+
+ auto line = logFileOutput.readln();
+ assert(line.indexOf(tMsg) != -1, line ~ ":" ~ tMsg);
+ assert(!logFileOutput.eof);
+ line = logFileOutput.readln();
+ assert(line.indexOf(iMsg) != -1, line ~ ":" ~ tMsg);
+}
+
+@safe unittest
+{
+ auto dl = cast(FileLogger) sharedLog;
+ assert(dl !is null);
+ assert(dl.logLevel == LogLevel.all);
+ assert(globalLogLevel == LogLevel.all);
+
+ auto tl = cast(StdForwardLogger) stdThreadLocalLog;
+ assert(tl !is null);
+ stdThreadLocalLog.logLevel = LogLevel.all;
+}