Merge lp:~cyphermox/mtp/0.0.3-logging-inotify into lp:mtp

[Mathieu Trudel-Lapierre]

- Do better logging
- Listen to inotify changes for filesystem modifications happening outside the MTP protocol.

- Do better logging
- Listen to inotify changes for filesystem modifications happening outside the MTP protocol.

[lp:~cyphermox/mtp/0.0.3-logging-inotify]

47. By Mathieu Trudel-Lapierre on 2014-04-01

Drop useless function read_more_events()

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:47
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~mathieu-tl/mtp/0.0.3-logging-inotify/+merge/213681/+edit-commit-message

http://jenkins.qa.ubuntu.com/job/mtp-ci/15/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mtp-trusty-amd64-ci/5
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mtp-trusty-armhf-ci/5
        deb: http://jenkins.qa.ubuntu.com/job/mtp-trusty-armhf-ci/5/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mtp-trusty-i386-ci/5

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/mtp-ci/15/rebuild

review: Needs Fixing (continuous-integration)

[Ricardo Salveti (rsalveti)]

Works fine, just that as a side effect we don't have a verbose log output by default anymore (but expected).

review: Approve

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2013-09-13 16:37:39 +0000
+++ CMakeLists.txt	2014-04-01 15:51:14 +0000
@@ -2,6 +2,8 @@
 
 cmake_minimum_required(VERSION 2.8)
 
+include(FindPkgConfig)
+
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
 
 add_definitions(-DMTP_DEVICE -DMTP_HOST)
@@ -10,7 +12,8 @@
 set(MTP_VERSION_MINOR 0)
 set(MTP_VERSION_PATCH 0)
 
-find_package(Boost REQUIRED COMPONENTS system filesystem unit_test_framework)
+find_package(Boost REQUIRED COMPONENTS thread system filesystem unit_test_framework)
+pkg_check_modules(GLOG libglog)
 
 set(
     MTP_HEADERS
@@ -66,6 +69,7 @@
 target_link_libraries(
   mtpserver
   android-properties
+  ${GLOG_LIBRARIES}
 )
 
 set_target_properties(

=== modified file 'debian/changelog'
--- debian/changelog	2014-03-07 19:40:09 +0000
+++ debian/changelog	2014-04-01 15:51:14 +0000
@@ -1,3 +1,12 @@
+mtp (0.0.3+14.04.20140326-0ubuntu1) UNRELEASED; urgency=medium
+
+  * New release:
+    - Do better logging; with logging levels for verbosity.
+    - Listen to inotify events to know about changes happening on the
+      filesystem but not initiated by the MTP protocol.
+
+ -- Mathieu Trudel-Lapierre <[e-mail]>  Thu, 27 Mar 2014 11:44:08 -0400
+
 mtp (0.0.2+14.04.20140307-0ubuntu1) trusty; urgency=low
 
   [ Oliver Grawert ]

=== modified file 'debian/control'
--- debian/control	2013-09-13 16:37:39 +0000
+++ debian/control	2014-04-01 15:51:14 +0000
@@ -5,10 +5,13 @@
 XSBC-Original-Maintainer: Thomas Voß <[e-mail]>
 Build-Depends: debhelper (>= 9), 
                cmake, 
+               pkg-config,
                libboost-dev,
+               libboost-thread-dev,
                libboost-filesystem-dev,
                libboost-test-dev,
                libandroid-properties-dev,
+               libgoogle-glog-dev,
 Standards-Version: 3.9.4
 Homepage: http://launchpad.net/mtp
 # If you aren't ~phablet-team but need to upload packaging changes,

=== modified file 'debian/mtp-server.conf'
--- debian/mtp-server.conf	2014-03-07 13:26:41 +0000
+++ debian/mtp-server.conf	2014-04-01 15:51:14 +0000
@@ -3,6 +3,8 @@
 start on :sys:android-mtp-on or :sys:android-usb-connected
 stop on desktop-end or :sys:android-mtp-off
 
+env GOOGLE_LOGTOSTDERR=1
+
 respawn
 
 exec /usr/bin/mtp-server

=== modified file 'include/MtpDatabase.h'
--- include/MtpDatabase.h	2013-11-27 17:21:38 +0000
+++ include/MtpDatabase.h	2014-04-01 15:51:14 +0000
@@ -18,6 +18,7 @@
 #define _MTP_DATABASE_H
 
 #include "MtpTypes.h"
+#include "MtpServer.h"
 
 namespace android {
 
@@ -106,7 +107,7 @@
 
     virtual MtpProperty*            getDevicePropertyDesc(MtpDeviceProperty property) = 0;
 
-    virtual void                    sessionStarted() = 0;
+    virtual void                    sessionStarted(MtpServer* server) = 0;
 
     virtual void                    sessionEnded() = 0;
 };

=== modified file 'include/MtpTypes.h'
--- include/MtpTypes.h	2013-06-13 10:22:21 +0000
+++ include/MtpTypes.h	2014-04-01 15:51:14 +0000
@@ -25,12 +25,6 @@
 #include <thread>
 #include <vector>
 
-// TODO(tvoss): Find a more sensible approach here.
-#define ALOGD(log, ...) fprintf(stdout, log, ##__VA_ARGS__)
-#define ALOGI(log, ...) fprintf(stdout, log, ##__VA_ARGS__)
-#define ALOGE(log, ...) fprintf(stdout, log, ##__VA_ARGS__)
-#define ALOGV(log, ...) fprintf(stdout, log, ##__VA_ARGS__)
-
 namespace android {
 
 typedef int32_t int128_t[4];

=== modified file 'libusbhost/src/usbhost.c'
--- libusbhost/src/usbhost.c	2013-06-13 10:22:21 +0000
+++ libusbhost/src/usbhost.c	2014-04-01 15:51:14 +0000
@@ -19,9 +19,6 @@
 
 #ifdef USE_LIBLOG
 #define LOG_TAG "usbhost"
-#include "utils/Log.h"
-#define D ALOGD
-#else
 #define D printf
 #endif
 

=== modified file 'server/CMakeLists.txt'
--- server/CMakeLists.txt	2013-09-13 16:37:39 +0000
+++ server/CMakeLists.txt	2014-04-01 15:51:14 +0000
@@ -13,8 +13,10 @@
     usbhost
     android-properties
     ${Boost_LIBRARIES}
+    ${Boost_thread_LIBRARIES}
     ${Boost_system_LIBRARIES}
     ${Boost_filesystem_LIBRARIES}
+    ${GLOG_LIBRARIES}
 )
 
 install(

=== modified file 'server/UbuntuMtpDatabase.h'
--- server/UbuntuMtpDatabase.h	2013-12-03 21:18:37 +0000
+++ server/UbuntuMtpDatabase.h	2014-04-01 15:51:14 +0000
@@ -24,6 +24,7 @@
 #include <MtpStringBuffer.h>
 #include <MtpObjectInfo.h>
 #include <MtpProperty.h>
+#include <MtpDebug.h>
 
 #include <cstdlib>
 #include <cstring>
@@ -33,7 +34,11 @@
 #include <string>
 #include <tuple>
 #include <exception>
+#include <sys/inotify.h>
 
+#include <boost/thread.hpp>
+#include <boost/asio.hpp>
+#include <boost/bind.hpp>
 #include <boost/algorithm/string.hpp>
 #include <boost/assign/list_of.hpp>
 #include <boost/foreach.hpp>
@@ -41,6 +46,9 @@
 #include <boost/range/adaptors.hpp>
 #include <boost/range/algorithm.hpp>
 
+#include <glog/logging.h>
+
+namespace asio = boost::asio;
 using namespace boost::filesystem;
 
 namespace android
@@ -55,11 +63,17 @@
         size_t object_size;
         std::string display_name;
         std::string path;
+        int watch_fd;
     };
 
+    MtpServer* local_server;
     uint32_t counter;
     std::map<MtpObjectHandle, DbEntry> db;
     std::map<std::string, MtpObjectFormat> formats = boost::assign::map_list_of
+        (".gif", MTP_FORMAT_GIF)
+        (".png", MTP_FORMAT_PNG)
+        (".jpeg", MTP_FORMAT_JFIF)
+        (".tiff", MTP_FORMAT_TIFF)
         (".ogg", MTP_FORMAT_OGG)
         (".mp3", MTP_FORMAT_MP3)
         (".wav", MTP_FORMAT_WAV)
@@ -67,11 +81,18 @@
         (".aac", MTP_FORMAT_AAC)
         (".flac", MTP_FORMAT_FLAC);
 
+    boost::thread notifier_thread;
+    boost::thread io_service_thread;
+
+    asio::io_service io_svc;
+    asio::posix::stream_descriptor stream_desc;
+    asio::streambuf buf;
+    int inotify_fd;
+
     MtpObjectFormat guess_object_format(std::string extension)
     {
         std::map<std::string, MtpObjectFormat>::iterator it;
 
-        std::cout << __PRETTY_FUNCTION__ << "  extension: " << extension << std::endl;
         it = formats.find(extension);
         if (it == formats.end()) {
             boost::to_upper(extension);
@@ -84,6 +105,58 @@
 	return it->second;
     }
 
+    int setup_dir_inotify(path p)
+    {
+        return inotify_add_watch(inotify_fd,
+                                 p.string().c_str(),
+                                 IN_MODIFY | IN_CREATE | IN_DELETE);
+    }
+
+    
+    void add_file_entry(path p, MtpObjectHandle parent)
+    {
+        MtpObjectHandle handle = counter;
+        DbEntry entry;
+
+        counter++;
+
+        if (is_directory(p)) {
+            entry.storage_id = MTP_STORAGE_FIXED_RAM;
+            entry.parent = parent;
+            entry.display_name = std::string(p.filename().string());
+            entry.path = p.string();
+            entry.object_format = MTP_FORMAT_ASSOCIATION;
+            entry.object_size = 0;
+            entry.watch_fd = setup_dir_inotify(p);
+
+            db.insert( std::pair<MtpObjectHandle, DbEntry>(handle, entry) );
+
+            if (local_server)
+                local_server->sendObjectAdded(handle);
+
+            parse_directory (p, handle);
+        } else {
+            try {
+                entry.storage_id = MTP_STORAGE_FIXED_RAM;
+                entry.parent = parent;
+                entry.display_name = std::string(p.filename().string());
+                entry.path = p.string();
+                entry.object_format = guess_object_format(p.extension().string());
+                entry.object_size = file_size(p);
+
+                VLOG(1) << "Adding \"" << p.string() << "\"";
+
+                db.insert( std::pair<MtpObjectHandle, DbEntry>(handle, entry) );
+
+                if (local_server)
+                    local_server->sendObjectAdded(handle);
+
+            } catch (const filesystem_error& ex) {
+                PLOG(WARNING) << "There was an error reading file properties";
+            }
+        }
+    }
+
     void parse_directory(path p, MtpObjectHandle parent)
     {
 	DbEntry entry;
@@ -93,32 +166,7 @@
 
         for (std::vector<path>::const_iterator it(v.begin()), it_end(v.end()); it != it_end; ++it)
         {
-            MtpObjectHandle handle = counter;
-
-            counter++;
-
-            std::cout << "   " << *it << " handle: " << handle << " parent: " << parent << std::endl;
-
-            entry.storage_id = MTP_STORAGE_FIXED_RAM;
-            entry.parent = parent;
-            entry.display_name = std::string(it->filename().string());
-            entry.path = it->string();
-
-            if (is_regular_file (*it)) {
-                entry.object_format = guess_object_format(it->extension().string());
-                entry.object_size = file_size(*it);
-
-                std::cout << " format: " << std::hex << entry.object_format << std::endl;
-
-                db.insert( std::pair<MtpObjectHandle, DbEntry>(handle, entry) );
-            } else if (is_directory (*it)) {
-                entry.object_format = MTP_FORMAT_ASSOCIATION;
-                entry.object_size = 0;
-
-                db.insert( std::pair<MtpObjectHandle, DbEntry>(handle, entry) );
-
-                parse_directory (*it, handle);
-	    }
+            add_file_entry(*it, parent);
         }
     }
 
@@ -131,45 +179,135 @@
         try {
             if (exists(p)) {
                 if (is_directory(p)) {
-                    std::cout << p << " is a directory containing:\n";
-
                     entry.storage_id = MTP_STORAGE_FIXED_RAM;
                     entry.parent = MTP_PARENT_ROOT;
                     entry.display_name = std::string(p.filename().string());
                     entry.path = p.string();
                     entry.object_format = MTP_FORMAT_ASSOCIATION;
                     entry.object_size = 0;
+                    entry.watch_fd = setup_dir_inotify(p);
 
                     db.insert( std::pair<MtpObjectHandle, DbEntry>(handle, entry) );
 
                     parse_directory (p, handle);
                 }
             } else
-                std::cout << p << " does not exist\n";
+                LOG(WARNING) << p << " does not exist\n";
         }
         catch (const filesystem_error& ex) {
-            std::cout << ex.what() << '\n';
-        }
-
+            LOG(ERROR) << ex.what();
+        }
+
+    }
+
+    void read_more_notify()
+    {
+        stream_desc.async_read_some(buf.prepare(buf.max_size()),
+                                    boost::bind(&UbuntuMtpDatabase::inotify_handler,
+                                                this,
+                                                asio::placeholders::error,
+                                                asio::placeholders::bytes_transferred));
+    }
+
+    void inotify_handler(const boost::system::error_code&,
+                        std::size_t transferred)
+    {
+        size_t processed = 0;
+     
+        while(transferred - processed >= sizeof(inotify_event))
+        {
+            const char* cdata = processed + asio::buffer_cast<const char*>(buf.data());
+            const inotify_event* ievent = reinterpret_cast<const inotify_event*>(cdata);
+            MtpObjectHandle parent;
+     
+            processed += sizeof(inotify_event) + ievent->len;
+     
+            BOOST_FOREACH(MtpObjectHandle i, db | boost::adaptors::map_keys) {
+                if (db.at(i).watch_fd == ievent->wd) {
+                    parent = i;
+                    break;
+                }
+            }
+
+            path p(db.at(parent).path + "/" + ievent->name);
+
+            if(ievent->len > 0 && ievent->mask & IN_MODIFY)
+            {
+                VLOG(2) << __PRETTY_FUNCTION__ << ": file modified: " << p.string();
+                BOOST_FOREACH(MtpObjectHandle i, db | boost::adaptors::map_keys) {
+                    if (db.at(i).path == p.string()) {
+                        try {
+                            VLOG(2) << "new size: " << file_size(p);
+                            db.at(i).object_size = file_size(p);
+                        } catch (const filesystem_error& ex) {
+                            PLOG(WARNING) << "There was an error reading file properties";
+                        }
+                    }
+                }
+            }
+            else if(ievent->len > 0 && ievent->mask & IN_CREATE)
+            {
+                VLOG(2) << __PRETTY_FUNCTION__ << ": file created: " << p.string();
+
+                /* try to deal with it as if it was a file. */
+                add_file_entry(p, parent);
+            }
+            else if(ievent->len > 0 && ievent->mask & IN_DELETE)
+            {
+                VLOG(2) << __PRETTY_FUNCTION__ << ": file deleted: " << p.string();
+                BOOST_FOREACH(MtpObjectHandle i, db | boost::adaptors::map_keys) {
+                    if (db.at(i).path == p.string()) {
+                        VLOG(2) << "deleting file at handle " << i;
+                        deleteFile(i);
+                        if (local_server)
+                            local_server->sendObjectRemoved(i);
+                        break;
+                    }
+                }
+            }
+        }
+     
+        read_more_notify();
     }
 
 public:
-    UbuntuMtpDatabase(const char *dir) : counter(1)
+    UbuntuMtpDatabase(const char *dir):
+        counter(1),
+        stream_desc(io_svc),
+        buf(1024)
     {
 	std::string basedir (dir);
 
+        local_server = nullptr;
+
+        inotify_fd = inotify_init();
+        if (inotify_fd <= 0)
+            PLOG(FATAL) << "Unable to initialize inotify";
+
+        stream_desc.assign(inotify_fd);
+
 	db = std::map<MtpObjectHandle, DbEntry>();
 
+        notifier_thread = boost::thread(&UbuntuMtpDatabase::read_more_notify,
+                                       this);
+
 	readFiles(basedir + "/Documents");
 	readFiles(basedir + "/Music");
 	readFiles(basedir + "/Videos");
 	readFiles(basedir + "/Pictures");
 	readFiles(basedir + "/Downloads");
-	
-        std::cout << __PRETTY_FUNCTION__ << ": object count:" << db.size() << std::endl;
-    }
-
-    virtual ~UbuntuMtpDatabase() {}
+
+        LOG(INFO) << "Added " << counter << " entries to the database.";
+
+        io_service_thread = boost::thread(boost::bind(&asio::io_service::run, &io_svc));
+    }
+
+    virtual ~UbuntuMtpDatabase() {
+        io_svc.stop();
+        notifier_thread.detach();
+        io_service_thread.join();
+        close(inotify_fd);
+    }
 
     // called from SendObjectInfo to reserve a database entry for the incoming file
     virtual MtpObjectHandle beginSendObject(
@@ -186,7 +324,7 @@
         if (parent == 0)
             return kInvalidObjectHandle;
 
-        std::cout << __PRETTY_FUNCTION__ << ": " << path << " - " << parent << std::endl;
+        VLOG(1) << __PRETTY_FUNCTION__ << ": " << path << " - " << parent;
 
         entry.storage_id = storage;
         entry.parent = parent;
@@ -211,7 +349,7 @@
         MtpObjectFormat format,
         bool succeeded)
     {
-        std::cout << __PRETTY_FUNCTION__ << ": " << path << std::endl;
+        VLOG(1) << __PRETTY_FUNCTION__ << ": " << path;
 
 	if (!succeeded) {
             db.erase(handle);
@@ -230,7 +368,7 @@
         MtpObjectFormat format,
         MtpObjectHandle parent)
     {
-        std::cout << __PRETTY_FUNCTION__ << ": " << storageID << ", " << format << ", " << parent << std::endl;
+        VLOG(1) << __PRETTY_FUNCTION__ << ": " << storageID << ", " << format << ", " << parent;
         MtpObjectHandleList* list = nullptr;
         try
         {
@@ -255,7 +393,7 @@
         MtpObjectFormat format,
         MtpObjectHandle parent)
     {
-        std::cout << __PRETTY_FUNCTION__ << ": " << storageID << ", " << format << ", " << parent << std::endl;
+        VLOG(1) << __PRETTY_FUNCTION__ << ": " << storageID << ", " << format << ", " << parent;
         try
         {
             return db.size();
@@ -270,7 +408,7 @@
     // results can be NULL
     virtual MtpObjectFormatList* getSupportedPlaybackFormats()
     {
-        std::cout << __PRETTY_FUNCTION__ << std::endl;
+        VLOG(1) << __PRETTY_FUNCTION__;
         static const MtpObjectFormatList list = {
             /* Generic files */
             MTP_FORMAT_UNDEFINED,
@@ -298,14 +436,14 @@
     
     virtual MtpObjectFormatList* getSupportedCaptureFormats()
     {
-        std::cout << __PRETTY_FUNCTION__ << std::endl;
+        VLOG(1) << __PRETTY_FUNCTION__;
         static const MtpObjectFormatList list = {MTP_FORMAT_ASSOCIATION, MTP_FORMAT_PNG};
         return new MtpObjectFormatList{list};
     }
     
     virtual MtpObjectPropertyList* getSupportedObjectProperties(MtpObjectFormat format)
     {
-        std::cout << __PRETTY_FUNCTION__ << std::endl;
+        VLOG(1) << __PRETTY_FUNCTION__;
 	/*
         if (format != MTP_FORMAT_PNG)
             return nullptr;
@@ -329,7 +467,7 @@
     
     virtual MtpDevicePropertyList* getSupportedDeviceProperties()
     {
-        std::cout << __PRETTY_FUNCTION__ << std::endl;
+        VLOG(1) << __PRETTY_FUNCTION__;
         static const MtpDevicePropertyList list = { MTP_DEVICE_PROPERTY_UNDEFINED };
         return new MtpDevicePropertyList{list};
     }
@@ -339,7 +477,10 @@
         MtpObjectProperty property,
         MtpDataPacket& packet)
     {        
-        std::cout << __PRETTY_FUNCTION__ << std::endl;
+        VLOG(1) << __PRETTY_FUNCTION__
+                << " handle: " << handle
+                << " property: " << MtpDebug::getObjectPropCodeName(property);
+
         switch(property)
         {
             case MTP_PROPERTY_STORAGE_ID: packet.putUInt32(db.at(handle).storage_id); break;            
@@ -366,7 +507,9 @@
         path oldpath;
         path newpath;
 
-        std::cout << __PRETTY_FUNCTION__ << std::endl;
+        VLOG(1) << __PRETTY_FUNCTION__
+                << " handle: " << handle
+                << " property: " << MtpDebug::getObjectPropCodeName(property);
 
         switch(property)
         {
@@ -385,13 +528,13 @@
                     db.at(handle).display_name = newname;
                     db.at(handle).path = newpath.string();
                 } catch (filesystem_error& fe) {
-                    std::cout << "ERROR: " << fe.what() << std::endl;
+                    LOG(ERROR) << fe.what();
                     return MTP_RESPONSE_DEVICE_BUSY;
                 } catch (std::exception& e) {
-                    std::cout << "ERROR: " << e.what() << std::endl;
+                    LOG(ERROR) << e.what();
                     return MTP_RESPONSE_GENERAL_ERROR;
                 } catch (...) {
-                    std::cout << "ERROR: autre exception" << std::endl;
+                    LOG(ERROR) << "An unexpected error has occurred";
                     return MTP_RESPONSE_GENERAL_ERROR;
 		}
 
@@ -406,7 +549,7 @@
         MtpDeviceProperty property,
         MtpDataPacket& packet)
     {
-        std::cout << __PRETTY_FUNCTION__ << std::endl;
+        VLOG(1) << __PRETTY_FUNCTION__;
         return MTP_RESPONSE_GENERAL_ERROR;
     }
 
@@ -414,14 +557,14 @@
         MtpDeviceProperty property,
         MtpDataPacket& packet)
     {
-        std::cout << __PRETTY_FUNCTION__ << std::endl;
+        VLOG(1) << __PRETTY_FUNCTION__;
         return MTP_RESPONSE_OPERATION_NOT_SUPPORTED;
     }
 
     virtual MtpResponseCode resetDeviceProperty(
         MtpDeviceProperty property)
     {
-        std::cout << __PRETTY_FUNCTION__ << std::endl;
+        VLOG(1) << __PRETTY_FUNCTION__;
         return MTP_RESPONSE_OPERATION_NOT_SUPPORTED;
     }
 
@@ -433,7 +576,7 @@
         int depth,
         MtpDataPacket& packet)
     {
-        std::cout << __PRETTY_FUNCTION__ << std::endl;
+        VLOG(2) << __PRETTY_FUNCTION__;
         return MTP_RESPONSE_OPERATION_NOT_SUPPORTED;
     }
 
@@ -441,7 +584,7 @@
         MtpObjectHandle handle,
         MtpObjectInfo& info)
     {
-        std::cout << __PRETTY_FUNCTION__ << std::endl;
+        VLOG(2) << __PRETTY_FUNCTION__;
 
         info.mHandle = handle;
         info.mStorageID = db.at(handle).storage_id;
@@ -460,6 +603,9 @@
         info.mDateModified = 0;
         info.mKeywords = ::strdup("ubuntu,touch");
         
+        if (VLOG_IS_ON(2))
+            info.print();
+
         return MTP_RESPONSE_OK;
     }
 
@@ -481,7 +627,7 @@
     {
         DbEntry entry = db.at(handle);
 
-        std::cout << __PRETTY_FUNCTION__ << std::endl;
+        VLOG(1) << __PRETTY_FUNCTION__ << " handle: " << handle;
 
         outFilePath = std::string(entry.path);
         outFileLength = entry.object_size;
@@ -495,7 +641,10 @@
         size_t orig_size = db.size();
         size_t new_size;
 
-        std::cout << __PRETTY_FUNCTION__ << std::endl;
+        VLOG(2) << __PRETTY_FUNCTION__ << " handle: " << handle;
+
+        if (db.at(handle).object_format == MTP_FORMAT_ASSOCIATION)
+            inotify_rm_watch(inotify_fd, db.at(handle).watch_fd);
 
         new_size = db.erase(handle);
 
@@ -508,6 +657,7 @@
                 if (db.at(i).parent == handle)
                     db.erase(i);
             }
+
             return MTP_RESPONSE_OK;
         }
         else
@@ -516,7 +666,8 @@
 
     virtual MtpResponseCode moveFile(MtpObjectHandle handle, MtpObjectHandle new_parent)
     {
-        std::cout << __PRETTY_FUNCTION__ << std::endl;
+        VLOG(1) << __PRETTY_FUNCTION__ << " handle: " << handle
+                << " new parent: " << new_parent;
 
         // change parent
         db.at(handle).parent = new_parent;
@@ -527,7 +678,7 @@
     /*
     virtual MtpResponseCode copyFile(MtpObjectHandle handle, MtpObjectHandle new_parent)
     {
-        std::cout << __PRETTY_FUNCTION__ << std::endl;
+        VLOG(2) << __PRETTY_FUNCTION__;
 
         // duplicate DbEntry
         // change parent
@@ -538,7 +689,7 @@
 
     virtual MtpObjectHandleList* getObjectReferences(MtpObjectHandle handle)
     {
-        std::cout << __PRETTY_FUNCTION__ << std::endl;
+        VLOG(1) << __PRETTY_FUNCTION__;
         return nullptr;
     }
 
@@ -546,7 +697,7 @@
         MtpObjectHandle handle,
         MtpObjectHandleList* references)
     {
-        std::cout << __PRETTY_FUNCTION__ << std::endl;
+        VLOG(1) << __PRETTY_FUNCTION__;
         return MTP_RESPONSE_OPERATION_NOT_SUPPORTED;    
     }
 
@@ -554,7 +705,8 @@
         MtpObjectProperty property,
         MtpObjectFormat format)
     {
-        std::cout << __PRETTY_FUNCTION__ << std::endl;
+        VLOG(1) << __PRETTY_FUNCTION__ << MtpDebug::getObjectPropCodeName(property);
+
         MtpProperty* result = nullptr;
         switch(property)
         {
@@ -574,18 +726,21 @@
 
     virtual MtpProperty* getDevicePropertyDesc(MtpDeviceProperty property)
     {
-        std::cout << __PRETTY_FUNCTION__ << std::endl;
+        VLOG(1) << __PRETTY_FUNCTION__ << MtpDebug::getDevicePropCodeName(property);
         return new MtpProperty(MTP_DEVICE_PROPERTY_UNDEFINED, MTP_TYPE_UNDEFINED);
     }
     
-    virtual void sessionStarted()
+    virtual void sessionStarted(MtpServer* server)
     {
-        std::cout << __PRETTY_FUNCTION__ << std::endl;
+        VLOG(1) << __PRETTY_FUNCTION__;
+        local_server = server;
     }
 
     virtual void sessionEnded()
     {
-        std::cout << __PRETTY_FUNCTION__ << std::endl;
+        VLOG(1) << __PRETTY_FUNCTION__;
+        VLOG(1) << "objects in db at session end: " << db.size();
+        local_server = nullptr;
     }
 };
 }

=== modified file 'server/server.cpp'
--- server/server.cpp	2013-09-13 16:37:39 +0000
+++ server/server.cpp	2014-04-01 15:51:14 +0000
@@ -30,6 +30,7 @@
 #include <pwd.h>
 
 #include <hybris/properties/properties.h>
+#include <glog/logging.h>
 
 namespace
 {
@@ -48,12 +49,16 @@
     struct passwd *userdata = getpwuid (getuid());
     char product_name[PROP_VALUE_MAX];
     int fd = open("/dev/mtp_usb", O_RDWR);
-    
+
+    google::InitGoogleLogging(argv[0]);
+
+    LOG(INFO) << "MTP server starting...";
+
     if (fd < 0)
     {
-        std::cout << "Error opening /dev/mtp_usb, aborting now..." << std::endl;
+        LOG(FATAL) << "Error opening /dev/mtp_usb, aborting now...";
     }
-        
+ 
     std::shared_ptr<android::MtpServer> server
     {
         new android::MtpServer(
@@ -90,5 +95,4 @@
       if (t.joinable())
       t.join();
     */
-    
 }

=== modified file 'src/MtpDataPacket.cpp'
--- src/MtpDataPacket.cpp	2013-06-13 10:22:21 +0000
+++ src/MtpDataPacket.cpp	2014-04-01 15:51:14 +0000
@@ -14,8 +14,6 @@
  * limitations under the License.
  */
 
-#define LOG_TAG "MtpDataPacket"
-
 #include <cstdio>
 #include <cstring>
 
@@ -24,6 +22,7 @@
 #include <unistd.h>
 
 #include <usbhost/usbhost.h>
+#include <glog/logging.h>
 
 #include "MtpDataPacket.h"
 #include "MtpStringBuffer.h"
@@ -421,7 +420,7 @@
 // Queue a read request.  Call readDataWait to wait for result
 int MtpDataPacket::readDataAsync(struct usb_request *req) {
     if (usb_request_queue(req)) {
-        ALOGE("usb_endpoint_queue failed, errno: %d", errno);
+        PLOG(ERROR) << "usb_endpoint_queue failed";
         return -1;
     }
     return 0;

=== modified file 'src/MtpDevice.cpp'
--- src/MtpDevice.cpp	2013-06-13 10:22:21 +0000
+++ src/MtpDevice.cpp	2014-04-01 15:51:14 +0000
@@ -38,6 +38,7 @@
 #include <unistd.h>
 
 #include <usbhost/usbhost.h>
+#include <glog/logging.h>
 
 namespace android {
 
@@ -56,7 +57,7 @@
 MtpDevice* MtpDevice::open(const char* deviceName, int fd) {
     struct usb_device *device = usb_device_new(deviceName, fd);
     if (!device) {
-        ALOGE("usb_device_new failed for %s", deviceName);
+        LOG(ERROR) << "usb_device_new failed for " << deviceName;
         return NULL;
     }
 
@@ -75,7 +76,7 @@
             {
                 char* manufacturerName = usb_device_get_manufacturer_name(device);
                 char* productName = usb_device_get_product_name(device);
-                ALOGD("Found camera: \"%s\" \"%s\"\n", manufacturerName, productName);
+                VLOG(2) << "Found camera: \"" << manufacturerName << " \"" << productName << "\"";
                 free(manufacturerName);
                 free(productName);
             } else if (interface->bInterfaceClass == 0xFF &&
@@ -93,7 +94,7 @@
                 // Looks like an android style MTP device
                 char* manufacturerName = usb_device_get_manufacturer_name(device);
                 char* productName = usb_device_get_product_name(device);
-                ALOGD("Found MTP device: \"%s\" \"%s\"\n", manufacturerName, productName);
+                VLOG(2) << "Found MTP device: \"" << manufacturerName << "\" \"" << productName << "\"";
                 free(manufacturerName);
                 free(productName);
             }
@@ -137,7 +138,7 @@
             for (int i = 0; i < 3; i++) {
                 ep = (struct usb_endpoint_descriptor *)usb_descriptor_iter_next(&iter);
                 if (!ep || ep->bDescriptorType != USB_DT_ENDPOINT) {
-                    ALOGE("endpoints not found\n");
+                    LOG(ERROR) << "endpoints not found";
                     usb_device_close(device);
                     return NULL;
                 }
@@ -152,13 +153,13 @@
                 }
             }
             if (!ep_in_desc || !ep_out_desc || !ep_intr_desc) {
-                ALOGE("endpoints not found\n");
+                LOG(ERROR) << "endpoints not found";
                 usb_device_close(device);
                 return NULL;
             }
 
             if (usb_device_claim_interface(device, interface->bInterfaceNumber)) {
-                ALOGE("usb_device_claim_interface failed errno: %d\n", errno);
+                PLOG(ERROR) << "usb_device_claim_interface failed";
                 usb_device_close(device);
                 return NULL;
             }
@@ -171,7 +172,7 @@
     }
 
     usb_device_close(device);
-    ALOGE("device not found");
+    LOG(ERROR) << "device not found";
     return NULL;
 }
 
@@ -235,7 +236,7 @@
         mDeviceInfo->print();
 
         if (mDeviceInfo->mDeviceProperties) {
-            ALOGI("***** DEVICE PROPERTIES *****\n");
+            VLOG(2) << "***** DEVICE PROPERTIES *****";
             int count = mDeviceInfo->mDeviceProperties->size();
             for (int i = 0; i < count; i++) {
                 MtpDeviceProperty propCode = (*mDeviceInfo->mDeviceProperties)[i];
@@ -249,11 +250,11 @@
     }
 
     if (mDeviceInfo->mPlaybackFormats) {
-            ALOGI("***** OBJECT PROPERTIES *****\n");
+            VLOG(2) << "***** OBJECT PROPERTIES *****";
         int count = mDeviceInfo->mPlaybackFormats->size();
         for (int i = 0; i < count; i++) {
             MtpObjectFormat format = (*mDeviceInfo->mPlaybackFormats)[i];
-            ALOGI("*** FORMAT: %s\n", MtpDebug::getFormatCodeName(format));
+            VLOG(2) << "*** FORMAT: " << MtpDebug::getFormatCodeName(format);
             MtpObjectPropertyList* props = getObjectPropsSupported(format);
             if (props) {
                 for (int j = 0; j < props->size(); j++) {
@@ -263,8 +264,8 @@
                         property->print();
                         delete property;
                     } else {
-                        ALOGE("could not fetch property: %s",
-                                MtpDebug::getObjectPropCodeName(prop));
+                        LOG(ERROR) << "could not fetch property: "
+                                   << MtpDebug::getObjectPropCodeName(prop);
                     }
                 }
             }
@@ -587,8 +588,8 @@
             && mData.readDataHeader(mRequestIn1)) {
         uint32_t length = mData.getContainerLength();
         if (length - MTP_CONTAINER_HEADER_SIZE != objectSize) {
-            ALOGE("readObject error objectSize: %d, length: %d",
-                    objectSize, length);
+            LOG(ERROR) << "readObject error objectSize: " << objectSize
+                       << " length: " << length;
             goto fail;
         }
         length -= MTP_CONTAINER_HEADER_SIZE;
@@ -620,7 +621,7 @@
                 // queue up a read request
                 req->buffer_length = (remaining > sizeof(buffer1) ? sizeof(buffer1) : remaining);
                 if (mData.readDataAsync(req)) {
-                    ALOGE("readDataAsync failed");
+                    LOG(ERROR) << "readDataAsync failed";
                     goto fail;
                 }
             } else {
@@ -630,7 +631,7 @@
             if (writeBuffer) {
                 // write previous buffer
                 if (!callback(writeBuffer, offset, writeLength, clientData)) {
-                    ALOGE("write failed");
+                    LOG(ERROR) << "write failed";
                     // wait for pending read before failing
                     if (req)
                         mData.readDataWait(mDevice);
@@ -669,10 +670,10 @@
 
 // reads the object's data and writes it to the specified file path
 bool MtpDevice::readObject(MtpObjectHandle handle, const char* destPath, int group, int perm) {
-    ALOGD("readObject: %s", destPath);
+    VLOG(2) << "readObject: " << destPath;
     int fd = ::open(destPath, O_RDWR | O_CREAT | O_TRUNC, S_IRUSR | S_IWUSR);
     if (fd < 0) {
-        ALOGE("open failed for %s", destPath);
+        LOG(ERROR) << "open failed for " << destPath;
         return false;
     }
 
@@ -721,7 +722,7 @@
                 // queue up a read request
                 req->buffer_length = (remaining > sizeof(buffer1) ? sizeof(buffer1) : remaining);
                 if (mData.readDataAsync(req)) {
-                    ALOGE("readDataAsync failed");
+                    LOG(ERROR) << "readDataAsync failed";
                     goto fail;
                 }
             } else {
@@ -731,7 +732,7 @@
             if (writeBuffer) {
                 // write previous buffer
                 if (write(fd, writeBuffer, writeLength) != writeLength) {
-                    ALOGE("write failed");
+                    LOG(ERROR) << "write failed";
                     // wait for pending read before failing
                     if (req)
                         mData.readDataWait(mDevice);
@@ -768,7 +769,7 @@
 }
 
 bool MtpDevice::sendRequest(MtpOperationCode operation) {
-    ALOGV("sendRequest: %s\n", MtpDebug::getOperationCodeName(operation));
+    VLOG(2) << "sendRequest: " << MtpDebug::getOperationCodeName(operation);
     mReceivedResponse = false;
     mRequest.setOperationCode(operation);
     if (mTransactionID > 0)
@@ -779,7 +780,7 @@
 }
 
 bool MtpDevice::sendData() {
-    ALOGV("sendData\n");
+    VLOG(2) << "sendData";
     mData.setOperationCode(mRequest.getOperationCode());
     mData.setTransactionID(mRequest.getTransactionID());
     int ret = mData.write(mRequestOut);
@@ -790,10 +791,10 @@
 bool MtpDevice::readData() {
     mData.reset();
     int ret = mData.read(mRequestIn1);
-    ALOGV("readData returned %d\n", ret);
+    VLOG(2) << "readData returned " << ret;
     if (ret >= MTP_CONTAINER_HEADER_SIZE) {
         if (mData.getContainerType() == MTP_CONTAINER_TYPE_RESPONSE) {
-            ALOGD("got response packet instead of data packet");
+            VLOG(2) << "got response packet instead of data packet";
             // we got a response packet rather than data
             // copy it to mResponse
             mResponse.copyFrom(mData);
@@ -804,7 +805,7 @@
         return true;
     }
     else {
-        ALOGV("readResponse failed\n");
+        VLOG(2) << "readResponse failed";
         return false;
     }
 }
@@ -816,7 +817,7 @@
 }
 
 MtpResponseCode MtpDevice::readResponse() {
-    ALOGV("readResponse\n");
+    VLOG(2) << "readResponse";
     if (mReceivedResponse) {
         mReceivedResponse = false;
         return mResponse.getResponseCode();
@@ -830,7 +831,7 @@
         mResponse.dump();
         return mResponse.getResponseCode();
     } else {
-        ALOGD("readResponse failed\n");
+        VLOG(2) << "readResponse failed";
         return -1;
     }
 }

=== modified file 'src/MtpDeviceInfo.cpp'
--- src/MtpDeviceInfo.cpp	2013-06-13 10:22:21 +0000
+++ src/MtpDeviceInfo.cpp	2014-04-01 15:51:14 +0000
@@ -23,6 +23,8 @@
 
 #include <cstring>
 
+#include <glog/logging.h>
+
 namespace android {
 
 MtpDeviceInfo::MtpDeviceInfo()
@@ -90,10 +92,16 @@
 }
 
 void MtpDeviceInfo::print() {
-    ALOGV("Device Info:\n\tmStandardVersion: %d\n\tmVendorExtensionID: %d\n\tmVendorExtensionVersiony: %d\n",
-            mStandardVersion, mVendorExtensionID, mVendorExtensionVersion);
-    ALOGV("\tmVendorExtensionDesc: %s\n\tmFunctionalCode: %d\n\tmManufacturer: %s\n\tmModel: %s\n\tmVersion: %s\n\tmSerial: %s\n",
-            mVendorExtensionDesc, mFunctionalCode, mManufacturer, mModel, mVersion, mSerial);
+    VLOG(2) << "Device Info:"
+            << "\n\tmStandardVersion: " << mStandardVersion
+            << "\n\tmVendorExtensionID: " << mVendorExtensionID
+            << "\n\tmVendorExtensionVersion: " << mVendorExtensionVersion
+            << "\n\tmVendorExtensionDesc: " << mVendorExtensionDesc
+            << "\n\tmFunctionalCode: " << mFunctionalCode
+            << "\n\tmManufacturer: " << mManufacturer
+            << "\n\tmModel: " << mModel
+            << "\n\tmVersion: " << mVersion
+            << "\n\tmSerial: " << mSerial;
 }
 
 }  // namespace android

=== modified file 'src/MtpObjectInfo.cpp'
--- src/MtpObjectInfo.cpp	2013-06-13 10:22:21 +0000
+++ src/MtpObjectInfo.cpp	2014-04-01 15:51:14 +0000
@@ -22,8 +22,11 @@
 #include "MtpStringBuffer.h"
 #include "MtpUtils.h"
 
+#include <iomanip>
 #include <cstring>
 
+#include <glog/logging.h>
+
 namespace android {
 
 MtpObjectInfo::MtpObjectInfo(MtpObjectHandle handle)
@@ -93,18 +96,25 @@
 }
 
 void MtpObjectInfo::print() {
-    ALOGD("MtpObject Info %08X: %s\n", mHandle, mName);
-    ALOGD("  mStorageID: %08X mFormat: %04X mProtectionStatus: %d\n",
-            mStorageID, mFormat, mProtectionStatus);
-    ALOGD("  mCompressedSize: %d mThumbFormat: %04X mThumbCompressedSize: %d\n",
-            mCompressedSize, mFormat, mThumbCompressedSize);
-    ALOGD("  mThumbPixWidth: %d mThumbPixHeight: %d\n", mThumbPixWidth, mThumbPixHeight);
-    ALOGD("  mImagePixWidth: %d mImagePixHeight: %d mImagePixDepth: %d\n",
-            mImagePixWidth, mImagePixHeight, mImagePixDepth);
-    ALOGD("  mParent: %08X mAssociationType: %04X mAssociationDesc: %04X\n",
-            mParent, mAssociationType, mAssociationDesc);
-    ALOGD("  mSequenceNumber: %d mDateCreated: %ld mDateModified: %ld mKeywords: %s\n",
-            mSequenceNumber, mDateCreated, mDateModified, mKeywords);
+    VLOG(2) << "MtpObject Info " << mHandle << ": " << mName;
+    VLOG(2) << "  mStorageID: " << std::hex <<  mStorageID
+            << " mFormat: " << mFormat << std::dec
+            << " mProtectionStatus: " << mProtectionStatus;
+    VLOG(2) << "  mCompressedSize: " << mCompressedSize
+            << " mThumbFormat: " << std::hex << mThumbFormat << std::dec
+            << " mThumbCompressedSize: " << mThumbCompressedSize;
+    VLOG(2) << "  mThumbPixWidth: " << mThumbPixWidth
+            << " mThumbPixHeight: " << mThumbPixHeight;
+    VLOG(2) << "  mImagePixWidth: " << mImagePixWidth
+            << " mImagePixHeight: " << mImagePixHeight
+            << " mImagePixDepth: " << mImagePixDepth;
+    VLOG(2) << "  mParent: " << std::hex << mParent
+            << " mAssociationType: " << mAssociationType << std::dec
+            << " mAssociationDesc: " << mAssociationDesc;
+    VLOG(2) << "  mSequenceNumber: " << mSequenceNumber
+            << " mDateCreated: " << mDateCreated
+            << " mDateModified: " << mDateModified
+            << " mKeywords: " << mKeywords;
 }
 
 }  // namespace android

=== modified file 'src/MtpPacket.cpp'
--- src/MtpPacket.cpp	2013-06-13 10:22:21 +0000
+++ src/MtpPacket.cpp	2014-04-01 15:51:14 +0000
@@ -25,6 +25,7 @@
 #include <cstring>
 
 #include <usbhost/usbhost.h>
+#include <glog/logging.h>
 
 namespace android {
 
@@ -36,8 +37,7 @@
 {
     mBuffer = (uint8_t *)malloc(bufferSize);
     if (!mBuffer) {
-        ALOGE("out of memory!");
-        abort();
+        LOG(FATAL) << "out of memory!";
     }
 }
 
@@ -57,8 +57,7 @@
         int newLength = length + mAllocationIncrement;
         mBuffer = (uint8_t *)realloc(mBuffer, newLength);
         if (!mBuffer) {
-            ALOGE("out of memory!");
-            abort();
+            LOG(FATAL) << "out of memory!";
         }
         mBufferSize = newLength;
     }
@@ -73,15 +72,14 @@
         sprintf(bufptr, "%02X ", mBuffer[i]);
         bufptr += strlen(bufptr);
         if (i % DUMP_BYTES_PER_ROW == (DUMP_BYTES_PER_ROW - 1)) {
-            ALOGV("%s", buffer);
+            VLOG(3) << buffer;
             bufptr = buffer;
         }
     }
     if (bufptr != buffer) {
         // print last line
-        ALOGV("%s", buffer);
+        VLOG(3) << buffer;
     }
-    ALOGV("\n");
 }
 
 void MtpPacket::copyFrom(const MtpPacket& src) {
@@ -134,7 +132,7 @@
 
 uint32_t MtpPacket::getParameter(int index) const {
     if (index < 1 || index > 5) {
-        ALOGE("index %d out of range in MtpPacket::getParameter", index);
+        LOG(ERROR) << "index " << index << " out of range in MtpPacket::getParameter";
         return 0;
     }
     return getUInt32(MTP_CONTAINER_PARAMETER_OFFSET + (index - 1) * sizeof(uint32_t));
@@ -142,7 +140,7 @@
 
 void MtpPacket::setParameter(int index, uint32_t value) {
     if (index < 1 || index > 5) {
-        ALOGE("index %d out of range in MtpPacket::setParameter", index);
+        LOG(ERROR) << "index " << index << " out of range in MtpPacket::setParameter";
         return;
     }
     int offset = MTP_CONTAINER_PARAMETER_OFFSET + (index - 1) * sizeof(uint32_t);

=== modified file 'src/MtpProperty.cpp'
--- src/MtpProperty.cpp	2013-06-13 10:22:21 +0000
+++ src/MtpProperty.cpp	2014-04-01 15:51:14 +0000
@@ -22,9 +22,12 @@
 #include "MtpStringBuffer.h"
 #include "MtpUtils.h"
 
+#include <iomanip>
 #include <cstring>
 #include <sstream>
 
+#include <glog/logging.h>
+
 namespace android {
 
 MtpProperty::MtpProperty()
@@ -94,7 +97,9 @@
                 mDefaultValue.u.u64 = defaultValue;
                 break;
             default:
-                ALOGE("unknown type %04X in MtpProperty::MtpProperty", type);
+                LOG(ERROR) << "unknown type "
+                           << std::hex << type << std::dec
+                           << " in MtpProperty::MtpProperty";
         }
     }
 }
@@ -270,7 +275,7 @@
             mStepSize.u.u64 = step;
             break;
         default:
-            ALOGE("unsupported type for MtpProperty::setRange");
+            LOG(ERROR) << "unsupported type for MtpProperty::setRange";
             break;
     }
 }
@@ -309,7 +314,7 @@
                     mEnumValues[i].u.u64 = value;
                     break;
                 default:
-                    ALOGE("unsupported type for MtpProperty::setEnum");
+                    LOG(ERROR) << "unsupported type for MtpProperty::setEnum";
                     break;
         }
     }
@@ -323,46 +328,48 @@
     MtpString buffer;
     bool deviceProp = isDeviceProperty();
     if (deviceProp)
-        ALOGI("    %s (%04X)", MtpDebug::getDevicePropCodeName(mCode), mCode);
+        VLOG(2) << MtpDebug::getDevicePropCodeName(mCode)
+                << " (" << std::hex << mCode << std::dec << ")";
     else
-        ALOGI("    %s (%04X)", MtpDebug::getObjectPropCodeName(mCode), mCode);
-    ALOGI("    type %04X", mType);
-    ALOGI("    writeable %s", (mWriteable ? "true" : "false"));
-    buffer = "    default value: ";
+        VLOG(2) << MtpDebug::getObjectPropCodeName(mCode)
+                << " (" << std::hex << mCode << std::dec << ")";
+    VLOG(2) << mType;
+    VLOG(2) << "writeable " << (mWriteable ? "true" : "false");
+    buffer = "default value: ";
     print(mDefaultValue, buffer);
-    ALOGI("%s", buffer.c_str());
+    VLOG(2) << buffer.c_str();
     if (deviceProp) {
-        buffer = "    current value: ";
+        buffer = "current value: ";
         print(mCurrentValue, buffer);
-        ALOGI("%s", buffer.c_str());
+        VLOG(2) << buffer.c_str();
     }
     switch (mFormFlag) {
         case kFormNone:
             break;
         case kFormRange:
-            buffer = "    Range (";
+            buffer = "Range (";
             print(mMinimumValue, buffer);
             buffer += ", ";
             print(mMaximumValue, buffer);
             buffer += ", ";
             print(mStepSize, buffer);
             buffer += ")";
-            ALOGI("%s", buffer.c_str());
+            VLOG(2) << buffer.c_str();
             break;
         case kFormEnum:
-            buffer = "    Enum { ";
+            buffer = "Enum { ";
             for (int i = 0; i < mEnumLength; i++) {
                 print(mEnumValues[i], buffer);
                 buffer += " ";
             }
             buffer += "}";
-            ALOGI("%s", buffer.c_str());
+            VLOG(2) << buffer.c_str();
             break;
         case kFormDateTime:
-            ALOGI("    DateTime\n");
+            VLOG(2) << "DateTime";
             break;
         default:
-            ALOGI("    form %d\n", mFormFlag);
+            VLOG(2) << "form " << mFormFlag;
             break;
     }
 }
@@ -409,7 +416,7 @@
             ss << value.str;
             break;
         default:
-            ALOGE("unsupported type for MtpProperty::print\n");
+            LOG(ERROR) << "unsupported type for MtpProperty::print";
             break;
     }
     
@@ -465,7 +472,9 @@
             value.str = strdup(stringBuffer);
             break;
         default:
-            ALOGE("unknown type %04X in MtpProperty::readValue", mType);
+            LOG(ERROR) << "unknown type "
+                       << std::hex << mType << std::dec
+                       << " in MtpProperty::readValue";
     }
 }
 
@@ -520,7 +529,9 @@
                 packet.putEmptyString();
             break;
         default:
-            ALOGE("unknown type %04X in MtpProperty::writeValue", mType);
+            LOG(ERROR) << "unknown type "
+                       << std::hex << mType << std::dec
+                       << " in MtpProperty::writeValue";
     }
 }
 

=== modified file 'src/MtpServer.cpp'
--- src/MtpServer.cpp	2013-11-27 17:21:38 +0000
+++ src/MtpServer.cpp	2014-04-01 15:51:14 +0000
@@ -14,6 +14,7 @@
  * limitations under the License.
  */
 
+#include <iomanip>
 #include <cstdio>
 #include <cstdlib>
 #include <cstring>
@@ -41,6 +42,8 @@
 
 #include <hybris/properties/properties.h>
 
+#include <glog/logging.h>
+
 namespace android {
 
 static const MtpOperationCode kSupportedOperationCodes[] = {
@@ -158,12 +161,12 @@
 void MtpServer::run() {
     int fd = mFD;
 
-    ALOGV("MtpServer::run fd: %d\n", fd);
+    VLOG(1) << "MtpServer::run fd: " << fd;
 
     while (1) {
         int ret = mRequest.read(fd);
         if (ret < 0) {
-            ALOGV("request read returned %d, errno: %d", ret, errno);
+            PLOG(ERROR) << "request read returned " << ret;
             if (errno == ECANCELED) {
                 // return to top of loop and wait for next command
                 continue;
@@ -173,7 +176,7 @@
         MtpOperationCode operation = mRequest.getOperationCode();
         MtpTransactionID transaction = mRequest.getTransactionID();
 
-        ALOGV("operation: %s", MtpDebug::getOperationCodeName(operation));
+        VLOG(2) << "operation: " << MtpDebug::getOperationCodeName(operation);
         mRequest.dump();
 
         // FIXME need to generalize this
@@ -184,14 +187,14 @@
         if (dataIn) {
             int ret = mData.read(fd);
             if (ret < 0) {
-                ALOGE("data read returned %d, errno: %d", ret, errno);
+                PLOG(ERROR) << "data read returned " << ret;
                 if (errno == ECANCELED) {
                     // return to top of loop and wait for next command
                     continue;
                 }
                 break;
             }
-            ALOGV("received data:");
+            VLOG(2) << "received data:";
             mData.dump();
         } else {
             mData.reset();
@@ -201,11 +204,11 @@
             if (!dataIn && mData.hasData()) {
                 mData.setOperationCode(operation);
                 mData.setTransactionID(transaction);
-                ALOGV("sending data:");
+                VLOG(2) << "sending data:";
                 mData.dump();
                 ret = mData.write(fd);
                 if (ret < 0) {
-                    ALOGE("request write returned %d, errno: %d", ret, errno);
+                    PLOG(ERROR) << "request write returned " << ret;
                     if (errno == ECANCELED) {
                         // return to top of loop and wait for next command
                         continue;
@@ -215,11 +218,12 @@
             }
 
             mResponse.setTransactionID(transaction);
-            ALOGV("sending response %04X", mResponse.getResponseCode());
+            VLOG(2) << "sending response "
+                    << std::hex << mResponse.getResponseCode() << std::dec;
             ret = mResponse.write(fd);
             mResponse.dump();
             if (ret < 0) {
-                ALOGE("request write returned %d, errno: %d", ret, errno);
+                PLOG(ERROR) << "request write returned " << ret;
                 if (errno == ECANCELED) {
                     // return to top of loop and wait for next command
                     continue;
@@ -227,7 +231,7 @@
                 break;
             }
         } else {
-            ALOGV("skipping response\n");
+            VLOG(2) << "skipping response";
         }
     }
 
@@ -247,33 +251,33 @@
 }
 
 void MtpServer::sendObjectAdded(MtpObjectHandle handle) {
-    ALOGV("sendObjectAdded %d\n", handle);
+    VLOG(1) << "sendObjectAdded " << handle;
     sendEvent(MTP_EVENT_OBJECT_ADDED, handle, 0, 0);
 }
 
 void MtpServer::sendObjectRemoved(MtpObjectHandle handle) {
-    ALOGV("sendObjectRemoved %d\n", handle);
+    VLOG(1) << "sendObjectRemoved " << handle;
     sendEvent(MTP_EVENT_OBJECT_REMOVED, handle, 0, 0);
 }
 
 void MtpServer::sendObjectInfoChanged(MtpObjectHandle handle) {
-    ALOGV("sendObjectInfoChanged %d\n", handle);
+    VLOG(1) << "sendObjectInfoChanged " << handle;
     sendEvent(MTP_EVENT_OBJECT_INFO_CHANGED, handle, 0, 0);
 }
 
 void MtpServer::sendObjectPropChanged(MtpObjectHandle handle,
                                       MtpObjectProperty prop) {
-    ALOGV("sendObjectPropChanged %d %d\n", handle, prop);
+    VLOG(1) << "sendObjectPropChanged " << handle << " " << prop;
     sendEvent(MTP_EVENT_OBJECT_PROP_CHANGED, handle, prop, 0);
 }
 
 void MtpServer::sendStoreAdded(MtpStorageID id) {
-    ALOGV("sendStoreAdded %08X\n", id);
+    VLOG(1) << "sendStoreAdded " << std::hex << id << std::dec;
     sendEvent(MTP_EVENT_STORE_ADDED, id, 0, 0);
 }
 
 void MtpServer::sendStoreRemoved(MtpStorageID id) {
-    ALOGV("sendStoreRemoved %08X\n", id);
+    VLOG(1) << "sendStoreRemoved " << std::hex << id << std::dec;
     sendEvent(MTP_EVENT_STORE_REMOVED, id, 0, 0);
 }
 
@@ -288,7 +292,7 @@
         mEvent.setParameter(2, param2);
         mEvent.setParameter(3, param3);
         int ret = mEvent.write(mFD);
-        ALOGV("mEvent.write returned %d\n", ret);
+        VLOG(2) << "mEvent.write returned " << ret;
     }
 }
 
@@ -317,7 +321,7 @@
             return;
         }
     }
-    ALOGE("ObjectEdit not found in removeEditObject");
+    LOG(ERROR) << "ObjectEdit not found in removeEditObject";
 }
 
 void MtpServer::commitEdit(ObjectEdit* edit) {
@@ -335,7 +339,7 @@
 
     if (mSendObjectHandle != kInvalidObjectHandle && operation != MTP_OPERATION_SEND_OBJECT) {
         // FIXME - need to delete mSendObjectHandle from the database
-        ALOGE("expected SendObject after SendObjectInfo");
+        LOG(ERROR) << "expected SendObject after SendObjectInfo";
         mSendObjectHandle = kInvalidObjectHandle;
     }
 
@@ -432,7 +436,7 @@
             response = doEndEditObject();
             break;
         default:
-            ALOGE("got unsupported command %s", MtpDebug::getOperationCodeName(operation));
+            LOG(ERROR) << "got unsupported command " << MtpDebug::getOperationCodeName(operation);
             response = MTP_RESPONSE_OPERATION_NOT_SUPPORTED;
             break;
     }
@@ -444,7 +448,7 @@
 }
 
 MtpResponseCode MtpServer::doGetDeviceInfo() {
-    ALOGV("%s", __PRETTY_FUNCTION__);
+    VLOG(1) <<  __PRETTY_FUNCTION__;
     MtpStringBuffer   string;
     char prop_value[PROP_VALUE_MAX];
 
@@ -507,7 +511,7 @@
     mSessionID = mRequest.getParameter(1);
     mSessionOpen = true;
 
-    mDatabase->sessionStarted();
+    mDatabase->sessionStarted(this);
 
     return MTP_RESPONSE_OK;
 }
@@ -639,8 +643,8 @@
         return MTP_RESPONSE_INVALID_OBJECT_HANDLE;
     MtpObjectHandle handle = mRequest.getParameter(1);
     MtpObjectProperty property = mRequest.getParameter(2);
-    ALOGV("GetObjectPropValue %d %s\n", handle,
-            MtpDebug::getObjectPropCodeName(property));
+    VLOG(2) << "GetObjectPropValue " << handle
+            << " " << MtpDebug::getObjectPropCodeName(property);
 
     return mDatabase->getObjectPropertyValue(handle, property, mData);
 }
@@ -652,8 +656,8 @@
         return MTP_RESPONSE_INVALID_OBJECT_HANDLE;
     MtpObjectHandle handle = mRequest.getParameter(1);
     MtpObjectProperty property = mRequest.getParameter(2);
-    ALOGV("SetObjectPropValue %d %s\n", handle,
-            MtpDebug::getObjectPropCodeName(property));
+    VLOG(2) << "SetObjectPropValue " << handle
+            << " " << MtpDebug::getObjectPropCodeName(property);
 
     response = mDatabase->setObjectPropertyValue(handle, property, mData);
 
@@ -664,24 +668,21 @@
 
 MtpResponseCode MtpServer::doGetDevicePropValue() {
     MtpDeviceProperty property = mRequest.getParameter(1);
-    ALOGV("GetDevicePropValue %s\n",
-            MtpDebug::getDevicePropCodeName(property));
+    VLOG(1) << "GetDevicePropValue " << MtpDebug::getDevicePropCodeName(property);
 
     return mDatabase->getDevicePropertyValue(property, mData);
 }
 
 MtpResponseCode MtpServer::doSetDevicePropValue() {
     MtpDeviceProperty property = mRequest.getParameter(1);
-    ALOGV("SetDevicePropValue %s\n",
-            MtpDebug::getDevicePropCodeName(property));
+    VLOG(1) << "SetDevicePropValue " << MtpDebug::getDevicePropCodeName(property);
 
     return mDatabase->setDevicePropertyValue(property, mData);
 }
 
 MtpResponseCode MtpServer::doResetDevicePropValue() {
     MtpDeviceProperty property = mRequest.getParameter(1);
-    ALOGV("ResetDevicePropValue %s\n",
-            MtpDebug::getDevicePropCodeName(property));
+    VLOG(1) << "ResetDevicePropValue " << MtpDebug::getDevicePropCodeName(property);
 
     return mDatabase->resetDeviceProperty(property);
 }
@@ -696,9 +697,11 @@
     uint32_t property = mRequest.getParameter(3);
     int groupCode = mRequest.getParameter(4);
     int depth = mRequest.getParameter(5);
-   ALOGV("GetObjectPropList %d format: %s property: %s group: %d depth: %d\n",
-            handle, MtpDebug::getFormatCodeName(format),
-            MtpDebug::getObjectPropCodeName(property), groupCode, depth);
+    VLOG(2) << "GetObjectPropList " << handle
+            << " format: " << MtpDebug::getFormatCodeName(format)
+            << " property: " << MtpDebug::getObjectPropCodeName(property)
+            << " group: " << groupCode
+            << " depth: " << depth;
 
     return mDatabase->getObjectPropertyList(handle, format, property, groupCode, depth, mData);
 }
@@ -766,7 +769,7 @@
 
     // then transfer the file
     int ret = ioctl(mFD, MTP_SEND_FILE_WITH_HEADER, (unsigned long)&mfr);
-    ALOGV("MTP_SEND_FILE_WITH_HEADER returned %d\n", ret);
+    VLOG(2) << "MTP_SEND_FILE_WITH_HEADER returned " << ret;
     close(mfr.fd);
     if (ret < 0) {
         if (errno == ECANCELED)
@@ -831,7 +834,7 @@
 
     // transfer the file
     int ret = ioctl(mFD, MTP_SEND_FILE_WITH_HEADER, (unsigned long)&mfr);
-    ALOGV("MTP_SEND_FILE_WITH_HEADER returned %d\n", ret);
+    VLOG(2) << "MTP_SEND_FILE_WITH_HEADER returned " << ret;
     close(mfr.fd);
     if (ret < 0) {
         if (errno == ECANCELED)
@@ -886,7 +889,8 @@
     mData.getString(modified);     // date modified
     // keywords follow
 
-    ALOGV("name: %s format: %04X\n", (const char *)name, format);
+    VLOG(2) << "name: " << (const char *) name
+            << " format: " << std::hex << format << std::dec;
     time_t modifiedTime;
     if (!parseDateTime(modified, modifiedTime))
         modifiedTime = 0;
@@ -907,7 +911,8 @@
             return MTP_RESPONSE_OBJECT_TOO_LARGE;
     }
 
-    ALOGD("path: %s parent: %d storageID: %08X", path.c_str(), parent, storageID);
+    VLOG(2) << "path: " << path.c_str() << " parent: " << parent
+            << " storageID: " << std::hex << storageID << std::dec;
     MtpObjectHandle handle = mDatabase->beginSendObject(path.c_str(),
             format, parent, storageID, mSendObjectFileSize, modifiedTime);
     if (handle == kInvalidObjectHandle) {
@@ -946,7 +951,7 @@
     int ret, initialData;
 
     if (mSendObjectHandle == kInvalidObjectHandle) {
-        ALOGE("Expected SendObjectInfo before SendObject");
+        LOG(ERROR) << "Expected SendObjectInfo before SendObject";
         result = MTP_RESPONSE_NO_VALID_OBJECT_INFO;
         goto done;
     }
@@ -983,10 +988,10 @@
             mfr.length = mSendObjectFileSize - initialData;
         }
 
-        ALOGV("receiving %s\n", mSendObjectFilePath.c_str());
+        VLOG(2) << "receiving " << mSendObjectFilePath.c_str();
         // transfer the file
         ret = ioctl(mFD, MTP_RECEIVE_FILE, (unsigned long)&mfr);
-        ALOGV("MTP_RECEIVE_FILE returned %d\n", ret);
+        VLOG(2) << "MTP_RECEIVE_FILE returned " << ret;
     }
     close(mfr.fd);
 
@@ -1013,7 +1018,7 @@
     char pathbuf[PATH_MAX];
     int pathLength = strlen(path);
     if (pathLength >= sizeof(pathbuf) - 1) {
-        ALOGE("path too long: %s\n", path);
+        LOG(ERROR) << "path too long: " << path;
     }
     strcpy(pathbuf, path);
     if (pathbuf[pathLength - 1] != '/') {
@@ -1024,7 +1029,7 @@
 
     DIR* dir = opendir(path);
     if (!dir) {
-        ALOGE("opendir %s failed: %s", path, strerror(errno));
+        PLOG(ERROR) << "opendir " << path << " failed";
         return;
     }
 
@@ -1039,7 +1044,7 @@
 
         int nameLength = strlen(name);
         if (nameLength > pathRemaining) {
-            ALOGE("path %s/%s too long\n", path, name);
+            LOG(ERROR) << "path " << path << "/" << name << " too long";
             continue;
         }
         strcpy(fileSpot, name);
@@ -1065,7 +1070,7 @@
             unlink(path);
         }
     } else {
-        ALOGE("deletePath stat failed for %s: %s", path, strerror(errno));
+        PLOG(ERROR) << "deletePath stat failed for " << path;
     }
 }
 
@@ -1081,7 +1086,7 @@
     int64_t fileLength;
     int result = mDatabase->getObjectFilePath(handle, filePath, fileLength, format);
     if (result == MTP_RESPONSE_OK) {
-        ALOGV("deleting %s", filePath.c_str());
+        VLOG(2) << "deleting " << filePath.c_str();
         result = mDatabase->deleteFile(handle);
         // Don't delete the actual files unless the database deletion is allowed
         if (result == MTP_RESPONSE_OK) {
@@ -1105,7 +1110,7 @@
     int result = mDatabase->getObjectFilePath(handle, filePath, fileLength, format);
     result = mDatabase->getObjectFilePath(handle, newPath, fileLength, format);
     if (result == MTP_RESPONSE_OK) {
-        ALOGV("moving %s to %s", filePath.c_str(), newPath.c_str());
+        VLOG(2) << "moving " << filePath.c_str() << " to " << newPath.c_str();
         result = mDatabase->moveFile(handle, newparent);
         // Don't move the actual files unless the database deletion is allowed
         if (result == MTP_RESPONSE_OK) {
@@ -1119,8 +1124,8 @@
 MtpResponseCode MtpServer::doGetObjectPropDesc() {
     MtpObjectProperty propCode = mRequest.getParameter(1);
     MtpObjectFormat format = mRequest.getParameter(2);
-    ALOGV("GetObjectPropDesc %s %s\n", MtpDebug::getObjectPropCodeName(propCode),
-                                        MtpDebug::getFormatCodeName(format));
+    VLOG(2) << "GetObjectPropDesc " << MtpDebug::getObjectPropCodeName(propCode)
+            << " " << MtpDebug::getFormatCodeName(format);
     MtpProperty* property = mDatabase->getObjectPropertyDesc(propCode, format);
     if (!property)
         return MTP_RESPONSE_OBJECT_PROP_NOT_SUPPORTED;
@@ -1131,7 +1136,7 @@
 
 MtpResponseCode MtpServer::doGetDevicePropDesc() {
     MtpDeviceProperty propCode = mRequest.getParameter(1);
-    ALOGV("GetDevicePropDesc %s\n", MtpDebug::getDevicePropCodeName(propCode));
+    VLOG(1) << "GetDevicePropDesc " << MtpDebug::getDevicePropCodeName(propCode);
     MtpProperty* property = mDatabase->getDevicePropertyDesc(propCode);
     if (!property)
         return MTP_RESPONSE_DEVICE_PROP_NOT_SUPPORTED;
@@ -1151,18 +1156,20 @@
 
     ObjectEdit* edit = getEditObject(handle);
     if (!edit) {
-        ALOGE("object not open for edit in doSendPartialObject");
+        LOG(ERROR) << "object not open for edit in doSendPartialObject";
         return MTP_RESPONSE_GENERAL_ERROR;
     }
 
     // can't start writing past the end of the file
     if (offset > edit->mSize) {
-        ALOGD("writing past end of object, offset: %lld, edit->mSize: %lld", offset, edit->mSize);
+        VLOG(2) << "writing past end of object, offset: " << offset
+                << " edit->mSize: " << edit->mSize;
         return MTP_RESPONSE_GENERAL_ERROR;
     }
 
     const char* filePath = edit->mPath.c_str();
-    ALOGV("receiving partial %s %lld %lld\n", filePath, offset, length);
+    VLOG(2) << "receiving partial " << filePath
+            << " " << offset << " " << length;
 
     // read the header, and possibly some data
     int ret = mData.read(mFD);
@@ -1184,7 +1191,7 @@
 
         // transfer the file
         ret = ioctl(mFD, MTP_RECEIVE_FILE, (unsigned long)&mfr);
-        ALOGV("MTP_RECEIVE_FILE returned %d", ret);
+        VLOG(2) << "MTP_RECEIVE_FILE returned " << ret;
     }
     if (ret < 0) {
         mResponse.setParameter(1, 0);
@@ -1208,7 +1215,7 @@
     MtpObjectHandle handle = mRequest.getParameter(1);
     ObjectEdit* edit = getEditObject(handle);
     if (!edit) {
-        ALOGE("object not open for edit in doTruncateObject");
+        LOG(ERROR) << "object not open for edit in doTruncateObject";
         return MTP_RESPONSE_GENERAL_ERROR;
     }
 
@@ -1226,7 +1233,7 @@
 MtpResponseCode MtpServer::doBeginEditObject() {
     MtpObjectHandle handle = mRequest.getParameter(1);
     if (getEditObject(handle)) {
-        ALOGE("object already open for edit in doBeginEditObject");
+        LOG(ERROR) << "object already open for edit in doBeginEditObject";
         return MTP_RESPONSE_GENERAL_ERROR;
     }
 
@@ -1239,7 +1246,7 @@
 
     int fd = open(path.c_str(), O_RDWR | O_EXCL);
     if (fd < 0) {
-        ALOGE("open failed for %s in doBeginEditObject (%d)", path.c_str(), errno);
+        PLOG(ERROR) << "open failed for " << path.c_str() << " in doBeginEditObject";
         return MTP_RESPONSE_GENERAL_ERROR;
     }
 
@@ -1251,7 +1258,7 @@
     MtpObjectHandle handle = mRequest.getParameter(1);
     ObjectEdit* edit = getEditObject(handle);
     if (!edit) {
-        ALOGE("object not open for edit in doEndEditObject");
+        LOG(ERROR) << "object not open for edit in doEndEditObject";
         return MTP_RESPONSE_GENERAL_ERROR;
     }
 

=== modified file 'src/MtpStorage.cpp'
--- src/MtpStorage.cpp	2013-06-13 10:22:21 +0000
+++ src/MtpStorage.cpp	2014-04-01 15:51:14 +0000
@@ -30,6 +30,8 @@
 #include <stdio.h>
 #include <limits.h>
 
+#include <glog/logging.h>
+
 namespace android {
 
 MtpStorage::MtpStorage(MtpStorageID id, const char* filePath,
@@ -43,7 +45,7 @@
         mReserveSpace(reserveSpace),
         mRemovable(removable)
 {
-    ALOGV("MtpStorage id: %d path: %s\n", id, filePath);
+    VLOG(2) << "MtpStorage id: " << id << " path: " << filePath;
 }
 
 MtpStorage::~MtpStorage() {

=== modified file 'src/MtpStorageInfo.cpp'
--- src/MtpStorageInfo.cpp	2013-06-13 10:22:21 +0000
+++ src/MtpStorageInfo.cpp	2014-04-01 15:51:14 +0000
@@ -16,6 +16,7 @@
 
 #define LOG_TAG "MtpStorageInfo"
 
+#include <iomanip>
 #include <cstring>
 
 #include "MtpDebug.h"
@@ -23,6 +24,8 @@
 #include "MtpStorageInfo.h"
 #include "MtpStringBuffer.h"
 
+#include <glog/logging.h>
+
 namespace android {
 
 MtpStorageInfo::MtpStorageInfo(MtpStorageID id)
@@ -63,12 +66,15 @@
 }
 
 void MtpStorageInfo::print() {
-    ALOGD("Storage Info %08X:\n\tmStorageType: %d\n\tmFileSystemType: %d\n\tmAccessCapability: %d\n",
-            mStorageID, mStorageType, mFileSystemType, mAccessCapability);
-    ALOGD("\tmMaxCapacity: %lld\n\tmFreeSpaceBytes: %lld\n\tmFreeSpaceObjects: %d\n",
-            mMaxCapacity, mFreeSpaceBytes, mFreeSpaceObjects);
-    ALOGD("\tmStorageDescription: %s\n\tmVolumeIdentifier: %s\n",
-            mStorageDescription, mVolumeIdentifier);
+    VLOG(2) << "Storage Info " << std::hex << mStorageID << std::dec << ":"
+            << "\n\tmStorageType: " << mStorageType
+            << "\n\tmFileSystemType: " << mFileSystemType
+            << "\n\tmAccessCapability: " << mAccessCapability;
+    VLOG(2) << "\tmMaxCapacity: " << mMaxCapacity
+            << "\n\tmFreeSpaceBytes: " << mFreeSpaceBytes
+            << "\n\tmFreeSpaceObjects: " << mFreeSpaceObjects;
+    VLOG(2) << "\tmStorageDescription: " << mStorageDescription
+            << "\n\tmVolumeIdentifier: " << mVolumeIdentifier;
 }
 
 }  // namespace android

=== modified file 'tests/MockMtpDatabase.h'
--- tests/MockMtpDatabase.h	2013-11-27 17:21:38 +0000
+++ tests/MockMtpDatabase.h	2014-04-01 15:51:14 +0000
@@ -353,7 +353,7 @@
         return new MtpProperty(MTP_DEVICE_PROPERTY_UNDEFINED, MTP_TYPE_UNDEFINED);
     }
     
-    virtual void sessionStarted()
+    virtual void sessionStarted(MtpServer* server)
     {
         std::cout << __PRETTY_FUNCTION__ << std::endl;
     }