Overview
Examples
Screenshots
Comparisons
Applications
Download
Documentation
Tutorials
Bazaar
Status & Roadmap
FAQ
Authors & License
Forums
Funding Ultimate++
Search on this site
Search in forums












SourceForge.net Logo
Home » Developing U++ » UppHub » [SysInfo - Improvement - Koldo] Better way to find distribution version & more
[SysInfo - Improvement - Koldo] Better way to find distribution version & more [message #40951] Sun, 13 October 2013 00:11 Go to next message
Klugier is currently offline  Klugier
Messages: 882
Registered: September 2012
Location: Poland, Kraków
Experienced Contributor
Hello Koldo,

I found a better way to find distribution version. I have replace function "GetOsInfo_CheckLsb" to "GetOsInfoCheckRelease".

static bool GetOsInfoCheckRelease(String &distro, String &distVersion) {
	StringParse release;
	for (FindFile ff(AppendFileName("/etc/", "*-release")); ff; ff.Next())
		release += LoadFile_Safe(ff.GetPath());
	
	if (release.IsEmpty())
		return false;
	if (!release.GoAfter("DISTRIB_ID="))
		return false;				
	distro = release.GetText();
	if (distro.IsEmpty())
		return false;
	
	release.GoAfter_Init("VERSION=");
	distVersion = release.GetText();

	return true;
}


I enclose full source file with additional changes (SysInfo/os.cpp).

P.S.
Are you sure about this assignation "distro = ubuntu" or "distro=fedora" (Shouldn't it be "Ubuntu" or "Fedora")? BTW, my version uses big letter notation.

Sincerely,
Klugier
  • Attachment: os.cpp
    (Size: 14.29KB, Downloaded 355 times)


Ultimate++ - one framework to rule them all.
Re: [SysInfo - Improvement - Koldo] Better way to find distribution version & more [message #40953 is a reply to message #40951] Sun, 13 October 2013 00:38 Go to previous messageGo to next message
koldo is currently offline  koldo
Messages: 3268
Registered: August 2008
Senior Veteran
Hello Klugier

Thank you for your work. Smile

You have changed:
- /etc/lsb-release with /etc/*-release
- DISTRIB_RELEASE= with VERSION=

Please send me the distros that you have tested.

About the lowercase, I think it is more standard to use "ubuntu" than "Ubuntu" and I hate the uppercases like "UBUNTU".


Best regards
Iñaki
Re: [SysInfo - Improvement - Koldo] Better way to find distribution version & more [message #40954 is a reply to message #40953] Sun, 13 October 2013 01:22 Go to previous messageGo to next message
Klugier is currently offline  Klugier
Messages: 882
Registered: September 2012
Location: Poland, Kraków
Experienced Contributor
Hello Koldo,

Following two lines of code are tricky:
for (FindFile ff(AppendFileName("/etc/", "*-release")); ff; ff.Next())
	release += LoadFile_Safe(ff.GetPath());

This means, that find all files, that have "release" chain in their names. File "lsb-release" dosen't contain full version information, so we need to scan other files with "release" in their names.

************************************************************ ************************************************************ **

Here is the output (Ubuntu 13.04):
DISTRIB_VERSION=13.04
VERSION=13.04, Raring Ringtail

VERSION can be replaced with VERSION_ID (And even DISTRIB_VERSION to ID):
VERSION_ID=13.04
ID=ubuntu
************************************************************ ************************************************************ **

You can type following command in your terminal: "cat /etc/*-release":
DISTRIB_ID=Ubuntu
DISTRIB_RELEASE=13.04
DISTRIB_CODENAME=raring
DISTRIB_DESCRIPTION="Ubuntu 13.04"
NAME="Ubuntu"
VERSION="13.04, Raring Ringtail"
ID=ubuntu
ID_LIKE=debian
PRETTY_NAME="Ubuntu 13.04"
VERSION_ID="13.04"
HOME_URL="http://www.ubuntu.com/"
SUPPORT_URL="http://help.ubuntu.com/"
BUG_REPORT_URL="http://bugs.launchpad.net/ubuntu/"


Personally, I think we can add more information about distribution to SysInfo.
************************************************************ ************************************************************ **

P.S.
I uploaded old file (It doesn't compile!!!).
*I enclose newer version with lowercase fix.

Sincerely,
Klugier
  • Attachment: os.cpp
    (Size: 14.31KB, Downloaded 412 times)


Ultimate++ - one framework to rule them all.

[Updated on: Sun, 13 October 2013 13:06]

Report message to a moderator

Re: [SysInfo - Improvement - Koldo] Better way to find distribution version & more [message #40955 is a reply to message #40954] Sun, 13 October 2013 01:58 Go to previous messageGo to next message
Klugier is currently offline  Klugier
Messages: 882
Registered: September 2012
Location: Poland, Kraków
Experienced Contributor
Here is the final version of the function:
static bool GetOsInfoCheckRelease(String &distro, String &distVersion) 
{
	StringParse release;
	for (FindFile ff(AppendFileName("/etc/", "*-release")); ff; ff.Next())
		release += LoadFile_Safe(ff.GetPath());
	
	if (release.IsEmpty())
		return false;
	if (!release.GoAfter("DISTRIB_ID="))
		return false;	
	distro = ToLower(release.GetText());
	
	if (distro.IsEmpty())
		return false;
	
	release.GoAfter_Init("DISTRIB_RELEASE=");
	distVersion = release.GetText();

	return true;
}


I don't want to change current functionality, so i decided to stay with old qualifiers. In the future we can get more informations about distribution (with my extension). It is up to you.

P.S.
Moreover, you can change LoadFile_Safe function (Functions4U) to:
String LoadFile_Safe(const String& fileName);


insted of:

String LoadFile_Safe(String fileName);




Ultimate++ - one framework to rule them all.

[Updated on: Sun, 13 October 2013 13:06]

Report message to a moderator

Re: [SysInfo - Improvement - Koldo] Better way to find distribution version & more [message #40956 is a reply to message #40955] Sun, 13 October 2013 16:40 Go to previous messageGo to next message
koldo is currently offline  koldo
Messages: 3268
Registered: August 2008
Senior Veteran
Hello Klugier

I have included

	for (FindFile ff("/etc/*-release"); ff; ff.Next())
		release += LoadFile_Safe(ff.GetPath());	
because it does not hurt.

However you have to imagine that this function has to work with many different distros, not only Ubuntu. You can see SysInfo testing here: http://www.ultimatepp.org/srcimp$SysInfo$SysInfo$en-us.html




Best regards
Iñaki
Re: [SysInfo - Improvement - Koldo] Better way to find distribution version & more [message #41001 is a reply to message #40956] Fri, 18 October 2013 22:32 Go to previous messageGo to next message
Klugier is currently offline  Klugier
Messages: 882
Registered: September 2012
Location: Poland, Kraków
Experienced Contributor
Hello Koldo,

Did you forget to add reference in LoadFile_Safe function? In my opinion declaration of this function should look like:

String LoadFile_Safe(const String& fileName);


* Negligible change which can increase memory performance of yours packages (Including SysInfo Razz)

Sincerely,
Klugier


Ultimate++ - one framework to rule them all.
Re: [SysInfo - Improvement - Koldo] Better way to find distribution version & more [message #41002 is a reply to message #41001] Sat, 19 October 2013 00:37 Go to previous messageGo to next message
Klugier is currently offline  Klugier
Messages: 882
Registered: September 2012
Location: Poland, Kraków
Experienced Contributor
Hello Koldo,

Moreover, I wrote better handling for measuring cpu temperature on GNU/Linux (POSIX?). Now, SysInfo should use "hwmon" when "acpi" fails. Let's look at code:
static double GetCpuTemperatureViaAcpi() 
{
	FindFile ff;
	if(ff.Search("/proc/acpi/thermal_zone/*")) {
		do {
			if (ff.IsDirectory()) {
				String name = ff.GetName();
				if (name != "." && name != "..") {
					StringParse str = LoadFile_Safe(AppendFileName(AppendFileName("/proc/acpi/thermal_zone", name), "temperature"));			
					str.GoAfter("temperature:");
					return str.GetDouble();
				}
			}
		} while(ff.Next());
	}
	
	return Null;
}

static double GetCpuTemperatureViaHwmon() 
{
	Vector <double> temps;
	for (FindFile ff(AppendFileName("/sys/class/hwmon/hwmon0/device", "*input")); ff; ff.Next()) {
		if (!ff.IsHidden()) {
			String temp = LoadFile_Safe(ff.GetPath());
			if (!temp.IsEmpty())
				temps.Add((double)StrInt(temp) / 1000.0);
		}
	}
	
	double sumTemps = 0.0;
	for (int i = 0; i < temps.GetCount(); i++)
		sumTemps += temps[i];
	
	if (!temps.IsEmpty())
		return sumTemps / (double)temps.GetCount();
	else
		return Null;
}

double GetCpuTemperature() 
{
	double temp = Null;
	
	if (temp == (double)Null) temp = GetCpuTemperatureViaAcpi();
	if (temp == (double)Null) temp = GetCpuTemperatureViaHwmon();
	
	return temp;
}


* in this case "static" means that function should be use only in file where it was declared.

P.S.
Toomorow, I will enclose source file with above improvement.

Sincerely,
Klugier


Ultimate++ - one framework to rule them all.

[Updated on: Sat, 19 October 2013 00:50]

Report message to a moderator

Re: [SysInfo - Improvement - Koldo] Better way to find distribution version & more [message #41007 is a reply to message #41002] Sat, 19 October 2013 22:29 Go to previous messageGo to next message
Klugier is currently offline  Klugier
Messages: 882
Registered: September 2012
Location: Poland, Kraków
Experienced Contributor
Hello Koldo,

BTW, I noticed that LoadFile_Safe function is really useful for system files (like hwmon files). What is not good in Core package is that LoadFile dosen't provides such functionality. I tried loading hwmon files using LoadFile function, but in this case it dosen't work. I think we should discuss transfer LoadFile_Safe (LoadFileSafe? or LoadSystemFile?) function to Ultimate++ mainstream package (Core). What do you think guys?

Sincerely,
Klugier


Ultimate++ - one framework to rule them all.
Re: [SysInfo - Improvement - Koldo] Better way to find distribution version & more [message #41009 is a reply to message #41007] Sun, 20 October 2013 10:00 Go to previous messageGo to next message
koldo is currently offline  koldo
Messages: 3268
Registered: August 2008
Senior Veteran
Hello Klugier

LoadSystemFile() could be a good name.

These files (many in Linux) cannot be opened by LoadFile because it is not possible to know their size in advance, they are like pipes.


Best regards
Iñaki
Re: [SysInfo - Improvement - Koldo] Better way to find distribution version & more [message #41010 is a reply to message #41002] Sun, 20 October 2013 10:04 Go to previous messageGo to next message
koldo is currently offline  koldo
Messages: 3268
Registered: August 2008
Senior Veteran
Hello Klugier

It seems good.

For me to check it, could you tell me some distros where acpi is not used and Hwmon is used?


Best regards
Iñaki
Re: [SysInfo - Improvement - Koldo] Better way to find distribution version & more [message #41014 is a reply to message #41002] Sun, 20 October 2013 12:36 Go to previous messageGo to next message
Zbych is currently offline  Zbych
Messages: 318
Registered: July 2009
Senior Member
klugier wrote on Sat, 19 October 2013 00:37


static double GetCpuTemperatureViaHwmon()
{
Vector <double> temps;
for (FindFile ff(AppendFileName("/sys/class/hwmon/hwmon0/device", "*input")); ff; ff.Next()) {



Unfortunately it will not work on all systems. I checked some computers in my office:
1. intel, ubuntu 12.04, kernel 3.2, temperature location: /sys/class/hwmon/hwmon0/temp1_input (no device sub-dir)
2. intel, ubuntu 12.04, kernel 3.8, temperature location: /sys/devices/platform/coretemp.0/temp*_input
3. AMD, ubuntu 12.04, kernel 3.2, temperature location: /sys/class/hwmon/hwmon0/device/temp1_input

Maybe we should check libsensors to find out how it locates cpu temperature files.
Re: [SysInfo - Improvement - Koldo] Better way to find distribution version & more [message #41030 is a reply to message #41014] Tue, 22 October 2013 16:24 Go to previous messageGo to next message
koldo is currently offline  koldo
Messages: 3268
Registered: August 2008
Senior Veteran
Hello Zbych

Following your advice I am checking it.


Best regards
Iñaki
Re: [SysInfo - Improvement - Koldo] Better way to find distribution version & more [message #41044 is a reply to message #41030] Wed, 23 October 2013 22:13 Go to previous messageGo to next message
koldo is currently offline  koldo
Messages: 3268
Registered: August 2008
Senior Veteran
Hello

There is a libsensors test in the beginning of SysInfo_demo_console.

Please run it and report the results (Do not forget to install libsensors before).

In my case they are:

LibSensors version: 3.3.2
Results:
Chip: acpitz-virtual-0
	temperature: temp1
		input(RM)	temp1_input = 47
		critical(RM)	temp1_crit = 104
Chip: coretemp-isa-0000
	temperature: Core 0
		input(RM)	temp2_input = 52
		max(RM)	temp2_max = 85
		critical(RM)	temp2_crit = 85
		crit alarm(R)	temp2_crit_alarm = 0
	temperature: Core 1
		input(RM)	temp3_input = 48
		max(RM)	temp3_max = 85
		critical(RM)	temp3_crit = 85
		crit alarm(R)	temp3_crit_alarm = 0


Best regards
Iñaki
Re: [SysInfo - Improvement - Koldo] Better way to find distribution version & more [message #41045 is a reply to message #41030] Wed, 23 October 2013 22:46 Go to previous messageGo to next message
Klugier is currently offline  Klugier
Messages: 882
Registered: September 2012
Location: Poland, Kraków
Experienced Contributor
Hello Koldo,

Koldo, please noticed that libsensor is GPL library. It means that all applications which are linking to SysInfo should also use GPL license. Only the latest version of libsensors use LGPL license. I do not think that people linking their programs with libsensors want to risk so much.

To use my trick with temperature you don't need to link with libsensors, beacuse I read only system file. In this way, you can also get more information about the computer sensors state. The main problem of this solution is how to find appropriate path on certain linux version.

More information about libsensors licence you can find on official site.

Sincerely,
Klugier


Ultimate++ - one framework to rule them all.

[Updated on: Thu, 24 October 2013 01:55]

Report message to a moderator

Re: [SysInfo - Improvement - Koldo] Better way to find distribution version & more [message #41076 is a reply to message #41045] Tue, 29 October 2013 18:52 Go to previous messageGo to next message
koldo is currently offline  koldo
Messages: 3268
Registered: August 2008
Senior Veteran
Oh! Although it is LGPL I think we can get the information by our means Smile.

libsensors is now removed from SysInfo.


Best regards
Iñaki

[Updated on: Tue, 29 October 2013 19:02]

Report message to a moderator

Re: [SysInfo - Improvement - Koldo] Better way to find distribution version & more [message #41078 is a reply to message #41076] Tue, 29 October 2013 22:19 Go to previous messageGo to next message
Klugier is currently offline  Klugier
Messages: 882
Registered: September 2012
Location: Poland, Kraków
Experienced Contributor
Hello Koldo,

Can you add also following if statement at the end of GetCpuTemperatureHWMON function? Dividing by zero can be painful. This situation can occur when hwmon subsystem does not exist!

	if (!temps.IsEmpty())
		return sumTemps / (double)temps.GetCount();
	else
		return Null;


P.S.
Now, I am looking for optimal path for hwmon.

Sincerley,
Klugier


Ultimate++ - one framework to rule them all.
Re: [SysInfo - Improvement - Koldo] Better way to find distribution version & more [message #41081 is a reply to message #41078] Wed, 30 October 2013 09:17 Go to previous messageGo to next message
koldo is currently offline  koldo
Messages: 3268
Registered: August 2008
Senior Veteran
Thank you Klugier

Quote:

Now, I am looking for optimal path for hwmon.

I was going to do this so thank you for relieving me of this duty.

About the division by zero, I think actual code avoids that possibility.


Best regards
Iñaki
Re: [SysInfo - Improvement - Koldo] Better way to find distribution version & more [message #41086 is a reply to message #41081] Wed, 30 October 2013 15:12 Go to previous messageGo to next message
Klugier is currently offline  Klugier
Messages: 882
Registered: September 2012
Location: Poland, Kraków
Experienced Contributor
Hello Koldo,

Quote:

About the division by zero, I think actual code avoids that possibility.


No it doesn't, cause
(double)temps.GetCount()
can return zero if input files don't exist!!!

Sincerely,
Klugier


Ultimate++ - one framework to rule them all.

[Updated on: Wed, 30 October 2013 15:12]

Report message to a moderator

Re: [SysInfo - Improvement - Koldo] Better way to find distribution version & more [message #41089 is a reply to message #41086] Wed, 30 October 2013 21:37 Go to previous messageGo to next message
koldo is currently offline  koldo
Messages: 3268
Registered: August 2008
Senior Veteran
Hello Klugier

I think there is a misunderstanding. See actual code:

static double GetCpuTemperatureHWMON() {
	Vector <double> temps;
	for (FindFile ff("/sys/class/hwmon/hwmon0/device/*input"); ff; ff.Next()) {
		if (!ff.IsHidden()) {
			String temp = LoadFile_Safe(ff.GetPath());
			if (!temp.IsEmpty())
				temps.Add((double)StrInt(temp) / 1000.0);
		}
	}
	if (temps.IsEmpty())
		return Null;
	double sumTemps = 0.;
	for (int i = 0; i < temps.GetCount(); i++)
		sumTemps += temps[i];
	
	return sumTemps/double(temps.GetCount());
}


Best regards
Iñaki
Re: [SysInfo - Improvement - Koldo] Better way to find distribution version & more [message #41091 is a reply to message #41089] Wed, 30 October 2013 22:16 Go to previous messageGo to previous message
Klugier is currently offline  Klugier
Messages: 882
Registered: September 2012
Location: Poland, Kraków
Experienced Contributor
Hello Koldo,

Now, I see:
if (temps.IsEmpty())
   return Null;


I am sorry for the mess which i have made.

Sincerely,
Klugier


Ultimate++ - one framework to rule them all.

[Updated on: Wed, 30 October 2013 22:18]

Report message to a moderator

Previous Topic: Problem with FileBrowser
Next Topic: AES for sqlite database
Goto Forum:
  


Current Time: Mon Oct 18 09:47:13 CEST 2021

Total time taken to generate the page: 0.01502 seconds