enlightenment/enlightenment
enlightenment
/
enlightenment
10
9
Fork 12
Code Issues 24 Pull Requests 2 Projects Releases Wiki Activity

Disbale all RRR and DRM-RRR debuig messages. As well as connman module debug

This commit is contained in:
Stefan Schmidt 2015-08-18 16:22:06 +02:00
parent 6eefae4822
commit 5a173c0828
4 changed files with 88 additions and 87 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

96
src/bin/e_randr2.c
View File

@ -157,11 +157,11 @@ static Evas_Object *_fade_obj = NULL;
static Eina_Bool
_screen_closed(E_Randr2_Screen *s)
{
printf("RRR: check lid for %s...\n", s->info.name);
//printf("RRR: check lid for %s...\n", s->info.name);
if (!e_acpi_lid_is_closed()) return EINA_FALSE;
if (s->info.is_lid)
{
printf("RRR: is closed lid\n");
//printf("RRR: is closed lid\n");
return EINA_TRUE;
}
return EINA_FALSE;
@ -245,19 +245,19 @@ static void
_do_apply(void)
{
// take current screen config and apply it to the driver
printf("RRR: re-get info before applying..\n");
//printf("RRR: re-get info before applying..\n");
_info_free(e_randr2);
e_randr2 = e_comp->screen->create();
_screen_config_maxsize();
printf("RRR: apply config...\n");
//printf("RRR: apply config...\n");
_config_apply(e_randr2, e_randr2_cfg);
printf("RRR: takeover config...\n");
//printf("RRR: takeover config...\n");
_screen_config_takeover();
printf("RRR: eval config...\n");
//printf("RRR: eval config...\n");
_screen_config_eval();
printf("RRR: really apply config...\n");
//printf("RRR: really apply config...\n");
e_comp->screen->apply();
printf("RRR: done config...\n");
//printf("RRR: done config...\n");
}
static void
@ -297,7 +297,7 @@ _config_load(void)
}
else
{
printf("RRR: loaded existing config\n");
//printf("RRR: loaded existing config\n");
return cfg;
}
}
@ -309,7 +309,7 @@ _config_load(void)
cfg->restore = 1;
cfg->ignore_hotplug_events = 0;
cfg->ignore_acpi_events = 0;
printf("RRR: fresh config\n");
//printf("RRR: fresh config\n");
return cfg;
}
@ -339,10 +339,10 @@ _config_update(E_Randr2 *r, E_Config_Randr2 *cfg)
E_Randr2_Screen *s;
E_Config_Randr2_Screen *cs;
printf("--------------------------------------------------\n");
//printf("--------------------------------------------------\n");
EINA_LIST_FOREACH(r->screens, l, s)
{
printf("RRR: out id=%s: connected=%i\n", s->id, s->info.connected);
//printf("RRR: out id=%s: connected=%i\n", s->id, s->info.connected);
if ((!s->id) || (!s->info.connected) || (_screen_closed(s))) continue;
cs = e_randr2_config_screen_find(s, cfg);
if (!cs)
@ -368,7 +368,7 @@ _config_update(E_Randr2 *r, E_Config_Randr2 *cfg)
cs->enabled = s->config.enabled;
}
}
printf("--------------------------------------------------\n");
//printf("--------------------------------------------------\n");
}
static void
@ -419,20 +419,20 @@ _config_apply(E_Randr2 *r, E_Config_Randr2 *cfg)
if ((!r) || (!cfg)) return;
EINA_LIST_FOREACH(r->screens, l, s)
{
printf("RRR: apply '%s'...\n", s->info.name);
//printf("RRR: apply '%s'...\n", s->info.name);
cs = NULL;
if ((!_screen_closed(s)) && (s->info.connected))
cs = e_randr2_config_screen_find(s, cfg);
printf("RRR: connected = %i\n", s->info.connected);
//printf("RRR: connected = %i\n", s->info.connected);
if ((cs) && (cs->enabled))
{
printf("RRR: ... enabled\n");
printf("RRR: ... priority = %i\n", cs->priority);
//printf("RRR: ... enabled\n");
//printf("RRR: ... priority = %i\n", cs->priority);
_config_really_apply(s, cs);
}
else if ((!cs) && (!_screen_closed(s)))
{
printf("RRR: ... no config found...\n");
//printf("RRR: ... no config found...\n");
cs2 = NULL;
if (s->info.connected)
{
@ -460,23 +460,23 @@ _config_apply(E_Randr2 *r, E_Config_Randr2 *cfg)
}
if (cs2)
{
printf("RRR: ... enabled - fallback clone\n");
//printf("RRR: ... enabled - fallback clone\n");
_config_really_apply(s, cs2);
free(s->config.relative.to);
s->config.relative.to = strdup(cs2->id);
printf("RRR: ... clone = %s\n", s->config.relative.to);
//printf("RRR: ... clone = %s\n", s->config.relative.to);
s->config.relative.mode = E_RANDR2_RELATIVE_CLONE;
s->config.relative.align = 0.0;
}
else
{
printf("RRR: ... disabled\n");
//printf("RRR: ... disabled\n");
_config_really_apply(s, NULL);
}
}
else
{
printf("RRR: ... disabled\n");
//printf("RRR: ... disabled\n");
_config_really_apply(s, NULL);
}
s->config.configured = EINA_TRUE;
@ -543,9 +543,9 @@ _screens_differ(E_Randr2 *r1, E_Randr2 *r2)
s1 = _screens_fingerprint(r1);
s2 = _screens_fingerprint(r2);
if ((!s1) && (!s2)) return EINA_FALSE;
printf("RRR: check fingerprint...\n");
//printf("RRR: check fingerprint...\n");
if ((s1) && (s2) && (strcmp(s1, s2))) changed = EINA_TRUE;
printf("RRR: ... fingerprint says %i\n", changed);
//printf("RRR: ... fingerprint says %i\n", changed);
free(s1);
free(s2);
// check screen config
@ -569,7 +569,7 @@ _screens_differ(E_Randr2 *r1, E_Randr2 *r2)
(s->info.lid_closed != ss->info.lid_closed))
changed = EINA_TRUE;
}
printf("RRR: changed = %i\n", changed);
//printf("RRR: changed = %i\n", changed);
return changed;
}
@ -577,21 +577,21 @@ static Eina_Bool
_cb_screen_change_delay(void *data EINA_UNUSED)
{
_screen_delay_timer = NULL;
printf("RRR: ... %i %i\n", event_screen, event_ignore);
//printf("RRR: ... %i %i\n", event_screen, event_ignore);
// if we had a screen plug/unplug etc. event and we shouldnt ignore it...
if ((event_screen) && (!event_ignore))
{
E_Randr2 *rtemp;
Eina_Bool change = EINA_FALSE;
printf("RRR: reconfigure screens due to event...\n");
//printf("RRR: reconfigure screens due to event...\n");
rtemp = e_comp->screen->create();
if (rtemp)
{
if (_screens_differ(e_randr2, rtemp)) change = EINA_TRUE;
_info_free(rtemp);
}
printf("RRR: change = %i\n", change);
//printf("RRR: change = %i\n", change);
// we plugged or unplugged some monitor - re-apply config so
// known screens can be configured
if (change) e_randr2_config_apply();
@ -875,7 +875,7 @@ _screen_config_do(E_Randr2_Screen *s)
E_Randr2_Screen *s2 = NULL;
Eina_List *cloneset;
printf("RRR: screen do '%s'\n", s->info.name);
//printf("RRR: screen do '%s'\n", s->info.name);
if (_config_do_recurse > 5)
{
ERR("screen config loop!");
@ -897,7 +897,7 @@ _screen_config_do(E_Randr2_Screen *s)
// if this screen is relative TO something (clone or left/right etc.
// then calculate what it is relative to first
s2 = _screen_fuzzy_fallback_find(e_randr2_cfg, s->config.relative.to);
printf("RRR: '%s' is relative to '%s'\n", s->info.name, s2 ? s2->info.name : "NONE");
//printf("RRR: '%s' is relative to '%s'\n", s->info.name, s2 ? s2->info.name : "NONE");
if (s2)
{
_screen_config_do(s2);
@ -920,7 +920,7 @@ _screen_config_do(E_Randr2_Screen *s)
{
if (s->config.relative.mode == E_RANDR2_RELATIVE_CLONE)
{
printf("RRR: clone relative\n");
//printf("RRR: clone relative\n");
s->config.geom.x = s2->config.geom.x;
s->config.geom.y = s2->config.geom.y;
s->config.geom.w = s2->config.geom.w;
@ -932,7 +932,7 @@ _screen_config_do(E_Randr2_Screen *s)
}
else if (s->config.relative.mode == E_RANDR2_RELATIVE_TO_LEFT)
{
printf("RRR: to left relative\n");
//printf("RRR: to left relative\n");
s->config.geom.x = s2->config.geom.x - s->config.geom.w;
s->config.geom.y = s2->config.geom.y +
((s2->config.geom.h - s->config.geom.h) *
@ -940,7 +940,7 @@ _screen_config_do(E_Randr2_Screen *s)
}
else if (s->config.relative.mode == E_RANDR2_RELATIVE_TO_RIGHT)
{
printf("RRR: to right relative\n");
//printf("RRR: to right relative\n");
s->config.geom.x = s2->config.geom.x + s2->config.geom.w;
s->config.geom.y = s2->config.geom.y +
((s2->config.geom.h - s->config.geom.h) *
@ -948,7 +948,7 @@ _screen_config_do(E_Randr2_Screen *s)
}
else if (s->config.relative.mode == E_RANDR2_RELATIVE_TO_ABOVE)
{
printf("RRR: to above relative\n");
//printf("RRR: to above relative\n");
s->config.geom.x = s2->config.geom.x +
((s2->config.geom.w - s->config.geom.w) *
s->config.relative.align);
@ -956,7 +956,7 @@ _screen_config_do(E_Randr2_Screen *s)
}
else if (s->config.relative.mode == E_RANDR2_RELATIVE_TO_BELOW)
{
printf("RRR: to below relative\n");
//printf("RRR: to below relative\n");
s->config.geom.x = s2->config.geom.x +
((s2->config.geom.w - s->config.geom.w) *
s->config.relative.align);
@ -973,7 +973,7 @@ _screen_config_do(E_Randr2_Screen *s)
cs = _config_screen_clone_resolve(e_randr2_cfg,
s->config.relative.to, &x, &y);
printf("RRR: clone relative - config %p\n", cs);
//printf("RRR: clone relative - config %p\n", cs);
if (cs)
{
s->config.geom.x = x;
@ -1013,7 +1013,7 @@ _screen_config_eval(void)
miny = 65535;
maxx = -65536;
maxy = -65536;
printf("RRR:--------------------------------\n");
//printf("RRR:--------------------------------\n");
EINA_LIST_FOREACH(e_randr2->screens, l, s)
{
if (!s->config.enabled) continue;
@ -1023,12 +1023,12 @@ _screen_config_eval(void)
maxx = s->config.geom.x + s->config.geom.w;
if ((s->config.geom.y + s->config.geom.h) > maxy)
maxy = s->config.geom.y + s->config.geom.h;
printf("RRR: s: '%s' @ %i %i - %ix%i\n",
s->info.name,
s->config.geom.x, s->config.geom.y,
s->config.geom.w, s->config.geom.h);
//printf("RRR: s: '%s' @ %i %i - %ix%i\n",
//s->info.name,
//s->config.geom.x, s->config.geom.y,
//s->config.geom.w, s->config.geom.h);
}
printf("RRR:--- %i %i -> %i %i\n", minx, miny, maxx, maxy);
//printf("RRR:--- %i %i -> %i %i\n", minx, miny, maxx, maxy);
EINA_LIST_FOREACH(e_randr2->screens, l, s)
{
s->config.geom.x -= minx;
@ -1047,7 +1047,7 @@ _screen_config_maxsize(void)
maxx = -65536;
maxy = -65536;
printf("RRR:-------------------------------- 2\n");
//printf("RRR:-------------------------------- 2\n");
EINA_LIST_FOREACH(e_randr2->screens, l, s)
{
if (!s->config.enabled) continue;
@ -1055,12 +1055,12 @@ _screen_config_maxsize(void)
maxx = s->config.geom.x + s->config.geom.w;
if ((s->config.geom.y + s->config.geom.h) > maxy)
maxy = s->config.geom.y + s->config.geom.h;
printf("RRR: '%s': %i %i %ix%i\n",
s->info.name,
s->config.geom.x, s->config.geom.y,
s->config.geom.w, s->config.geom.h);
//printf("RRR: '%s': %i %i %ix%i\n",
//s->info.name,
//s->config.geom.x, s->config.geom.y,
//s->config.geom.w, s->config.geom.h);
}
printf("RRR: result max: %ix%i\n", maxx, maxy);
//printf("RRR: result max: %ix%i\n", maxx, maxy);
e_randr2->w = maxx;
e_randr2->h = maxy;
}

34
src/modules/connman/e_connman.c
View File

@ -54,7 +54,7 @@ static void _dbus_str_array_to_eina(Eldbus_Message_Iter *value, Eina_Array **old
while (eldbus_message_iter_get_and_next(itr_array, 's', &s))
{
eina_array_push(array, eina_stringshare_add(s));
DBG("Push %s", s);
//DBG("Push %s", s);
}
return;
@ -121,7 +121,7 @@ static enum Connman_Service_Type str_to_type(const char *s)
else if (!strcmp(s, "cellular"))
return CONNMAN_SERVICE_TYPE_CELLULAR;
DBG("Unknown type %s", s);
//DBG("Unknown type %s", s);
return CONNMAN_SERVICE_TYPE_NONE;
}
@ -150,7 +150,7 @@ static void _service_parse_prop_changed(struct Connman_Service *cs,
const char *prop_name,
Eldbus_Message_Iter *value)
{
DBG("service %p %s prop %s", cs, cs->path, prop_name);
//DBG("service %p %s prop %s", cs, cs->path, prop_name);
if (strcmp(prop_name, "State") == 0)
{
@ -159,7 +159,7 @@ static void _service_parse_prop_changed(struct Connman_Service *cs,
"s",
&state));
cs->state = str_to_state(state);
DBG("New state: %s %d", state, cs->state);
//DBG("New state: %s %d", state, cs->state);
}
else if (strcmp(prop_name, "Name") == 0)
{
@ -169,7 +169,7 @@ static void _service_parse_prop_changed(struct Connman_Service *cs,
&name));
free(cs->name);
cs->name = strdup(name);
DBG("New name: %s", cs->name);
//DBG("New name: %s", cs->name);
}
else if (strcmp(prop_name, "Type") == 0)
{
@ -178,7 +178,7 @@ static void _service_parse_prop_changed(struct Connman_Service *cs,
"s",
&type));
cs->type = str_to_type(type);
DBG("New type: %s %d", type, cs->type);
//DBG("New type: %s %d", type, cs->type);
}
else if (strcmp(prop_name, "Strength") == 0)
{
@ -187,14 +187,14 @@ static void _service_parse_prop_changed(struct Connman_Service *cs,
"y",
&strength));
cs->strength = strength;
DBG("New strength: %d", strength);
//DBG("New strength: %d", strength);
}
else if (strcmp(prop_name, "Security") == 0)
{
DBG("Old security count: %d",
cs->security ? eina_array_count(cs->security) : 0);
//DBG("Old security count: %d",
// cs->security ? eina_array_count(cs->security) : 0);
_dbus_str_array_to_eina(value, &cs->security, 2);
DBG("New security count: %d", eina_array_count(cs->security));
//DBG("New security count: %d", eina_array_count(cs->security));
}
}
@ -437,7 +437,7 @@ static void _manager_services_remove(struct Connman_Manager *cm,
continue;
}
cm->services = eina_inlist_remove(cm->services, EINA_INLIST_GET(cs));
DBG("Removed service: %p %s", cs, path);
//DBG("Removed service: %p %s", cs, path);
_service_free(cs);
}
}
@ -472,14 +472,14 @@ static void _manager_services_changed(void *data, const Eldbus_Message *msg)
if (!cs)
{
cs = _service_new(path, array);
DBG("Added service: %p %s", cs, path);
//DBG("Added service: %p %s", cs, path);
}
else
{
_service_prop_dict_changed(cs, array);
cm->services = eina_inlist_remove(cm->services,
EINA_INLIST_GET(cs));
DBG("Changed service: %p %s", cs, path);
//DBG("Changed service: %p %s", cs, path);
}
tmp = eina_inlist_append(tmp, EINA_INLIST_GET(cs));
}
@ -502,7 +502,7 @@ static void _manager_get_services_cb(void *data, const Eldbus_Message *msg,
ERR("Could not get services. %s: %s", name, text);
return;
}
DBG("cm->services=%p", cm->services);
//DBG("cm->services=%p", cm->services);
if (!eldbus_message_arguments_get(msg, "a(oa{sv})", &array))
{
@ -524,7 +524,7 @@ static void _manager_get_services_cb(void *data, const Eldbus_Message *msg,
continue;
cm->services = eina_inlist_append(cm->services, EINA_INLIST_GET(cs));
DBG("Added service: %p %s", cs, path);
//DBG("Added service: %p %s", cs, path);
}
econnman_mod_services_changed(cm);
}
@ -538,7 +538,7 @@ static bool _manager_parse_prop_changed(struct Connman_Manager *cm,
const char *state;
if (!eldbus_message_iter_arguments_get(value, "s", &state))
return false;
DBG("New state: %s", state);
//DBG("New state: %s", state);
cm->state = str_to_state(state);
}
else if (strcmp(name, "OfflineMode") == 0)
@ -675,7 +675,7 @@ _manager_agent_register_cb(void *data EINA_UNUSED, const Eldbus_Message *msg,
return;
}
INF("Agent registered");
//INF("Agent registered");
}
static void

8
src/modules/connman/e_mod_main.c
View File

@ -337,13 +337,13 @@ _econnman_mod_manager_update_inst(E_Connman_Module_Context *ctxt EINA_UNUSED,
snprintf(buf, sizeof(buf), "e,changed,technology,%s", typestr);
edje_object_signal_emit(o, buf, "e");
DBG("state=%d type=%d", state, type);
//DBG("state=%d type=%d", state, type);
}
static enum Connman_Service_Type _econnman_manager_service_type_get(
struct Connman_Manager *cm)
{
DBG("cm->services=%p", cm->services);
//DBG("cm->services=%p", cm->services);
if ((cm->services) && ((cm->state == CONNMAN_STATE_ONLINE) ||
(cm->state == CONNMAN_STATE_READY)))
@ -380,7 +380,7 @@ _econnman_gadget_setup(E_Connman_Instance *inst)
E_Connman_Module_Context *ctxt = inst->ctxt;
Evas_Object *o = inst->ui.gadget;
DBG("has_manager=%d", ctxt->cm != NULL);
//DBG("has_manager=%d", ctxt->cm != NULL);
if (!ctxt->cm)
{
@ -400,7 +400,7 @@ econnman_mod_manager_inout(struct Connman_Manager *cm)
const Eina_List *l;
E_Connman_Instance *inst;
DBG("Manager %s", cm ? "in" : "out");
//DBG("Manager %s", cm ? "in" : "out");
ctxt->cm = cm;
EINA_LIST_FOREACH(ctxt->instances, l, inst)

37
src/modules/wl_drm/e_mod_main.c
View File

@ -340,7 +340,7 @@ _drm_randr_create(void)
};
unsigned int type;
printf("DRM RRR: ................. info get!\n");
//printf("DRM RRR: ................. info get!\n");
r = E_NEW(E_Randr2, 1);
if (!r) return NULL;
@ -363,10 +363,10 @@ _drm_randr_create(void)
if (!s) continue;
s->info.name = ecore_drm_output_name_get(output);
printf("DRM RRR: .... out %s\n", s->info.name);
// printf("DRM RRR: .... out %s\n", s->info.name);
s->info.connected = ecore_drm_output_connected_get(output);
printf("DRM RRR: ...... connected %i\n", s->info.connected);
// printf("DRM RRR: ...... connected %i\n", s->info.connected);
s->info.screen = _e_mod_drm_output_screen_get(output);
@ -386,7 +386,7 @@ _drm_randr_create(void)
strcat(s->id, "/");
if (s->info.edid) strcat(s->id, s->info.edid);
printf("DRM RRR: Created Screen: %s\n", s->id);
// printf("DRM RRR: Created Screen: %s\n", s->id);
type = MIN(ecore_drm_output_connector_type_get(output),
EINA_C_ARRAY_LENGTH(conn_types) - 1);
@ -394,8 +394,8 @@ _drm_randr_create(void)
s->info.is_lid = ((type == DRM_MODE_CONNECTOR_LVDS) ||
(type == DRM_MODE_CONNECTOR_eDP));
s->info.lid_closed = (s->info.is_lid && e_acpi_lid_is_closed());
printf("DRM RRR: ...... lid_closed = %i (%i && %i)\n",
s->info.lid_closed, s->info.is_lid, e_acpi_lid_is_closed());
// printf("DRM RRR: ...... lid_closed = %i (%i && %i)\n",
// s->info.lid_closed, s->info.is_lid, e_acpi_lid_is_closed());
s->info.backlight = ecore_drm_output_backlight_get(output);
@ -469,9 +469,9 @@ _drm_randr_create(void)
s->config.enabled =
((s->config.mode.w != 0) && (s->config.mode.h != 0));
printf("DRM RRR: '%s' %i %i %ix%i\n", s->info.name,
s->config.geom.x, s->config.geom.y,
s->config.geom.w, s->config.geom.h);
// printf("DRM RRR: '%s' %i %i %ix%i\n", s->info.name,
// s->config.geom.x, s->config.geom.y,
// s->config.geom.w, s->config.geom.h);
}
/* TODO: are rotations possible ?? */
@ -514,7 +514,7 @@ _drm_randr_apply(void)
EINA_LIST_FOREACH(ecore_drm_devices_get(), l, dev)
{
ecore_drm_screen_size_range_get(dev, &minw, &minh, &maxw, &maxh);
printf("DRM RRR: size range: %ix%i -> %ix%i\n", minw, minh, maxw, maxh);
//printf("DRM RRR: size range: %ix%i -> %ix%i\n", minw, minh, maxw, maxh);
ecore_drm_outputs_geometry_get(dev, NULL, NULL, &pw, &ph);
if (nw > maxw) nw = maxw;
@ -526,35 +526,35 @@ _drm_randr_apply(void)
if (nw < pw) ww = pw;
if (nh < ph) hh = ph;
printf("DRM RRR: set vsize: %ix%i\n", ww, hh);
//printf("DRM RRR: set vsize: %ix%i\n", ww, hh);
EINA_LIST_FOREACH(e_randr2->screens, ll, s)
{
int orient;
Ecore_Drm_Output_Mode *mode = NULL;
printf("DRM RRR: find output for '%s'\n", s->info.name);
//printf("DRM RRR: find output for '%s'\n", s->info.name);
out = ecore_drm_device_output_name_find(dev, s->info.name);
if (!out) continue;
if (s->config.configured)
{
printf("\tDRM RRR: configured by E\n");
//printf("\tDRM RRR: configured by E\n");
if (s->config.enabled)
{
printf("\tDRM RRR: Enabled\n");
//printf("\tDRM RRR: Enabled\n");
mode = _e_mod_drm_mode_screen_find(s, out);
}
else
{
printf("\tDRM RRR: Disabled\n");
//printf("\tDRM RRR: Disabled\n");
}
if (s->config.priority > top_priority)
top_priority = s->config.priority;
#if 0
printf("\tDRM RRR: Priority: %d\n", s->config.priority);
printf("\tDRM RRR: Geom: %d %d %d %d\n",
@ -568,7 +568,7 @@ _drm_randr_apply(void)
}
else
printf("\tDRM RRR: No Valid Drm Mode Found\n");
#endif
if (s->config.rotation == 0)
orient = (1 << 0);
else if (s->config.rotation == 90)
@ -587,7 +587,7 @@ _drm_randr_apply(void)
ecore_drm_output_enable(out);
else
ecore_drm_output_disable(out);
#if 0
printf("\tDRM RRR: Mode\n");
printf("\t\tDRM RRR: Geom: %d %d\n",
s->config.mode.w, s->config.mode.h);
@ -602,6 +602,7 @@ _drm_randr_apply(void)
printf("\tDRM RRR: Relative To: %s\n",
s->config.relative.to);
printf("\tDRM RRR: Align: %f\n", s->config.relative.align);
#endif
}
}
}