diff --git a/api/src/com/cloud/vm/VirtualMachineProfiler.java b/api/src/com/cloud/vm/VirtualMachineProfiler.java new file mode 100644 index 00000000000..09e1dcc7f11 --- /dev/null +++ b/api/src/com/cloud/vm/VirtualMachineProfiler.java @@ -0,0 +1,13 @@ +/** + * + */ +package com.cloud.vm; + +import com.cloud.offering.ServiceOffering; +import com.cloud.template.VirtualMachineTemplate; +import com.cloud.utils.component.Adapter; + +public interface VirtualMachineProfiler extends Adapter { + + VmCharacteristics convert(ServiceOffering offering, VirtualMachineTemplate template); +} diff --git a/utils/src/com/cloud/utils/Journal.java b/utils/src/com/cloud/utils/Journal.java new file mode 100644 index 00000000000..b27f14f7bc3 --- /dev/null +++ b/utils/src/com/cloud/utils/Journal.java @@ -0,0 +1,88 @@ +/** + * + */ +package com.cloud.utils; + +import java.util.ArrayList; + +import org.apache.log4j.Level; +import org.apache.log4j.Logger; + +/** + * Journal is used to kept what has happened during a process so someone can track + * what happens during a process. + * + */ +public class Journal { + String _name; + ArrayList> _entries; + + public Journal(String name) { + _name = name; + _entries = new ArrayList>(); + } + + + final private void log(String msg, Object... params) { + Pair entry = new Pair(msg, params); + assert msg != null : "Message can not be null or else it's useless!"; + _entries.add(entry); + } + + public void record(String msg, Object... params) { + log(msg, params); + } + + public void record(Logger logger, Level p, String msg, Object... params) { + if (logger.getLevel().isGreaterOrEqual(p)) { + StringBuilder buf = new StringBuilder(); + toString(buf, msg, params); + String entry = buf.toString(); + log(entry); + logger.log(p, entry); + } else { + log(msg, params); + } + } + + protected void toString(StringBuilder buf, String msg, Object[] params) { + buf.append(msg); + if (params != null) { + buf.append(" - "); + int i = 0; + for (Object obj : params) { + buf.append('P').append(i).append('='); + buf.append(obj != null ? obj.toString() : "null"); + buf.append(", "); + } + buf.delete(buf.length() - 2, buf.length()); + } + } + + public String toString(String separator) { + StringBuilder buf = new StringBuilder(_name).append(": "); + for (Pair entry : _entries) { + toString(buf, entry.first(), entry.second()); + buf.append(separator); + } + return buf.toString(); + } + + @Override + public String toString() { + return toString("; "); + } + + public static class LogJournal extends Journal { + Logger _logger; + public LogJournal(String name, Logger logger) { + super(name); + _logger = logger; + } + + @Override + public void record(String msg, Object... params) { + record(_logger, Level.DEBUG, msg, params); + } + } +} diff --git a/utils/src/com/cloud/utils/component/Injector.java b/utils/src/com/cloud/utils/component/Injector.java new file mode 100644 index 00000000000..e278ab5ba08 --- /dev/null +++ b/utils/src/com/cloud/utils/component/Injector.java @@ -0,0 +1,19 @@ +/** + * + */ +package com.cloud.utils.component; + +import java.lang.annotation.Annotation; +import java.lang.reflect.AnnotatedElement; + +/** + * Injector implements customized Injectors for ComponentLocator. + * + */ +public interface Injector { + /** + * Can this injector handle injecting into this type of class? + */ + boolean canInject(AnnotatedElement element, Annotation ann); + +}