Skip to content

Commit f7f20fd

Browse files
dpagedpage
authored
Fix types so we can compile again. (#11)
1 parent 40e83e8 commit f7f20fd

12 files changed

+60
-60
lines changed

‎linux/cpu_info.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -207,7 +207,7 @@ void ReadCPUInformation(Tuplestorestate *tupstore, TupleDesc tupdesc)
207207
values[Anum_physical_processor] = Int32GetDatum(physical_processor);
208208
values[Anum_no_of_cores] = Int32GetDatum(cpu_cores);
209209
values[Anum_architecture] = CStringGetTextDatum(architecture);
210-
values[Anum_cpu_clock_speed] = Int64GetDatumFast(cpu_freq);
210+
values[Anum_cpu_clock_speed] = UInt64GetDatum(cpu_freq);
211211
values[Anum_l1dcache_size] = Int32GetDatum(l1dcache_size_kb);
212212
values[Anum_l1icache_size] = Int32GetDatum(l1icache_size_kb);
213213
values[Anum_l2cache_size] = Int32GetDatum(l2cache_size_kb);

‎linux/cpu_memory_by_process.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -347,8 +347,8 @@ void ReadCPUMemoryByProcess(Tuplestorestate *tupstore, TupleDesc tupdesc)
347347
values[Anum_process_name] = CStringGetTextDatum(command);
348348
values[Anum_percent_cpu_usage] = Float4GetDatum(cpu_usage);
349349
values[Anum_percent_memory_usage] = Float4GetDatum(memory_usage);
350-
values[Anum_process_memory_bytes] = Int64GetDatumFast((uint64)rss_memory);
351-
values[Anum_process_running_since] = Int64GetDatumFast((uint64)(running_since));
350+
values[Anum_process_memory_bytes] = UInt64GetDatum((uint64)rss_memory);
351+
values[Anum_process_running_since] = UInt64GetDatum((uint64)(running_since));
352352

353353
tuplestore_putvalues(tupstore, tupdesc, values, nulls);
354354

‎linux/disk_info.c

+6-6
Original file line numberDiff line numberDiff line change
@@ -164,12 +164,12 @@ void ReadDiskInformation(Tuplestorestate *tupstore, TupleDesc tupdesc)
164164
values[Anum_disk_file_system] = CStringGetTextDatum(file_system);
165165
values[Anum_disk_file_system_type] = CStringGetTextDatum(file_system_type);
166166
values[Anum_disk_mount_point] = CStringGetTextDatum(mount_point);
167-
values[Anum_disk_total_space] = Int64GetDatumFast(total_space_bytes);
168-
values[Anum_disk_used_space] = Int64GetDatumFast(used_space_bytes);
169-
values[Anum_disk_free_space] = Int64GetDatumFast(available_space_bytes);
170-
values[Anum_disk_total_inodes] = Int64GetDatumFast(total_inodes);
171-
values[Anum_disk_used_inodes] = Int64GetDatumFast(used_inodes);
172-
values[Anum_disk_free_inodes] = Int64GetDatumFast(free_inodes);
167+
values[Anum_disk_total_space] = UInt64GetDatum(total_space_bytes);
168+
values[Anum_disk_used_space] = UInt64GetDatum(used_space_bytes);
169+
values[Anum_disk_free_space] = UInt64GetDatum(available_space_bytes);
170+
values[Anum_disk_total_inodes] = UInt64GetDatum(total_inodes);
171+
values[Anum_disk_used_inodes] = UInt64GetDatum(used_inodes);
172+
values[Anum_disk_free_inodes] = UInt64GetDatum(free_inodes);
173173

174174
nulls[Anum_disk_drive_letter] = true;
175175
nulls[Anum_disk_drive_type] = true;

‎linux/io_analysis.c

+6-6
Original file line numberDiff line numberDiff line change
@@ -64,12 +64,12 @@ void ReadIOAnalysisInformation(Tuplestorestate *tupstore, TupleDesc tupdesc)
6464
&write_completed, &sector_written, &time_spent_writing_ms);
6565

6666
values[Anum_device_name] = CStringGetTextDatum(device_name);
67-
values[Anum_total_read] = Int64GetDatumFast(read_completed);
68-
values[Anum_total_write] = Int64GetDatumFast(write_completed);
69-
values[Anum_read_bytes] = Int64GetDatumFast((uint64)(sector_read * sector_size));
70-
values[Anum_write_bytes] = Int64GetDatumFast((uint64)(sector_written * sector_size));
71-
values[Anum_read_time_ms] = Int64GetDatumFast((uint64)time_spent_reading_ms);
72-
values[Anum_write_time_ms] = Int64GetDatumFast((uint64)time_spent_writing_ms);
67+
values[Anum_total_read] = UInt64GetDatum(read_completed);
68+
values[Anum_total_write] = UInt64GetDatum(write_completed);
69+
values[Anum_read_bytes] = UInt64GetDatum((uint64)(sector_read * sector_size));
70+
values[Anum_write_bytes] = UInt64GetDatum((uint64)(sector_written * sector_size));
71+
values[Anum_read_time_ms] = UInt64GetDatum((uint64)time_spent_reading_ms);
72+
values[Anum_write_time_ms] = UInt64GetDatum((uint64)time_spent_writing_ms);
7373

7474
tuplestore_putvalues(tupstore, tupdesc, values, nulls);
7575

‎linux/memory_info.c

+7-7
Original file line numberDiff line numberDiff line change
@@ -101,13 +101,13 @@ void ReadMemoryInformation(Tuplestorestate *tupstore, TupleDesc tupdesc)
101101
// Check if we get all lines, add as row
102102
if (line_count == MEMORY_READ_COUNT)
103103
{
104-
values[Anum_total_memory] = Int64GetDatumFast(total_memory_bytes);
105-
values[Anum_free_memory] = Int64GetDatumFast(free_memory_bytes);
106-
values[Anum_used_memory] = Int64GetDatumFast(used_memory_bytes);
107-
values[Anum_total_cache_memory] = Int64GetDatumFast(cached_bytes);
108-
values[Anum_swap_total_memory] = Int64GetDatumFast(swap_total_bytes);
109-
values[Anum_swap_free_memory] = Int64GetDatumFast(swap_free_bytes);
110-
values[Anum_swap_used_memory] = Int64GetDatumFast(swap_used_bytes);
104+
values[Anum_total_memory] = UInt64GetDatum(total_memory_bytes);
105+
values[Anum_free_memory] = UInt64GetDatum(free_memory_bytes);
106+
values[Anum_used_memory] = UInt64GetDatum(used_memory_bytes);
107+
values[Anum_total_cache_memory] = UInt64GetDatum(cached_bytes);
108+
values[Anum_swap_total_memory] = UInt64GetDatum(swap_total_bytes);
109+
values[Anum_swap_free_memory] = UInt64GetDatum(swap_free_bytes);
110+
values[Anum_swap_used_memory] = UInt64GetDatum(swap_used_bytes);
111111

112112
/* set the NULL value as it is not for this platform */
113113
nulls[Anum_kernel_total_memory] = true;

‎linux/network_info.c

+9-9
Original file line numberDiff line numberDiff line change
@@ -199,15 +199,15 @@ void ReadNetworkInformations(Tuplestorestate *tupstore, TupleDesc tupdesc)
199199

200200
values[Anum_net_interface_name] = CStringGetTextDatum(interface_name);
201201
values[Anum_net_ipv4_address] = CStringGetTextDatum(ipv4_address);
202-
values[Anum_net_speed_mbps] = Int64GetDatumFast(speed_mbps);
203-
values[Anum_net_tx_bytes] = Int64GetDatumFast(tx_bytes);
204-
values[Anum_net_tx_packets] = Int64GetDatumFast(tx_packets);
205-
values[Anum_net_tx_errors] = Int64GetDatumFast(tx_errors);
206-
values[Anum_net_tx_dropped] = Int64GetDatumFast(tx_dropped);
207-
values[Anum_net_rx_bytes] = Int64GetDatumFast(rx_bytes);
208-
values[Anum_net_rx_packets] = Int64GetDatumFast(rx_packets);
209-
values[Anum_net_rx_errors] = Int64GetDatumFast(rx_errors);
210-
values[Anum_net_rx_dropped] = Int64GetDatumFast(rx_dropped);
202+
values[Anum_net_speed_mbps] = UInt64GetDatum(speed_mbps);
203+
values[Anum_net_tx_bytes] = UInt64GetDatum(tx_bytes);
204+
values[Anum_net_tx_packets] = UInt64GetDatum(tx_packets);
205+
values[Anum_net_tx_errors] = UInt64GetDatum(tx_errors);
206+
values[Anum_net_tx_dropped] = UInt64GetDatum(tx_dropped);
207+
values[Anum_net_rx_bytes] = UInt64GetDatum(rx_bytes);
208+
values[Anum_net_rx_packets] = UInt64GetDatum(rx_packets);
209+
values[Anum_net_rx_errors] = UInt64GetDatum(rx_errors);
210+
values[Anum_net_rx_dropped] = UInt64GetDatum(rx_dropped);
211211

212212
tuplestore_putvalues(tupstore, tupdesc, values, nulls);
213213

‎windows/cpu_info.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ void ReadCPUInformation(Tuplestorestate *tupstore, TupleDesc tupdesc)
118118
{
119119
/* convert MHz to Hz */
120120
uint64 max_clock_speed = (uint64)((uint64)(query_result.intVal) * (uint64)1000000);
121-
values[Anum_cpu_clock_speed] = Int64GetDatumFast(max_clock_speed);
121+
values[Anum_cpu_clock_speed] = UInt64GetDatum(max_clock_speed);
122122
}
123123

124124
hres = result->lpVtbl->Get(result, L"Architecture", 0, &query_result, 0, 0);

‎windows/cpu_memory_by_process.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ void ReadCPUMemoryByProcess(Tuplestorestate *tupstore, TupleDesc tupdesc)
102102
memset(dst, 0x00, (wstr_length + 10));
103103
wcstombs_s(&charsConverted, dst, wstr_length + 10, query_result.bstrVal, wstr_length);
104104
long long val = strtoll(dst, NULL, 10);
105-
values[Anum_process_running_since] = Int64GetDatumFast(val);
105+
values[Anum_process_running_since] = UInt64GetDatum(val);
106106
free(dst);
107107
}
108108
}
@@ -145,7 +145,7 @@ void ReadCPUMemoryByProcess(Tuplestorestate *tupstore, TupleDesc tupdesc)
145145
memset(dst, 0x00, (wstr_length + 10));
146146
wcstombs_s(&charsConverted, dst, wstr_length + 10, query_result.bstrVal, wstr_length);
147147
long long val = strtoll(dst, NULL, 10);
148-
values[Anum_process_memory_bytes] = Int64GetDatumFast(val);
148+
values[Anum_process_memory_bytes] = UInt64GetDatum(val);
149149
float4 memory_usage_per = (float4)(val / total_physical_memory) * 100;
150150
values[Anum_percent_memory_usage] = Float4GetDatum(memory_usage_per);
151151
free(dst);

‎windows/disk_info.c

+3-3
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ void ReadDiskInformation(Tuplestorestate *tupstore, TupleDesc tupdesc)
106106
memset(dst, 0x00, (wstr_length + 10));
107107
wcstombs_s(&charsConverted, dst, wstr_length + 10, query_result.bstrVal, wstr_length);
108108
free_space = strtoll(dst, NULL, 10);
109-
values[Anum_disk_free_space] = Int64GetDatumFast(free_space);
109+
values[Anum_disk_free_space] = UInt64GetDatum(free_space);
110110
free(dst);
111111
}
112112
}
@@ -127,13 +127,13 @@ void ReadDiskInformation(Tuplestorestate *tupstore, TupleDesc tupdesc)
127127
memset(dst, 0x00, (wstr_length + 10));
128128
wcstombs_s(&charsConverted, dst, wstr_length + 10, query_result.bstrVal, wstr_length);
129129
total_space = strtoll(dst, NULL, 10);
130-
values[Anum_disk_total_space] = Int64GetDatumFast(total_space);
130+
values[Anum_disk_total_space] = UInt64GetDatum(total_space);
131131
free(dst);
132132
}
133133
}
134134

135135
used_space = (total_space - free_space);
136-
values[Anum_disk_used_space] = Int64GetDatumFast(used_space);
136+
values[Anum_disk_used_space] = UInt64GetDatum(used_space);
137137

138138
nulls[Anum_disk_mount_point] = true;
139139
nulls[Anum_disk_file_system_type] = true;

‎windows/io_analysis.c

+6-6
Original file line numberDiff line numberDiff line change
@@ -90,12 +90,12 @@ void ReadIOAnalysisInformation(Tuplestorestate *tupstore, TupleDesc tupdesc)
9090
sprintf_s(szDeviceDisplay, MAX_DEVICE_PATH, "PhysicalDrive%i", deviceId);
9191

9292
values[Anum_device_name] = CStringGetTextDatum(szDeviceDisplay);
93-
values[Anum_total_read] = Int64GetDatumFast((uint64)diskPerformance.ReadCount);
94-
values[Anum_total_write] = Int64GetDatumFast((uint64)diskPerformance.WriteCount);
95-
values[Anum_read_bytes] = Int64GetDatumFast((uint64)(diskPerformance.BytesRead.QuadPart));
96-
values[Anum_write_bytes] = Int64GetDatumFast((uint64)(diskPerformance.BytesWritten.QuadPart));
97-
values[Anum_read_time_ms] = Int64GetDatumFast((uint64)(diskPerformance.ReadTime.QuadPart) / 10000000);
98-
values[Anum_write_time_ms] = Int64GetDatumFast((uint64)(diskPerformance.WriteTime.QuadPart) / 10000000);
93+
values[Anum_total_read] = UInt64GetDatum((uint64)diskPerformance.ReadCount);
94+
values[Anum_total_write] = UInt64GetDatum((uint64)diskPerformance.WriteCount);
95+
values[Anum_read_bytes] = UInt64GetDatum((uint64)(diskPerformance.BytesRead.QuadPart));
96+
values[Anum_write_bytes] = UInt64GetDatum((uint64)(diskPerformance.BytesWritten.QuadPart));
97+
values[Anum_read_time_ms] = UInt64GetDatum((uint64)(diskPerformance.ReadTime.QuadPart) / 10000000);
98+
values[Anum_write_time_ms] = UInt64GetDatum((uint64)(diskPerformance.WriteTime.QuadPart) / 10000000);
9999

100100
tuplestore_putvalues(tupstore, tupdesc, values, nulls);
101101

‎windows/memory_info.c

+9-9
Original file line numberDiff line numberDiff line change
@@ -71,15 +71,15 @@ void ReadMemoryInformation(Tuplestorestate *tupstore, TupleDesc tupdesc)
7171
kernel_non_paged = ((uint64)(per_statex.KernelNonpaged)) * page_size;
7272
}
7373

74-
values[Anum_total_memory] = Int64GetDatumFast(total_physical_memory);
75-
values[Anum_used_memory] = Int64GetDatumFast((total_physical_memory - avail_physical_memory));
76-
values[Anum_free_memory] = Int64GetDatumFast(avail_physical_memory);
77-
values[Anum_total_cache_memory] = Int64GetDatumFast(total_system_cache);
78-
values[Anum_kernel_total_memory] = Int64GetDatumFast(kernel_total);
79-
values[Anum_kernel_paged_memory] = Int64GetDatumFast(kernel_paged);
80-
values[Anum_kernel_nonpaged_memory] = Int64GetDatumFast(kernel_non_paged);
81-
values[Anum_total_page_file] = Int64GetDatumFast(total_page_file);
82-
values[Anum_avail_page_file] = Int64GetDatumFast(avail_page_file);
74+
values[Anum_total_memory] = UInt64GetDatum(total_physical_memory);
75+
values[Anum_used_memory] = UInt64GetDatum((total_physical_memory - avail_physical_memory));
76+
values[Anum_free_memory] = UInt64GetDatum(avail_physical_memory);
77+
values[Anum_total_cache_memory] = UInt64GetDatum(total_system_cache);
78+
values[Anum_kernel_total_memory] = UInt64GetDatum(kernel_total);
79+
values[Anum_kernel_paged_memory] = UInt64GetDatum(kernel_paged);
80+
values[Anum_kernel_nonpaged_memory] = UInt64GetDatum(kernel_non_paged);
81+
values[Anum_total_page_file] = UInt64GetDatum(total_page_file);
82+
values[Anum_avail_page_file] = UInt64GetDatum(avail_page_file);
8383

8484
/* NULL the value which is not required for this platform */
8585
nulls[Anum_swap_total_memory] = true;

‎windows/network_info.c

+8-8
Original file line numberDiff line numberDiff line change
@@ -182,14 +182,14 @@ void ReadNetworkInformations(Tuplestorestate *tupstore, TupleDesc tupdesc)
182182
}
183183

184184
values[Anum_net_ipv4_address] = CStringGetTextDatum((char *)(ip_rows + ip_index));
185-
values[Anum_net_tx_packets] = Int64GetDatumFast((uint64)(if_row->dwOutUcastPkts + if_row->dwOutNUcastPkts));
186-
values[Anum_net_rx_packets] = Int64GetDatumFast((uint64)(if_row->dwInUcastPkts + if_row->dwInNUcastPkts));
187-
values[Anum_net_tx_bytes] = Int64GetDatumFast((uint64)if_row->dwOutOctets);
188-
values[Anum_net_rx_bytes] = Int64GetDatumFast((uint64)if_row->dwInOctets);
189-
values[Anum_net_tx_dropped] = Int64GetDatumFast((uint64)if_row->dwOutDiscards);
190-
values[Anum_net_rx_dropped] = Int64GetDatumFast((uint64)if_row->dwInDiscards);
191-
values[Anum_net_tx_errors] = Int64GetDatumFast((uint64)if_row->dwOutErrors);
192-
values[Anum_net_rx_errors] = Int64GetDatumFast((uint64)if_row->dwInErrors);
185+
values[Anum_net_tx_packets] = UInt64GetDatum((uint64)(if_row->dwOutUcastPkts + if_row->dwOutNUcastPkts));
186+
values[Anum_net_rx_packets] = UInt64GetDatum((uint64)(if_row->dwInUcastPkts + if_row->dwInNUcastPkts));
187+
values[Anum_net_tx_bytes] = UInt64GetDatum((uint64)if_row->dwOutOctets);
188+
values[Anum_net_rx_bytes] = UInt64GetDatum((uint64)if_row->dwInOctets);
189+
values[Anum_net_tx_dropped] = UInt64GetDatum((uint64)if_row->dwOutDiscards);
190+
values[Anum_net_rx_dropped] = UInt64GetDatum((uint64)if_row->dwInDiscards);
191+
values[Anum_net_tx_errors] = UInt64GetDatum((uint64)if_row->dwOutErrors);
192+
values[Anum_net_rx_errors] = UInt64GetDatum((uint64)if_row->dwInErrors);
193193
values[Anum_net_speed_mbps] = Int32GetDatum((int)(if_row->dwSpeed / 1000000));
194194

195195
tuplestore_putvalues(tupstore, tupdesc, values, nulls);

0 commit comments

Comments
 (0)