bk commit into 5.1 tree (tomas:1.1887)

[tomas]

Below is the list of changes that have just been committed into a local
5.1 repository of tomas. When tomas does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.1887 05/05/26 16:43:39 tomas@stripped +2 -0
  NdbEventOperationImpl.cpp:
    wrond buffer size
  ndb_logevent.txt:
    new file

  storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp
    1.56 05/05/26 16:43:00 tomas@stripped +2 -3
    wrond buffer size

  storage/ndb/include/mgmapi/ndb_logevent.txt
    1.1 05/05/26 16:41:00 tomas@stripped +56 -0

  storage/ndb/include/mgmapi/ndb_logevent.txt
    1.0 05/05/26 16:41:00 tomas@stripped +0 -0
    BitKeeper file
/home/tomas/mysql-5.1-wl2325/storage/ndb/include/mgmapi/ndb_logevent.txt

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	tomas
# Host:	poseidon.ndb.mysql.com
# Root:	/home/tomas/mysql-5.1-wl2325

--- 1.55/storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp	2005-05-26 16:24:04 +02:00
+++ 1.56/storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp	2005-05-26 16:43:00 +02:00
@@ -1100,15 +1100,14 @@
 
     if (unlikely(data == 0))
     {
-#if 0
+#if 0 // not decided where this should go
       {
-	Uint32 data[3];
+	Uint32 data[4];
 	data[0]= NDB_LE_EventBufferUsage;
 	data[1]= 0;
 	data[2]= m_total_alloc;
 	data[3]= 0;
 	m_ndb->theImpl->send_event_report(data,4);
-	ndbout_c("m_total_alloc %d", m_total_alloc);
       }
 #endif
       expand(4000);
--- New file ---
+++ storage/ndb/include/mgmapi/ndb_logevent.txt	05/05/26 16:41:00
To add a new event edit the following 3 files in totally 5 places:

example shows EventBufferUsage added.

Public interface:

*** ndb/include/mgmapi/ndb_logevent.h

    /** NDB_MGM_EVENT_CATEGORY_INFO */
    NDB_LE_EventBufferUsage = 58
...


      /** Log event specific data for for corresponding NDB_LE_ log event */
      struct {
	unsigned usage;
	unsigned avail;
      } EventBufferUsage;

*** ndb/src/mgmapi/ndb_logevent.cpp

  ROW( EventBufferUsage, "usage", 1, usage),
  ROW( EventBufferUsage, "avail", 2, avail),



Internal impl:

*** ndb/src/common/debugger/EventLogger.cpp

void getTextEventBufferUsage(QQQQ) {
  BaseString::snprintf(m_text, m_text_len,
		       "Event buffer usage: %d(%d\%)",
		       theData[1],
		       theData[2] ? (theData[1]*100)/theData[2] : 0);
}

...

  ROW(EventBufferUsage,        LogLevel::llInfo,   7, Logger::LL_INFO ),

*** sending event from ndbd kernel

      Uint32 *data= signal->getDataPtrSend();
      data[0]= NDB_LE_EventBufferUsage;
      data[1]= 0;
      data[2]= 0;
      sendSignal(CMVMI_REF, GSN_EVENT_REP, signal, 3, JBB);

*** sending event from ndbapi (internal)

	Uint32 data[3];
	data[0]= NDB_LE_EventBufferUsage;
	data[1]= 0;
	data[2]= 0;
	m_ndb->theImpl->send_event_report(data,3);