Change PullConsumer model to CLUSTER & format example code style

.gitignore

@@ -1,6 +1,6 @@
 .idea
 cmake-build-debug/
-bin 
-libs
-
+bin
+build
+libs/signature/lib
 tmp_*

example/Producer.c

@@ -14,45 +14,55 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-#ifndef WIN32
-#include <unistd.h>
-#endif
+
 #include <stdio.h>
 
 #include "CProducer.h"
 #include "CCommon.h"
 #include "CMessage.h"
 #include "CSendResult.h"
 
-void startSendMessage(CProducer* producer)
-{
+#ifdef _WIN32
+#include <windows.h>
+#else
+
+#include <unistd.h>
+#include <memory.h>
+
+#endif
+
+void thread_sleep(unsigned milliseconds) {
+#ifdef _WIN32
+    Sleep(milliseconds);
+#else
+    usleep(milliseconds * 1000);  // takes microseconds
+#endif
+}
+
+void startSendMessage(CProducer *producer) {
     int i = 0;
     char DestMsg[256];
-    CMessage* msg = CreateMessage("T_TestTopic");
-    SetMessageTags(msg,"Test_Tag");
-    SetMessageKeys(msg,"Test_Keys");
+    CMessage *msg = CreateMessage("T_TestTopic");
+    SetMessageTags(msg, "Test_Tag");
+    SetMessageKeys(msg, "Test_Keys");
     CSendResult result;
-    for( i=0; i<10; i++)
-    {
-        printf("send one message : %d\n",i);
-	memset(DestMsg,0,sizeof(DestMsg));
-        snprintf(DestMsg,255,"New message body: index %d",i);
-        SetMessageBody(msg,DestMsg);
+    for (i = 0; i < 10; i++) {
+        printf("send one message : %d\n", i);
+        memset(DestMsg, 0, sizeof(DestMsg));
+        snprintf(DestMsg, 255, "New message body: index %d", i);
+        SetMessageBody(msg, DestMsg);
         SendMessageSync(producer, msg, &result);
-        printf("Msg Send ID:%s\n",result.msgId);
-#ifndef WIN32
-        sleep(1);
-#endif
+        printf("Msg Send ID:%s\n", result.msgId);
+        thread_sleep(1000);
     }
 }
 
 
-int main(int argc,char * argv [ ])
-{
+int main(int argc, char *argv[]) {
     printf("Producer Initializing.....\n");
 
-    CProducer* producer = CreateProducer("Group_producer");
-    SetProducerNameServerAddress(producer,"172.17.0.2:9876");
+    CProducer *producer = CreateProducer("Group_producer");
+    SetProducerNameServerAddress(producer, "172.17.0.2:9876");
     StartProducer(producer);
     printf("Producer start.....\n");
     startSendMessage(producer);

example/PullConsumeMessage.c

@@ -14,19 +14,31 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-#ifndef WIN32
-#include <unistd.h>
-#endif
-#include <stdio.h>
-
 
+#include <stdio.h>
 
 #include "CPullConsumer.h"
 #include "CCommon.h"
 #include "CMessageExt.h"
 #include "CPullResult.h"
 #include "CMessageQueue.h"
 
+#ifdef _WIN32
+#include <windows.h>
+#else
+
+#include <unistd.h>
+#include <memory.h>
+
+#endif
+
+void thread_sleep(unsigned milliseconds) {
+#ifdef _WIN32
+    Sleep(milliseconds);
+#else
+    usleep(milliseconds * 1000);  // takes microseconds
+#endif
+}
 
 int main(int argc,char * argv [])
 {
@@ -39,7 +51,7 @@ int main(int argc,char * argv [])
     for( i=0; i<10; i++)
     {
         printf("Now Running : %d S\n",i*10);
-        sleep(10);
+        thread_sleep(10000);
     }
     ShutdownPullConsumer(consumer);
     DestroyPullConsumer(consumer);

example/PushConsumeMessage.c

@@ -14,48 +14,52 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-#ifndef WIN32
-#include <unistd.h>
-#else
-#include <windows.h>
-void sleep(int interval) {
-	Sleep(interval * 10);
-}
-#endif
-#include <stdio.h>
-
 
+#include <stdio.h>
 
 #include "CPushConsumer.h"
 #include "CCommon.h"
 #include "CMessageExt.h"
 
+#ifdef _WIN32
+#include <windows.h>
+#else
+
+#include <unistd.h>
+#include <memory.h>
+
+#endif
+
+void thread_sleep(unsigned milliseconds) {
+#ifdef _WIN32
+    Sleep(milliseconds);
+#else
+    usleep(milliseconds * 1000);  // takes microseconds
+#endif
+}
 
-int doConsumeMessage(struct CPushConsumer * consumer, CMessageExt * msgExt)
-{
+int doConsumeMessage(struct CPushConsumer *consumer, CMessageExt *msgExt) {
     printf("Hello,doConsumeMessage by Application!\n");
-    printf("Msg Topic:%s\n",GetMessageTopic(msgExt));
-    printf("Msg Tags:%s\n",GetMessageTags(msgExt));
-    printf("Msg Keys:%s\n",GetMessageKeys(msgExt));
-    printf("Msg Body:%s\n",GetMessageBody(msgExt));
+    printf("Msg Topic:%s\n", GetMessageTopic(msgExt));
+    printf("Msg Tags:%s\n", GetMessageTags(msgExt));
+    printf("Msg Keys:%s\n", GetMessageKeys(msgExt));
+    printf("Msg Body:%s\n", GetMessageBody(msgExt));
     return E_CONSUME_SUCCESS;
 }
 
 
-int main(int argc,char * argv [])
-{
+int main(int argc, char *argv[]) {
     int i = 0;
     printf("PushConsumer Initializing....\n");
-    CPushConsumer* consumer = CreatePushConsumer("Group_Consumer_Test");
-    SetPushConsumerNameServerAddress(consumer,"172.17.0.2:9876");
-    Subscribe(consumer,"T_TestTopic","*");
-    RegisterMessageCallback(consumer,doConsumeMessage);
+    CPushConsumer *consumer = CreatePushConsumer("Group_Consumer_Test");
+    SetPushConsumerNameServerAddress(consumer, "172.17.0.2:9876");
+    Subscribe(consumer, "T_TestTopic", "*");
+    RegisterMessageCallback(consumer, doConsumeMessage);
     StartPushConsumer(consumer);
     printf("Push Consumer Start...\n");
-    for( i=0; i<10; i++)
-    {
-        printf("Now Running : %d S\n",i*10);
-        sleep(10);
+    for (i = 0; i < 10; i++) {
+        printf("Now Running : %d S\n", i * 10);
+        thread_sleep(10000);
     }
     ShutdownPushConsumer(consumer);
     DestroyPushConsumer(consumer);

src/consumer/DefaultMQPullConsumer.cpp

@@ -43,7 +43,7 @@ DefaultMQPullConsumer::DefaultMQPullConsumer(const string& groupname)
   string gname = groupname.empty() ? DEFAULT_CONSUMER_GROUP : groupname;
   setGroupName(gname);
 
-  setMessageModel(BROADCASTING);
+  setMessageModel(CLUSTERING);
 }
 
 DefaultMQPullConsumer::~DefaultMQPullConsumer() {