Permalink
Browse files

Fixes indentation

  • Loading branch information...
1 parent 780d285 commit db9fad3a5b01ea8b2e251d2ea1c02d205d605216 @gelinasc gelinasc committed Mar 2, 2013
Showing with 1,540 additions and 1,339 deletions.
  1. +4 −3 cluster/CCclient.c
  2. +11 −4 cluster/cc-client-marshal-adb.c
  3. +2 −1 cluster/cc-client-marshal.h
  4. +8 −4 cluster/handlers-state.c
  5. +146 −105 cluster/handlers.c
  6. +8 −4 cluster/handlers.h
  7. +5 −3 cluster/server-marshal.c
  8. +2 −1 cluster/server-marshal.h
  9. +9 −6 net/vnetwork.c
  10. +8 −8 node/NCclient.c
  11. +31 −26 node/client-marshal-adb.c
  12. +25 −20 node/client-marshal-fake.c
  13. +8 −5 node/client-marshal-local.c
  14. +12 −11 node/client-marshal.h
  15. +107 −92 node/handlers.c
  16. +29 −22 node/handlers.h
  17. +55 −44 node/handlers_default.c
  18. +51 −54 node/handlers_kvm.c
  19. +7 −7 node/handlers_xen.c
  20. +7 −7 node/hooks.c
  21. +10 −9 node/libvirt_tortura.c
  22. +16 −11 node/server-marshal.c
  23. +3 −3 node/test_nc.c
  24. +20 −18 node/xml.c
  25. +4 −4 storage/Wclient.c
  26. +18 −16 storage/backing.c
  27. +2 −2 storage/backing.h
  28. +247 −226 storage/blobstore.c
  29. +41 −40 storage/blobstore.h
  30. +13 −10 storage/diskutil.c
  31. +2 −2 storage/diskutil.h
  32. +16 −16 storage/http.c
  33. +3 −3 storage/iscsi.c
  34. +1 −1 storage/map.c
  35. +3 −3 storage/map.h
  36. +4 −4 storage/storage-windows.c
  37. +99 −84 storage/vbr.c
  38. +21 −20 storage/vbr.h
  39. +19 −19 storage/walrus.c
  40. +17 −10 util/adb-helpers.h
  41. +4 −3 util/config.c
  42. +2 −2 util/config.h
  43. +4 −2 util/data.c
  44. +142 −141 util/data.h
  45. +3 −3 util/euca_auth.c
  46. +15 −9 util/euca_axis.c
  47. +4 −2 util/euca_axis.h
  48. +4 −4 util/euca_string.c
  49. +20 −20 util/eucalyptus.h
  50. +13 −10 util/fault.c
  51. +12 −12 util/hash.c
  52. +3 −3 util/ipc.c
  53. +10 −10 util/ipc.h
  54. +50 −50 util/log.c
  55. +1 −1 util/log.h
  56. +31 −31 util/misc.c
  57. +5 −5 util/misc.h
  58. +83 −64 util/sensor.c
  59. +17 −16 util/sensor.h
  60. +2 −2 util/test.c
  61. +9 −9 util/utf8.c
  62. +8 −8 util/wc.c
  63. +4 −4 util/wc.h
View
@@ -296,7 +296,8 @@ int main(int argc, char **argv)
if (argv[11])
ramdiskURL = argv[11];
- rc = cc_runInstances(amiId, amiURL, kernelId, kernelURL, ramdiskId, ramdiskURL, atoi(argv[7]), atoi(argv[8]), argv[9], &params, env, stub);
+ rc = cc_runInstances(amiId, amiURL, kernelId, kernelURL, ramdiskId, ramdiskURL, atoi(argv[7]), atoi(argv[8]), argv[9], &params, env,
+ stub);
if (rc != 0) {
printf("cc_runInstances() failed: in:%s out:%d\n", argv[4], rc);
exit(1);
@@ -484,13 +485,13 @@ int main(int argc, char **argv)
sensor_res2str(buf, sizeof(buf), res, resSize);
printf("resources: %d\n%s\n", resSize, buf);
} else if (!strcmp(argv[2], "modifyNode")) {
- rc = cc_modifyNode(argv[3], argv[4], env, stub);
+ rc = cc_modifyNode(argv[3], argv[4], env, stub);
if (rc != 0) {
printf("cc_modifyNode() failed: error=%d\n", rc);
exit(1);
}
} else if (!strcmp(argv[2], "migrateInstances")) {
- rc = cc_migrateInstances(argv[3], env, stub);
+ rc = cc_migrateInstances(argv[3], env, stub);
if (rc != 0) {
printf("cc_migrateInstances() failed: error=%d\n", rc);
exit(1);
@@ -150,7 +150,8 @@ int cc_stopNetwork(int vlan, char *netName, axutil_env_t * env, axis2_stub_t * p
int cc_attachVolume(char *volumeId, char *instanceId, char *remoteDev, char *localDev, axutil_env_t * env, axis2_stub_t * pStub);
int cc_detachVolume(char *volumeId, char *instanceId, char *remoteDev, char *localDev, int force, axutil_env_t * env, axis2_stub_t * pStub);
int cc_createImage(char *volumeId, char *instanceId, char *remoteDev, axutil_env_t * env, axis2_stub_t * pStub);
-int cc_bundleInstance(char *instanceId, char *bucketName, char *filePrefix, char *walrusURL, char *userPublicKey, axutil_env_t * env, axis2_stub_t * pStub);
+int cc_bundleInstance(char *instanceId, char *bucketName, char *filePrefix, char *walrusURL, char *userPublicKey, axutil_env_t * env,
+ axis2_stub_t * pStub);
int cc_bundleRestartInstance(char *instanceId, axutil_env_t * env, axis2_stub_t * pStub);
int cc_assignAddress(char *src, char *dst, axutil_env_t * env, axis2_stub_t * pStub);
int cc_unassignAddress(char *src, char *dst, axutil_env_t * env, axis2_stub_t * pStub);
@@ -683,7 +684,8 @@ int cc_createImage(char *volumeId, char *instanceId, char *remoteDev, axutil_env
//!
//! @note
//!
-int cc_bundleInstance(char *instanceId, char *bucketName, char *filePrefix, char *walrusURL, char *userPublicKey, axutil_env_t * env, axis2_stub_t * pStub)
+int cc_bundleInstance(char *instanceId, char *bucketName, char *filePrefix, char *walrusURL, char *userPublicKey, axutil_env_t * env,
+ axis2_stub_t * pStub)
{
int i = 0;
adb_BundleInstance_t *input = NULL;
@@ -1220,7 +1222,10 @@ int cc_describeInstances(char **instIds, int instIdsLen, axutil_env_t * env, axi
adb_netConfigType_get_privateIp(nct, env), adb_netConfigType_get_publicIp(nct, env), adb_netConfigType_get_vlan(nct, env),
keyName, adb_virtualMachineType_get_name(vm, env), adb_virtualMachineType_get_cores(vm, env),
adb_virtualMachineType_get_memory(vm, env), adb_virtualMachineType_get_disk(vm, env), adb_ccInstanceType_get_serviceTag(it, env),
- adb_ccInstanceType_get_userData(it, env), adb_ccInstanceType_get_launchIndex(it, env), adb_ccInstanceType_get_groupNames_at(it, env, 0), volId, networkIndex);
+ adb_ccInstanceType_get_userData(it, env), adb_ccInstanceType_get_launchIndex(it, env), adb_ccInstanceType_get_groupNames_at(it,
+ env,
+ 0),
+ volId, networkIndex);
}
}
}
@@ -1299,7 +1304,8 @@ int cc_runInstances(char *amiId, char *amiURL, char *kernelId, char *kernelURL,
mac = EUCA_ALLOC(SIZE, sizeof(char));
for (i = 0; i < num; i++) {
- snprintf(mac, SIZE, "aa:dd:11:%c%c:%c%c:%c%c", rand() % 5 + 65, rand() % 5 + 65, rand() % 5 + 65, rand() % 5 + 65, rand() % 5 + 65, rand() % 5 + 65);
+ snprintf(mac, SIZE, "aa:dd:11:%c%c:%c%c:%c%c", rand() % 5 + 65, rand() % 5 + 65, rand() % 5 + 65, rand() % 5 + 65, rand() % 5 + 65,
+ rand() % 5 + 65);
adb_runInstancesType_add_macAddresses(rit, env, mac);
snprintf(instId, SIZE, "i-");
@@ -1801,6 +1807,7 @@ int cc_modifyNode(char *nodeName, char *stateName, axutil_env_t * env, axis2_stu
printf("modifyNode returned status %d\n", adb_modifyNodeResponseType_get_return(snrt, env));
return (0);
}
+
//!
//! Marshalls and invokes the node controller modification request
//!
@@ -129,7 +129,8 @@ int cc_stopNetwork(int vlan, char *netName, axutil_env_t * env, axis2_stub_t * p
int cc_attachVolume(char *volumeId, char *instanceId, char *remoteDev, char *localDev, axutil_env_t * env, axis2_stub_t * pStub);
int cc_detachVolume(char *volumeId, char *instanceId, char *remoteDev, char *localDev, int force, axutil_env_t * env, axis2_stub_t * pStub);
int cc_createImage(char *volumeId, char *instanceId, char *remoteDev, axutil_env_t * env, axis2_stub_t * pStub);
-int cc_bundleInstance(char *instanceId, char *bucketName, char *filePrefix, char *walrusURL, char *userPublicKey, axutil_env_t * env, axis2_stub_t * pStub);
+int cc_bundleInstance(char *instanceId, char *bucketName, char *filePrefix, char *walrusURL, char *userPublicKey, axutil_env_t * env,
+ axis2_stub_t * pStub);
int cc_bundleRestartInstance(char *instanceId, axutil_env_t * env, axis2_stub_t * pStub);
int cc_assignAddress(char *src, char *dst, axutil_env_t * env, axis2_stub_t * pStub);
int cc_unassignAddress(char *src, char *dst, axutil_env_t * env, axis2_stub_t * pStub);
View
@@ -593,9 +593,11 @@ int instIpSync(ccInstance * inst, void *in)
LOGDEBUG("instanceId=%s CCpublicIp=%s CCprivateIp=%s CCprivateMac=%s CCvlan=%d CCnetworkIndex=%d NCpublicIp=%s NCprivateIp=%s NCprivateMac=%s "
"NCvlan=%d NCnetworkIndex=%d\n", inst->instanceId, inst->ccnet.publicIp, inst->ccnet.privateIp, inst->ccnet.privateMac, inst->ccnet.vlan,
- inst->ccnet.networkIndex, inst->ncnet.publicIp, inst->ncnet.privateIp, inst->ncnet.privateMac, inst->ncnet.vlan, inst->ncnet.networkIndex);
+ inst->ccnet.networkIndex, inst->ncnet.publicIp, inst->ncnet.privateIp, inst->ncnet.privateMac, inst->ncnet.vlan,
+ inst->ncnet.networkIndex);
- if (inst->ccnet.vlan == 0 && inst->ccnet.networkIndex == 0 && inst->ccnet.publicIp[0] == '\0' && inst->ccnet.privateIp[0] == '\0' && inst->ccnet.privateMac[0] == '\0') {
+ if (inst->ccnet.vlan == 0 && inst->ccnet.networkIndex == 0 && inst->ccnet.publicIp[0] == '\0' && inst->ccnet.privateIp[0] == '\0'
+ && inst->ccnet.privateMac[0] == '\0') {
// ccnet is completely empty, make a copy of ncnet
LOGDEBUG("ccnet is empty, copying ncnet\n");
memcpy(&(inst->ccnet), &(inst->ncnet), sizeof(netConfig));
@@ -634,14 +636,16 @@ int instIpSync(ccInstance * inst, void *in)
inst->ccnet.vlan = inst->ncnet.vlan;
if (inst->ccnet.vlan >= 0) {
if (!vnetconfig->networks[inst->ccnet.vlan].active) {
- LOGWARN("detected instance from NC that is running in a currently inactive network; will attempt to re-activate network '%d'\n", inst->ccnet.vlan);
+ LOGWARN("detected instance from NC that is running in a currently inactive network; will attempt to re-activate network '%d'\n",
+ inst->ccnet.vlan);
ret++;
}
}
// networkIndex cases
if (inst->ccnet.networkIndex != inst->ncnet.networkIndex) {
// problem
- LOGERROR("CC and NC networkIndicies differ instanceId=%s CCnetworkIndex=%d NCnetworkIndex=%d\n", inst->instanceId, inst->ccnet.networkIndex, inst->ncnet.networkIndex);
+ LOGERROR("CC and NC networkIndicies differ instanceId=%s CCnetworkIndex=%d NCnetworkIndex=%d\n", inst->instanceId, inst->ccnet.networkIndex,
+ inst->ncnet.networkIndex);
}
inst->ccnet.networkIndex = inst->ncnet.networkIndex;
Oops, something went wrong.

0 comments on commit db9fad3

Please sign in to comment.