ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/lib/cf.pm
(Generate patch)

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.237 by root, Fri Apr 13 05:08:51 2007 UTC vs.
Revision 1.276 by root, Sun Jun 10 04:05:47 2007 UTC

… …
3use utf8; 3use utf8;
4use strict; 4use strict;
5 5
6use Symbol; 6use Symbol;
7use List::Util; 7use List::Util;
8use Socket;
8use Storable; 9use Storable;
9use Event; 10use Event;
10use Opcode; 11use Opcode;
11use Safe; 12use Safe;
12use Safe::Hole; 13use Safe::Hole;
13 14
14use Coro 3.52 (); 15use Coro 3.61 ();
15use Coro::State; 16use Coro::State;
17use Coro::Handle;
16use Coro::Event; 18use Coro::Event;
17use Coro::Timer; 19use Coro::Timer;
18use Coro::Signal; 20use Coro::Signal;
19use Coro::Semaphore; 21use Coro::Semaphore;
20use Coro::AIO; 22use Coro::AIO;
… …
52our %EXT_CORO = (); # coroutines bound to extensions 54our %EXT_CORO = (); # coroutines bound to extensions
53our %EXT_MAP = (); # pluggable maps 55our %EXT_MAP = (); # pluggable maps
54 56
55our $RELOAD; # number of reloads so far 57our $RELOAD; # number of reloads so far
56our @EVENT; 58our @EVENT;
57our $LIBDIR = datadir . "/ext";
58 59
59our $TICK = MAX_TIME * 1e-6; 60our $CONFDIR = confdir;
61our $DATADIR = datadir;
62our $LIBDIR = "$DATADIR/ext";
63our $PODDIR = "$DATADIR/pod";
64our $MAPDIR = "$DATADIR/" . mapdir;
65our $LOCALDIR = localdir;
66our $TMPDIR = "$LOCALDIR/" . tmpdir;
67our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
68our $PLAYERDIR = "$LOCALDIR/" . playerdir;
69our $RANDOMDIR = "$LOCALDIR/random";
70our $BDBDIR = "$LOCALDIR/db";
71
72our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
60our $TICK_WATCHER; 73our $TICK_WATCHER;
61our $AIO_POLL_WATCHER; 74our $AIO_POLL_WATCHER;
62our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 75our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
63our $NEXT_TICK; 76our $NEXT_TICK;
64our $NOW; 77our $NOW;
… …
73our $RUNTIME; 86our $RUNTIME;
74 87
75our %PLAYER; # all users 88our %PLAYER; # all users
76our %MAP; # all maps 89our %MAP; # all maps
77our $LINK_MAP; # the special {link} map, which is always available 90our $LINK_MAP; # the special {link} map, which is always available
78our $RANDOM_MAPS = cf::localdir . "/random";
79our $BDB_ENV_DIR = cf::localdir . "/db";
80
81our $WAIT_FOR_TICK; $WAIT_FOR_TICK ||= new Coro::Signal;
82our $WAIT_FOR_TICK_ONE; $WAIT_FOR_TICK_ONE ||= new Coro::Signal;
83 91
84# used to convert map paths into valid unix filenames by replacing / by ∕ 92# used to convert map paths into valid unix filenames by replacing / by ∕
85our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 93our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
86 94
95our $LOAD; # a number between 0 (idle) and 1 (too many objects)
96our $LOADAVG; # same thing, but with alpha-smoothing
97our $tick_start; # for load detecting purposes
98
87binmode STDOUT; 99binmode STDOUT;
88binmode STDERR; 100binmode STDERR;
89 101
90# read virtual server time, if available 102# read virtual server time, if available
91unless ($RUNTIME || !-e cf::localdir . "/runtime") { 103unless ($RUNTIME || !-e "$LOCALDIR/runtime") {
92 open my $fh, "<", cf::localdir . "/runtime" 104 open my $fh, "<", "$LOCALDIR/runtime"
93 or die "unable to read runtime file: $!"; 105 or die "unable to read runtime file: $!";
94 $RUNTIME = <$fh> + 0.; 106 $RUNTIME = <$fh> + 0.;
95} 107}
96 108
97mkdir cf::localdir; 109mkdir $_
98mkdir cf::localdir . "/" . cf::playerdir; 110 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
99mkdir cf::localdir . "/" . cf::tmpdir;
100mkdir cf::localdir . "/" . cf::uniquedir;
101mkdir $RANDOM_MAPS;
102mkdir $BDB_ENV_DIR;
103 111
104our $EMERGENCY_POSITION; 112our $EMERGENCY_POSITION;
105 113
106sub cf::map::normalise; 114sub cf::map::normalise;
107 115
… …
118=item $cf::RUNTIME 126=item $cf::RUNTIME
119 127
120The time this server has run, starts at 0 and is increased by $cf::TICK on 128The time this server has run, starts at 0 and is increased by $cf::TICK on
121every server tick. 129every server tick.
122 130
123=item $cf::LIBDIR 131=item $cf::CONFDIR $cf::DATADIR $cf::LIBDIR $cf::PODDIR
132$cf::MAPDIR $cf::LOCALDIR $cf::TMPDIR $cf::UNIQUEDIR
133$cf::PLAYERDIR $cf::RANDOMDIR $cf::BDBDIR
124 134
125The perl library directory, where extensions and cf-specific modules can 135Various directories - "/etc", read-only install directory, perl-library
126be found. It will be added to C<@INC> automatically. 136directory, pod-directory, read-only maps directory, "/var", "/var/tmp",
137unique-items directory, player file directory, random maps directory and
138database environment.
127 139
128=item $cf::NOW 140=item $cf::NOW
129 141
130The time of the last (current) server tick. 142The time of the last (current) server tick.
131 143
132=item $cf::TICK 144=item $cf::TICK
133 145
134The interval between server ticks, in seconds. 146The interval between server ticks, in seconds.
147
148=item $cf::LOADAVG
149
150The current CPU load on the server (alpha-smoothed), as a value between 0
151(none) and 1 (overloaded), indicating how much time is spent on processing
152objects per tick. Healthy values are < 0.5.
153
154=item $cf::LOAD
155
156The raw value load value from the last tick.
135 157
136=item %cf::CFG 158=item %cf::CFG
137 159
138Configuration for the server, loaded from C</etc/crossfire/config>, or 160Configuration for the server, loaded from C</etc/crossfire/config>, or
139from wherever your confdir points to. 161from wherever your confdir points to.
140 162
141=item $cf::WAIT_FOR_TICK, $cf::WAIT_FOR_TICK_ONE 163=item cf::wait_for_tick, cf::wait_for_tick_begin
142 164
143These are Coro::Signal objects that are C<< ->broadcast >> (WAIT_FOR_TICK) 165These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
144or C<< ->send >> (WAIT_FOR_TICK_ONE) on after normal server tick 166returns directly I<after> the tick processing (and consequently, can only wake one process
145processing has been done. Call C<< ->wait >> on them to maximise the 167per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
146window of cpu time available, or simply to synchronise to the server tick.
147 168
148=back 169=back
149 170
150=cut 171=cut
151 172
152BEGIN { 173BEGIN {
153 *CORE::GLOBAL::warn = sub { 174 *CORE::GLOBAL::warn = sub {
154 my $msg = join "", @_; 175 my $msg = join "", @_;
155 utf8::encode $msg;
156 176
157 $msg .= "\n" 177 $msg .= "\n"
158 unless $msg =~ /\n$/; 178 unless $msg =~ /\n$/;
159 179
180 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
181
182 utf8::encode $msg;
160 LOG llevError, $msg; 183 LOG llevError, $msg;
161 }; 184 };
162} 185}
163 186
164@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 187@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
165@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 188@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
166@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 189@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
167@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 190@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
168@safe::cf::map::ISA = @cf::map::ISA = 'cf::attachable'; 191@safe::cf::map::ISA = @cf::map::ISA = 'cf::attachable';
192@safe::cf::arch::ISA = @cf::arch::ISA = 'cf::object';
169@safe::cf::object::player::ISA = @cf::object::player::ISA = 'cf::object'; 193@safe::cf::object::player::ISA = @cf::object::player::ISA = 'cf::object'; # not really true (yet)
170 194
171# we bless all objects into (empty) derived classes to force a method lookup 195# we bless all objects into (empty) derived classes to force a method lookup
172# within the Safe compartment. 196# within the Safe compartment.
173for my $pkg (qw( 197for my $pkg (qw(
174 cf::global cf::attachable 198 cf::global cf::attachable
… …
234returned. 258returned.
235 259
236Lock names should begin with a unique identifier (for example, cf::map::find 260Lock names should begin with a unique identifier (for example, cf::map::find
237uses map_find and cf::map::load uses map_load). 261uses map_find and cf::map::load uses map_load).
238 262
263=item $locked = cf::lock_active $string
264
265Return true if the lock is currently active, i.e. somebody has locked it.
266
239=cut 267=cut
240 268
241our %LOCK; 269our %LOCK;
242 270
243sub lock_wait($) { 271sub lock_wait($) {
… …
260 288
261 Coro::guard { 289 Coro::guard {
262 # wake up all waiters, to be on the safe side 290 # wake up all waiters, to be on the safe side
263 $_->ready for @{ delete $LOCK{$key} }; 291 $_->ready for @{ delete $LOCK{$key} };
264 } 292 }
293}
294
295sub lock_active($) {
296 my ($key) = @_;
297
298 ! ! $LOCK{$key}
265} 299}
266 300
267sub freeze_mainloop { 301sub freeze_mainloop {
268 return unless $TICK_WATCHER->is_active; 302 return unless $TICK_WATCHER->is_active;
269 303
… …
299 333
300sub sync_job(&) { 334sub sync_job(&) {
301 my ($job) = @_; 335 my ($job) = @_;
302 336
303 if ($Coro::current == $Coro::main) { 337 if ($Coro::current == $Coro::main) {
338 my $time = Event::time;
339
304 # this is the main coro, too bad, we have to block 340 # this is the main coro, too bad, we have to block
305 # till the operation succeeds, freezing the server :/ 341 # till the operation succeeds, freezing the server :/
306 342
307 # TODO: use suspend/resume instead 343 # TODO: use suspend/resume instead
308 # (but this is cancel-safe) 344 # (but this is cancel-safe)
… …
319 355
320 while ($busy) { 356 while ($busy) {
321 Coro::cede or Event::one_event; 357 Coro::cede or Event::one_event;
322 } 358 }
323 359
360 $time = Event::time - $time;
361
362 LOG llevError | logBacktrace, Carp::longmess "long sync job"
363 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
364
365 $tick_start += $time; # do not account sync jobs to server load
366
324 wantarray ? @res : $res[0] 367 wantarray ? @res : $res[0]
325 } else { 368 } else {
326 # we are in another coroutine, how wonderful, everything just works 369 # we are in another coroutine, how wonderful, everything just works
327 370
328 $job->() 371 $job->()
… …
348 391
349 $coro 392 $coro
350} 393}
351 394
352sub write_runtime { 395sub write_runtime {
396 my $runtime = "$LOCALDIR/runtime";
397
398 # first touch the runtime file to show we are still running:
399 # the fsync below can take a very very long time.
400
401 IO::AIO::aio_utime $runtime, undef, undef;
402
353 my $guard = cf::lock_acquire "write_runtime"; 403 my $guard = cf::lock_acquire "write_runtime";
354
355 my $runtime = cf::localdir . "/runtime";
356 404
357 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 405 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644
358 or return; 406 or return;
359 407
360 my $value = $cf::RUNTIME + 90 + 10; 408 my $value = $cf::RUNTIME + 90 + 10;
… …
366 414
367 # always fsync - this file is important 415 # always fsync - this file is important
368 aio_fsync $fh 416 aio_fsync $fh
369 and return; 417 and return;
370 418
419 # touch it again to show we are up-to-date
420 aio_utime $fh, undef, undef;
421
371 close $fh 422 close $fh
372 or return; 423 or return;
373 424
374 aio_rename "$runtime~", $runtime 425 aio_rename "$runtime~", $runtime
375 and return; 426 and return;
427
428 warn "runtime file written.\n";
376 429
377 1 430 1
378} 431}
379 432
380=item cf::datalog type => key => value, ... 433=item cf::datalog type => key => value, ...
… …
573 $registry = $CB_TYPE[$object_type] ||= []; 626 $registry = $CB_TYPE[$object_type] ||= [];
574 627
575 } elsif ($type eq "subtype") { 628 } elsif ($type eq "subtype") {
576 defined $object_type or Carp::croak "subtype specified without type"; 629 defined $object_type or Carp::croak "subtype specified without type";
577 my $object_subtype = shift @arg; 630 my $object_subtype = shift @arg;
578 $registry = $CB_TYPE[$object_type + $object_subtype * NUM_SUBTYPES] ||= []; 631 $registry = $CB_TYPE[$object_type + $object_subtype * NUM_TYPES] ||= [];
579 632
580 } elsif ($type eq "package") { 633 } elsif ($type eq "package") {
581 my $pkg = shift @arg; 634 my $pkg = shift @arg;
582 635
583 while (my ($name, $id) = each %cb_id) { 636 while (my ($name, $id) = each %cb_id) {
… …
624 if (ref $_[0]) { 677 if (ref $_[0]) {
625 _object_attach @_; 678 _object_attach @_;
626 } else { 679 } else {
627 _attach shift->_attach_registry, @_; 680 _attach shift->_attach_registry, @_;
628 } 681 }
682 _recalc_want;
629}; 683};
630 684
631# all those should be optimised 685# all those should be optimised
632sub cf::attachable::detach { 686sub cf::attachable::detach {
633 my ($obj, $name) = @_; 687 my ($obj, $name) = @_;
… …
636 delete $obj->{_attachment}{$name}; 690 delete $obj->{_attachment}{$name};
637 reattach ($obj); 691 reattach ($obj);
638 } else { 692 } else {
639 Carp::croak "cannot, currently, detach class attachments"; 693 Carp::croak "cannot, currently, detach class attachments";
640 } 694 }
695 _recalc_want;
641}; 696};
642 697
643sub cf::attachable::attached { 698sub cf::attachable::attached {
644 my ($obj, $name) = @_; 699 my ($obj, $name) = @_;
645 700
… …
818 or return; 873 or return;
819 $av = eval { (Storable::thaw $av)->{objs} }; 874 $av = eval { (Storable::thaw $av)->{objs} };
820 } 875 }
821 876
822 warn sprintf "loading %s (%d)\n", 877 warn sprintf "loading %s (%d)\n",
823 $filename, length $data, scalar @{$av || []};#d# 878 $filename, length $data, scalar @{$av || []};
824 return ($data, $av); 879 return ($data, $av);
825} 880}
826 881
827############################################################################# 882#############################################################################
828# command handling &c 883# command handling &c
… …
955Returns the given player object, loading it if necessary (might block). 1010Returns the given player object, loading it if necessary (might block).
956 1011
957=cut 1012=cut
958 1013
959sub playerdir($) { 1014sub playerdir($) {
960 cf::localdir 1015 "$PLAYERDIR/"
961 . "/"
962 . cf::playerdir
963 . "/"
964 . (ref $_[0] ? $_[0]->ob->name : $_[0]) 1016 . (ref $_[0] ? $_[0]->ob->name : $_[0])
965} 1017}
966 1018
967sub path($) { 1019sub path($) {
968 my $login = ref $_[0] ? $_[0]->ob->name : $_[0]; 1020 my $login = ref $_[0] ? $_[0]->ob->name : $_[0];
… …
1088while and may block, so not sync_job-capable, ever. 1140while and may block, so not sync_job-capable, ever.
1089 1141
1090=cut 1142=cut
1091 1143
1092sub list_logins { 1144sub list_logins {
1093 my $dirs = aio_readdir cf::localdir . "/" . cf::playerdir 1145 my $dirs = aio_readdir $PLAYERDIR
1094 or return []; 1146 or return [];
1095 1147
1096 my @logins; 1148 my @logins;
1097 1149
1098 for my $login (@$dirs) { 1150 for my $login (@$dirs) {
… …
1159 my ($self, $type, %msg) = @_; 1211 my ($self, $type, %msg) = @_;
1160 1212
1161 $self->ns->ext_event ($type, %msg); 1213 $self->ns->ext_event ($type, %msg);
1162} 1214}
1163 1215
1164package cf; 1216=head3 cf::region
1217
1218=over 4
1219
1220=cut
1221
1222package cf::region;
1223
1224=item cf::region::find_by_path $path
1225
1226Tries to decuce the probable region for a map knowing only its path.
1227
1228=cut
1229
1230sub find_by_path($) {
1231 my ($path) = @_;
1232
1233 my ($match, $specificity);
1234
1235 for my $region (list) {
1236 if ($region->match && $path =~ $region->match) {
1237 ($match, $specificity) = ($region, $region->specificity)
1238 if $region->specificity > $specificity;
1239 }
1240 }
1241
1242 $match
1243}
1165 1244
1166=back 1245=back
1167
1168 1246
1169=head3 cf::map 1247=head3 cf::map
1170 1248
1171=over 4 1249=over 4
1172 1250
… …
1227 my ($self, $merge) = @_; 1305 my ($self, $merge) = @_;
1228 1306
1229 # we have to keep some variables in memory intact 1307 # we have to keep some variables in memory intact
1230 local $self->{path}; 1308 local $self->{path};
1231 local $self->{load_path}; 1309 local $self->{load_path};
1232 local $self->{deny_save};
1233 local $self->{deny_reset};
1234 1310
1235 $self->SUPER::thawer_merge ($merge); 1311 $self->SUPER::thawer_merge ($merge);
1236} 1312}
1237 1313
1238sub normalise { 1314sub normalise {
… …
1310 1386
1311# the original (read-only) location 1387# the original (read-only) location
1312sub load_path { 1388sub load_path {
1313 my ($self) = @_; 1389 my ($self) = @_;
1314 1390
1315 sprintf "%s/%s/%s.map", cf::datadir, cf::mapdir, $self->{path} 1391 "$MAPDIR/$self->{path}.map"
1316} 1392}
1317 1393
1318# the temporary/swap location 1394# the temporary/swap location
1319sub save_path { 1395sub save_path {
1320 my ($self) = @_; 1396 my ($self) = @_;
1321 1397
1322 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1398 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1323 sprintf "%s/%s/%s.map", cf::localdir, cf::tmpdir, $path 1399 "$TMPDIR/$path.map"
1324} 1400}
1325 1401
1326# the unique path, undef == no special unique path 1402# the unique path, undef == no special unique path
1327sub uniq_path { 1403sub uniq_path {
1328 my ($self) = @_; 1404 my ($self) = @_;
1329 1405
1330 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1406 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1331 sprintf "%s/%s/%s", cf::localdir, cf::uniquedir, $path 1407 "$UNIQUEDIR/$path"
1332} 1408}
1333 1409
1334# and all this just because we cannot iterate over 1410# and all this just because we cannot iterate over
1335# all maps in C++... 1411# all maps in C++...
1336sub change_all_map_light { 1412sub change_all_map_light {
1337 my ($change) = @_; 1413 my ($change) = @_;
1338 1414
1339 $_->change_map_light ($change) 1415 $_->change_map_light ($change)
1340 for grep $_->outdoor, values %cf::MAP; 1416 for grep $_->outdoor, values %cf::MAP;
1417}
1418
1419sub decay_objects {
1420 my ($self) = @_;
1421
1422 return if $self->{deny_reset};
1423
1424 $self->do_decay_objects;
1341} 1425}
1342 1426
1343sub unlink_save { 1427sub unlink_save {
1344 my ($self) = @_; 1428 my ($self) = @_;
1345 1429
… …
1403 $self->load_header_orig 1487 $self->load_header_orig
1404 or return; 1488 or return;
1405 $self->prepare_orig; 1489 $self->prepare_orig;
1406 } 1490 }
1407 1491
1492 $self->{deny_reset} = 1
1493 if $self->no_reset;
1494
1495 $self->default_region (cf::region::find_by_path $self->{path})
1496 unless $self->default_region;
1497
1408 1 1498 1
1409} 1499}
1410 1500
1411sub find; 1501sub find;
1412sub find { 1502sub find {
… …
1424 $map->{last_save} = $cf::RUNTIME; 1514 $map->{last_save} = $cf::RUNTIME;
1425 1515
1426 $map->load_header 1516 $map->load_header
1427 or return; 1517 or return;
1428 1518
1429 if ($map->should_reset && 0) {#d#TODO# disabled, crashy (locking issue?) 1519 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1430 # doing this can freeze the server in a sync job, obviously 1520 # doing this can freeze the server in a sync job, obviously
1431 #$cf::WAIT_FOR_TICK->wait; 1521 #$cf::WAIT_FOR_TICK->wait;
1432 $map->reset; 1522 $map->reset;
1433 undef $guard; 1523 undef $guard;
1434 return find $path; 1524 return find $path;
… …
1445 my ($self) = @_; 1535 my ($self) = @_;
1446 1536
1447 local $self->{deny_reset} = 1; # loading can take a long time 1537 local $self->{deny_reset} = 1; # loading can take a long time
1448 1538
1449 my $path = $self->{path}; 1539 my $path = $self->{path};
1540
1541 {
1450 my $guard = cf::lock_acquire "map_load:$path"; 1542 my $guard = cf::lock_acquire "map_load:$path";
1451 1543
1452 return if $self->in_memory != cf::MAP_SWAPPED; 1544 return if $self->in_memory != cf::MAP_SWAPPED;
1453 1545
1454 $self->in_memory (cf::MAP_LOADING); 1546 $self->in_memory (cf::MAP_LOADING);
1455 1547
1456 $self->alloc; 1548 $self->alloc;
1457 1549
1458 $self->pre_load; 1550 $self->pre_load;
1459
1460 $self->_load_objects ($self->{load_path}, 1)
1461 or return;
1462
1463 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1464 if delete $self->{load_original};
1465
1466 if (my $uniq = $self->uniq_path) {
1467 utf8::encode $uniq;
1468 if (aio_open $uniq, O_RDONLY, 0) {
1469 $self->clear_unique_items;
1470 $self->_load_objects ($uniq, 0);
1471 }
1472 }
1473
1474 Coro::cede;
1475
1476 # now do the right thing for maps
1477 $self->link_multipart_objects;
1478
1479 unless ($self->{deny_activate}) {
1480 $self->decay_objects;
1481 $self->fix_auto_apply;
1482 $self->update_buttons;
1483 Coro::cede; 1551 Coro::cede;
1484 $self->set_darkness_map; 1552
1553 $self->_load_objects ($self->{load_path}, 1)
1554 or return;
1555
1556 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1557 if delete $self->{load_original};
1558
1559 if (my $uniq = $self->uniq_path) {
1560 utf8::encode $uniq;
1561 if (aio_open $uniq, O_RDONLY, 0) {
1562 $self->clear_unique_items;
1563 $self->_load_objects ($uniq, 0);
1564 }
1565 }
1566
1567 Coro::cede;
1568 # now do the right thing for maps
1569 $self->link_multipart_objects;
1485 $self->difficulty ($self->estimate_difficulty) 1570 $self->difficulty ($self->estimate_difficulty)
1486 unless $self->difficulty; 1571 unless $self->difficulty;
1487 Coro::cede; 1572 Coro::cede;
1573
1574 unless ($self->{deny_activate}) {
1575 $self->decay_objects;
1576 $self->fix_auto_apply;
1577 $self->update_buttons;
1578 Coro::cede;
1579 $self->set_darkness_map;
1580 Coro::cede;
1488 $self->activate; 1581 $self->activate;
1582 }
1583
1584 $self->in_memory (cf::MAP_IN_MEMORY);
1489 } 1585 }
1490 1586
1491 $self->post_load; 1587 $self->post_load;
1492
1493 $self->in_memory (cf::MAP_IN_MEMORY);
1494} 1588}
1495 1589
1496sub customise_for { 1590sub customise_for {
1497 my ($self, $ob) = @_; 1591 my ($self, $ob) = @_;
1498 1592
1499 return find "~" . $ob->name . "/" . $self->{path} 1593 return find "~" . $ob->name . "/" . $self->{path}
1500 if $self->per_player; 1594 if $self->per_player;
1595
1596# return find "?party/" . $ob->name . "/" . $self->{path}
1597# if $self->per_party;
1501 1598
1502 $self 1599 $self
1503} 1600}
1504 1601
1505# find and load all maps in the 3x3 area around a map 1602# find and load all maps in the 3x3 area around a map
… …
1616 1713
1617sub reset_at { 1714sub reset_at {
1618 my ($self) = @_; 1715 my ($self) = @_;
1619 1716
1620 # TODO: safety, remove and allow resettable per-player maps 1717 # TODO: safety, remove and allow resettable per-player maps
1621 return 1e99 if $self->isa ("ext::map_per_player");#d#
1622 return 1e99 if $self->{deny_reset}; 1718 return 1e99 if $self->{deny_reset};
1623 1719
1624 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access; 1720 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
1625 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET; 1721 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
1626 1722
… …
1637 my ($self) = @_; 1733 my ($self) = @_;
1638 1734
1639 my $lock = cf::lock_acquire "map_data:$self->{path}"; 1735 my $lock = cf::lock_acquire "map_data:$self->{path}";
1640 1736
1641 return if $self->players; 1737 return if $self->players;
1642 return if $self->isa ("ext::map_per_player");#d#
1643 1738
1644 warn "resetting map ", $self->path;#d# 1739 warn "resetting map ", $self->path;
1645 1740
1646 $self->in_memory (cf::MAP_SWAPPED); 1741 $self->in_memory (cf::MAP_SWAPPED);
1647 1742
1648 # need to save uniques path 1743 # need to save uniques path
1649 unless ($self->{deny_save}) { 1744 unless ($self->{deny_save}) {
… …
1681 $cf::MAP{$self->path} = $self; 1776 $cf::MAP{$self->path} = $self;
1682 1777
1683 $self->reset; # polite request, might not happen 1778 $self->reset; # polite request, might not happen
1684} 1779}
1685 1780
1781=item $maps = cf::map::tmp_maps
1782
1783Returns an arrayref with all map paths of currently instantiated and saved
1784maps.
1785
1786=cut
1787
1788sub tmp_maps() {
1789 [
1790 map {
1791 utf8::decode $_;
1792 !/\.(?:pst|meta)$/ && /^$PATH_SEP/o
1793 ? normalise $_
1794 : ()
1795 } @{ aio_readdir $TMPDIR or [] }
1796 ]
1797}
1798
1686=item cf::map::unique_maps 1799=item cf::map::unique_maps
1687 1800
1688Returns an arrayref of paths of all shared maps that have 1801Returns an arrayref of paths of all shared maps that have
1689instantiated unique items. May block. 1802instantiated unique items. May block.
1690 1803
1691=cut 1804=cut
1692 1805
1693sub unique_maps() { 1806sub unique_maps() {
1694 my $files = aio_readdir cf::localdir . "/" . cf::uniquedir 1807 [
1695 or return; 1808 map {
1696
1697 my @paths;
1698
1699 for (@$files) {
1700 utf8::decode $_; 1809 utf8::decode $_;
1701 next if /\.pst$/; 1810 !/\.(?:pst|meta)$/ && /^$PATH_SEP/o
1702 next unless /^$PATH_SEP/o; 1811 ? normalise $_
1703 1812 : ()
1704 push @paths, cf::map::normalise $_; 1813 } @{ aio_readdir $UNIQUEDIR or [] }
1705 } 1814 ]
1706
1707 \@paths
1708} 1815}
1709 1816
1710package cf; 1817package cf;
1711 1818
1712=back 1819=back
… …
1818 $self->deactivate_recursive; 1925 $self->deactivate_recursive;
1819 1926
1820 return if UNIVERSAL::isa $self->map, "ext::map_link"; 1927 return if UNIVERSAL::isa $self->map, "ext::map_link";
1821 1928
1822 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 1929 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
1823 if $self->map; 1930 if $self->map && $self->map->{path} ne "{link}";
1824 1931
1825 $self->enter_map ($LINK_MAP || link_map, 10, 10); 1932 $self->enter_map ($LINK_MAP || link_map, 10, 10);
1826} 1933}
1827 1934
1828sub cf::object::player::leave_link { 1935sub cf::object::player::leave_link {
1829 my ($self, $map, $x, $y) = @_; 1936 my ($self, $map, $x, $y) = @_;
1937
1938 return unless $self->contr->active;
1830 1939
1831 my $link_pos = delete $self->{_link_pos}; 1940 my $link_pos = delete $self->{_link_pos};
1832 1941
1833 unless ($map) { 1942 unless ($map) {
1834 # restore original map position 1943 # restore original map position
… …
1857 1966
1858 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 1967 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
1859 $self->enter_map ($map, $x, $y); 1968 $self->enter_map ($map, $x, $y);
1860} 1969}
1861 1970
1862cf::player->attach (
1863 on_logout => sub {
1864 my ($pl) = @_;
1865
1866 # abort map switching before logout
1867 if ($pl->ob->{_link_pos}) {
1868 cf::sync_job {
1869 $pl->ob->leave_link
1870 };
1871 }
1872 },
1873 on_login => sub {
1874 my ($pl) = @_;
1875
1876 # try to abort aborted map switching on player login :)
1877 # should happen only on crashes
1878 if ($pl->ob->{_link_pos}) {
1879 $pl->ob->enter_link;
1880 (async {
1881 $pl->ob->reply (undef,
1882 "There was an internal problem at your last logout, "
1883 . "the server will try to bring you to your intended destination in a second.",
1884 cf::NDI_RED);
1885 # we need this sleep as the login has a concurrent enter_exit running
1886 # and this sleep increases chances of the player not ending up in scorn
1887 Coro::Timer::sleep 1;
1888 $pl->ob->leave_link;
1889 })->prio (2);
1890 }
1891 },
1892);
1893
1894=item $player_object->goto ($path, $x, $y) 1971=item $player_object->goto ($path, $x, $y[, $check->($map)])
1895 1972
1973Moves the player to the given map-path and coordinates by first freezing
1974her, loading and preparing them map, calling the provided $check callback
1975that has to return the map if sucecssful, and then unfreezes the player on
1976the new (success) or old (failed) map position.
1977
1896=cut 1978=cut
1979
1980our $GOTOGEN;
1897 1981
1898sub cf::object::player::goto { 1982sub cf::object::player::goto {
1899 my ($self, $path, $x, $y) = @_; 1983 my ($self, $path, $x, $y, $check) = @_;
1984
1985 # do generation counting so two concurrent goto's will be executed in-order
1986 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
1900 1987
1901 $self->enter_link; 1988 $self->enter_link;
1902 1989
1903 (async { 1990 (async {
1904 my $map = eval { 1991 my $map = eval {
1905 my $map = cf::map::find $path; 1992 my $map = cf::map::find $path;
1993
1994 if ($map) {
1906 $map = $map->customise_for ($self) if $map; 1995 $map = $map->customise_for ($self);
1996 $map = $check->($map) if $check && $map;
1997 } else {
1998 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED);
1999 }
2000
1907 $map 2001 $map
2002 };
2003
2004 if ($@) {
2005 $self->message ("Something went wrong within the server, please report this incident!", cf::NDI_UNIQUE | cf::NDI_RED);
2006 LOG llevError | logBacktrace, Carp::longmess $@;
1908 } or 2007 }
1909 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED);
1910 2008
2009 if ($gen == $self->{_goto_generation}) {
2010 delete $self->{_goto_generation};
1911 $self->leave_link ($map, $x, $y); 2011 $self->leave_link ($map, $x, $y);
2012 }
1912 })->prio (1); 2013 })->prio (1);
1913} 2014}
1914 2015
1915=item $player_object->enter_exit ($exit_object) 2016=item $player_object->enter_exit ($exit_object)
1916 2017
… …
1955 2056
1956 $rmp->{random_seed} ||= $exit->random_seed; 2057 $rmp->{random_seed} ||= $exit->random_seed;
1957 2058
1958 my $data = cf::to_json $rmp; 2059 my $data = cf::to_json $rmp;
1959 my $md5 = Digest::MD5::md5_hex $data; 2060 my $md5 = Digest::MD5::md5_hex $data;
1960 my $meta = "$cf::RANDOM_MAPS/$md5.meta"; 2061 my $meta = "$RANDOMDIR/$md5.meta";
1961 2062
1962 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2063 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
1963 aio_write $fh, 0, (length $data), $data, 0; 2064 aio_write $fh, 0, (length $data), $data, 0;
1964 undef $fh; 2065 undef $fh;
1965 aio_rename "$meta~", $meta; 2066 aio_rename "$meta~", $meta;
… …
2234############################################################################# 2335#############################################################################
2235 2336
2236=head2 EXTENSION DATABASE SUPPORT 2337=head2 EXTENSION DATABASE SUPPORT
2237 2338
2238Crossfire maintains a very simple database for extension use. It can 2339Crossfire maintains a very simple database for extension use. It can
2239currently store anything that can be serialised using Storable, which 2340currently store binary data only (use Compress::LZF::sfreeze_cr/sthaw to
2240excludes objects. 2341convert to/from binary).
2241 2342
2242The parameter C<$family> should best start with the name of the extension 2343The parameter C<$family> should best start with the name of the extension
2243using it, it should be unique. 2344using it, it should be unique.
2244 2345
2245=over 4 2346=over 4
… …
2268 BDB::CREATE | BDB::AUTO_COMMIT, 0666; 2369 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
2269 cf::cleanup "db_open(db): $!" if $!; 2370 cf::cleanup "db_open(db): $!" if $!;
2270 }; 2371 };
2271 cf::cleanup "db_open(db): $@" if $@; 2372 cf::cleanup "db_open(db): $@" if $@;
2272 }; 2373 };
2273
2274 my $path = cf::localdir . "/database.pst";
2275 if (stat $path) {
2276 cf::sync_job {
2277 my $pst = Storable::retrieve $path;
2278
2279 cf::db_put (board => data => $pst->{board});
2280 cf::db_put (guildrules => data => $pst->{guildrules});
2281 cf::db_put (rent => balance => $pst->{rent}{balance});
2282 BDB::db_env_txn_checkpoint $DB_ENV;
2283
2284 unlink $path;
2285 };
2286 }
2287 } 2374 }
2288} 2375}
2289 2376
2290sub db_get($$) { 2377sub db_get($$) {
2291 my $key = "$_[0]/$_[1]"; 2378 my $key = "$_[0]/$_[1]";
2292 2379
2293 cf::sync_job { 2380 cf::sync_job {
2294 BDB::db_get $DB, undef, $key, my $data; 2381 BDB::db_get $DB, undef, $key, my $data;
2295 2382
2296 $! ? () 2383 $! ? ()
2297 : Compress::LZF::sthaw $data 2384 : $data
2298 } 2385 }
2299} 2386}
2300 2387
2301sub db_put($$$) { 2388sub db_put($$$) {
2302 BDB::dbreq_pri 4; 2389 BDB::dbreq_pri 4;
2303 BDB::db_put $DB, undef, "$_[0]/$_[1]", Compress::LZF::sfreeze_cr $_[2], 0, sub { }; 2390 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
2391}
2392
2393=item cf::cache $id => [$paths...], $processversion => $process
2394
2395Generic caching function that returns the value of the resource $id,
2396caching and regenerating as required.
2397
2398This function can block.
2399
2400=cut
2401
2402sub cache {
2403 my ($id, $src, $processversion, $process) = @_;
2404
2405 my $meta =
2406 join "\x00",
2407 $processversion,
2408 map {
2409 aio_stat $_
2410 and Carp::croak "$_: $!";
2411
2412 ($_, (stat _)[7,9])
2413 } @$src;
2414
2415 my $dbmeta = db_get cache => "$id/meta";
2416 if ($dbmeta ne $meta) {
2417 # changed, we may need to process
2418
2419 my @data;
2420 my $md5;
2421
2422 for (0 .. $#$src) {
2423 0 <= aio_load $src->[$_], $data[$_]
2424 or Carp::croak "$src->[$_]: $!";
2425 }
2426
2427 # if processing is expensive, check
2428 # checksum first
2429 if (1) {
2430 $md5 =
2431 join "\x00",
2432 $processversion,
2433 map {
2434 Coro::cede;
2435 ($src->[$_], Digest::MD5::md5_hex $data[$_])
2436 } 0.. $#$src;
2437
2438
2439 my $dbmd5 = db_get cache => "$id/md5";
2440 if ($dbmd5 eq $md5) {
2441 db_put cache => "$id/meta", $meta;
2442
2443 return db_get cache => "$id/data";
2444 }
2445 }
2446
2447 my $t1 = Time::HiRes::time;
2448 my $data = $process->(\@data);
2449 my $t2 = Time::HiRes::time;
2450
2451 warn "cache: '$id' processed in ", $t2 - $t1, "s\n";
2452
2453 db_put cache => "$id/data", $data;
2454 db_put cache => "$id/md5" , $md5;
2455 db_put cache => "$id/meta", $meta;
2456
2457 return $data;
2458 }
2459
2460 db_get cache => "$id/data"
2461}
2462
2463=item fork_call { }, $args
2464
2465Executes the given code block with the given arguments in a seperate
2466process, returning the results. Everything must be serialisable with
2467Coro::Storable. May, of course, block. Note that the executed sub may
2468never block itself or use any form of Event handling.
2469
2470=cut
2471
2472sub fork_call(&@) {
2473 my ($cb, @args) = @_;
2474
2475# socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC
2476# or die "socketpair: $!";
2477 pipe my $fh1, my $fh2
2478 or die "pipe: $!";
2479
2480 if (my $pid = fork) {
2481 close $fh2;
2482
2483 my $res = (Coro::Handle::unblock $fh1)->readline (undef);
2484 $res = Coro::Storable::thaw $res;
2485
2486 waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
2487
2488 die $$res unless "ARRAY" eq ref $res;
2489
2490 return wantarray ? @$res : $res->[-1];
2491 } else {
2492 reset_signals;
2493 local $SIG{__WARN__};
2494 local $SIG{__DIE__};
2495 eval {
2496 close $fh1;
2497
2498 my @res = eval { $cb->(@args) };
2499 syswrite $fh2, Coro::Storable::freeze +($@ ? \"$@" : \@res);
2500 };
2501
2502 warn $@ if $@;
2503 _exit 0;
2504 }
2304} 2505}
2305 2506
2306############################################################################# 2507#############################################################################
2307# the server's init and main functions 2508# the server's init and main functions
2308 2509
2309sub load_facedata { 2510sub load_facedata($) {
2310 my $path = sprintf "%s/facedata", cf::datadir; 2511 my ($path) = @_;
2311 2512
2312 warn "loading facedata from $path\n"; 2513 warn "loading facedata from $path\n";
2313 2514
2314 my $facedata; 2515 my $facedata;
2315 0 < aio_load $path, $facedata 2516 0 < aio_load $path, $facedata
… …
2356 } 2557 }
2357 2558
2358 1 2559 1
2359} 2560}
2360 2561
2562sub reload_regions {
2563 load_resource_file "$MAPDIR/regions"
2564 or die "unable to load regions file\n";
2565}
2566
2567sub reload_facedata {
2568 load_facedata "$DATADIR/facedata"
2569 or die "unable to load facedata\n";
2570}
2571
2572sub reload_archetypes {
2573 load_resource_file "$DATADIR/archetypes"
2574 or die "unable to load archetypes\n";
2575}
2576
2577sub reload_treasures {
2578 load_resource_file "$DATADIR/treasures"
2579 or die "unable to load treasurelists\n";
2580}
2581
2361sub reload_resources { 2582sub reload_resources {
2362 load_resource_file sprintf "%s/%s/regions", cf::datadir, cf::mapdir 2583 warn "reloading resource files...\n";
2363 or die "unable to load regions file\n";#d# 2584
2585 reload_regions;
2364 load_facedata 2586 reload_facedata;
2365 or die "unable to load facedata\n";#d# 2587 #reload_archetypes;#d#
2588 reload_archetypes;
2589 reload_treasures;
2590
2591 warn "finished reloading resource files\n";
2366} 2592}
2367 2593
2368sub init { 2594sub init {
2369 reload_resources; 2595 reload_resources;
2370} 2596}
2371 2597
2372sub cfg_load { 2598sub cfg_load {
2373 open my $fh, "<:utf8", cf::confdir . "/config" 2599 open my $fh, "<:utf8", "$CONFDIR/config"
2374 or return; 2600 or return;
2375 2601
2376 local $/; 2602 local $/;
2377 *CFG = YAML::Syck::Load <$fh>; 2603 *CFG = YAML::Syck::Load <$fh>;
2378 2604
… …
2463 2689
2464 warn Carp::longmess "post_cleanup backtrace" 2690 warn Carp::longmess "post_cleanup backtrace"
2465 if $make_core; 2691 if $make_core;
2466} 2692}
2467 2693
2468sub reload() { 2694sub do_reload_perl() {
2469 # can/must only be called in main 2695 # can/must only be called in main
2470 if ($Coro::current != $Coro::main) { 2696 if ($Coro::current != $Coro::main) {
2471 warn "can only reload from main coroutine"; 2697 warn "can only reload from main coroutine";
2472 return; 2698 return;
2473 } 2699 }
… …
2548 Symbol::delete_package "safe::$_" 2774 Symbol::delete_package "safe::$_"
2549 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 2775 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
2550 2776
2551 warn "unloading cf.pm \"a bit\""; 2777 warn "unloading cf.pm \"a bit\"";
2552 delete $INC{"cf.pm"}; 2778 delete $INC{"cf.pm"};
2779 delete $INC{"cf/pod.pm"};
2553 2780
2554 # don't, removes xs symbols, too, 2781 # don't, removes xs symbols, too,
2555 # and global variables created in xs 2782 # and global variables created in xs
2556 #Symbol::delete_package __PACKAGE__; 2783 #Symbol::delete_package __PACKAGE__;
2557 2784
… …
2572 warn "reattaching attachments to maps"; 2799 warn "reattaching attachments to maps";
2573 reattach $_ for values %MAP; 2800 reattach $_ for values %MAP;
2574 warn "reattaching attachments to players"; 2801 warn "reattaching attachments to players";
2575 reattach $_ for values %PLAYER; 2802 reattach $_ for values %PLAYER;
2576 2803
2577 warn "loading reloadable resources";
2578 reload_resources;
2579
2580 warn "leaving sync_job"; 2804 warn "leaving sync_job";
2581 2805
2582 1 2806 1
2583 } or do { 2807 } or do {
2584 warn $@; 2808 warn $@;
… …
2589 warn "reloaded"; 2813 warn "reloaded";
2590}; 2814};
2591 2815
2592our $RELOAD_WATCHER; # used only during reload 2816our $RELOAD_WATCHER; # used only during reload
2593 2817
2818sub reload_perl() {
2819 # doing reload synchronously and two reloads happen back-to-back,
2820 # coro crashes during coro_state_free->destroy here.
2821
2822 $RELOAD_WATCHER ||= Event->timer (
2823 reentrant => 0,
2824 after => 0,
2825 data => WF_AUTOCANCEL,
2826 cb => sub {
2827 do_reload_perl;
2828 undef $RELOAD_WATCHER;
2829 },
2830 );
2831}
2832
2594register_command "reload" => sub { 2833register_command "reload" => sub {
2595 my ($who, $arg) = @_; 2834 my ($who, $arg) = @_;
2596 2835
2597 if ($who->flag (FLAG_WIZ)) { 2836 if ($who->flag (FLAG_WIZ)) {
2598 $who->message ("reloading server."); 2837 $who->message ("reloading server.");
2599 2838 async { reload_perl };
2600 # doing reload synchronously and two reloads happen back-to-back,
2601 # coro crashes during coro_state_free->destroy here.
2602
2603 $RELOAD_WATCHER ||= Event->timer (
2604 reentrant => 0,
2605 after => 0,
2606 data => WF_AUTOCANCEL,
2607 cb => sub {
2608 reload;
2609 undef $RELOAD_WATCHER;
2610 },
2611 );
2612 } 2839 }
2613}; 2840};
2614 2841
2615unshift @INC, $LIBDIR; 2842unshift @INC, $LIBDIR;
2616 2843
2617my $bug_warning = 0; 2844my $bug_warning = 0;
2618 2845
2846our @WAIT_FOR_TICK;
2847our @WAIT_FOR_TICK_BEGIN;
2848
2849sub wait_for_tick {
2850 return unless $TICK_WATCHER->is_active;
2851 return if $Coro::current == $Coro::main;
2852
2853 my $signal = new Coro::Signal;
2854 push @WAIT_FOR_TICK, $signal;
2855 $signal->wait;
2856}
2857
2858sub wait_for_tick_begin {
2859 return unless $TICK_WATCHER->is_active;
2860 return if $Coro::current == $Coro::main;
2861
2862 my $signal = new Coro::Signal;
2863 push @WAIT_FOR_TICK_BEGIN, $signal;
2864 $signal->wait;
2865}
2866
2867 my $min = 1e6;#d#
2868 my $avg = 10;
2619$TICK_WATCHER = Event->timer ( 2869$TICK_WATCHER = Event->timer (
2620 reentrant => 0, 2870 reentrant => 0,
2621 parked => 1, 2871 parked => 1,
2622 prio => 0, 2872 prio => 0,
2623 at => $NEXT_TICK || $TICK, 2873 at => $NEXT_TICK || $TICK,
… …
2627 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 2877 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
2628 unless ++$bug_warning > 10; 2878 unless ++$bug_warning > 10;
2629 return; 2879 return;
2630 } 2880 }
2631 2881
2632 $NOW = Event::time; 2882 $NOW = $tick_start = Event::time;
2633 2883
2634 cf::server_tick; # one server iteration 2884 cf::server_tick; # one server iteration
2885
2886 0 && sync_job {#d#
2887 for(1..10) {
2888 my $t = Event::time;
2889 my $map = my $map = new_from_path cf::map "/tmp/x.map"
2890 or die;
2891
2892 $map->width (50);
2893 $map->height (50);
2894 $map->alloc;
2895 $map->_load_objects ("/tmp/x.map", 1);
2896 my $t = Event::time - $t;
2897
2898 #next unless $t < 0.0013;#d#
2899 if ($t < $min) {
2900 $min = $t;
2901 }
2902 $avg = $avg * 0.99 + $t * 0.01;
2903 }
2904 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
2905 exit 0;
2906 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
2907 };
2908
2635 $RUNTIME += $TICK; 2909 $RUNTIME += $TICK;
2636 $NEXT_TICK += $TICK; 2910 $NEXT_TICK += $TICK;
2637 2911
2638 if ($NOW >= $NEXT_RUNTIME_WRITE) { 2912 if ($NOW >= $NEXT_RUNTIME_WRITE) {
2639 $NEXT_RUNTIME_WRITE = $NOW + 10; 2913 $NEXT_RUNTIME_WRITE = $NOW + 10;
… …
2641 write_runtime 2915 write_runtime
2642 or warn "ERROR: unable to write runtime file: $!"; 2916 or warn "ERROR: unable to write runtime file: $!";
2643 }; 2917 };
2644 } 2918 }
2645 2919
2646 $WAIT_FOR_TICK->broadcast;
2647 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited;
2648
2649# my $AFTER = Event::time; 2920# my $AFTER = Event::time;
2650# warn $AFTER - $NOW;#d# 2921# warn $AFTER - $NOW;#d#
2651 2922
2923 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
2924 $sig->send;
2925 }
2926 while (my $sig = shift @WAIT_FOR_TICK) {
2927 $sig->send;
2928 }
2929
2930 $NOW = Event::time;
2931
2652 # if we are delayed by four ticks or more, skip them all 2932 # if we are delayed by four ticks or more, skip them all
2653 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; 2933 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
2654 2934
2655 $TICK_WATCHER->at ($NEXT_TICK); 2935 $TICK_WATCHER->at ($NEXT_TICK);
2656 $TICK_WATCHER->start; 2936 $TICK_WATCHER->start;
2937
2938 $LOAD = ($NOW - $tick_start) / $TICK;
2939 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
2940
2941 _post_tick;
2942
2943
2657 }, 2944 },
2658); 2945);
2659 2946
2660{ 2947{
2661 BDB::max_poll_time $TICK * 0.1; 2948 BDB::max_poll_time $TICK * 0.1;
… …
2689 2976
2690 cf::sync_job { 2977 cf::sync_job {
2691 eval { 2978 eval {
2692 BDB::db_env_open 2979 BDB::db_env_open
2693 $DB_ENV, 2980 $DB_ENV,
2694 $BDB_ENV_DIR, 2981 $BDBDIR,
2695 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 2982 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
2696 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 2983 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
2697 0666; 2984 0666;
2698 2985
2699 cf::cleanup "db_env_open($BDB_ENV_DIR): $!" if $!; 2986 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
2700 2987
2701 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1); 2988 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
2702 $DB_ENV->set_lk_detect; 2989 $DB_ENV->set_lk_detect;
2703 }; 2990 };
2704 2991
… …
2720 prio => 6, 3007 prio => 6,
2721 cb => \&IO::AIO::poll_cb, 3008 cb => \&IO::AIO::poll_cb,
2722 ); 3009 );
2723} 3010}
2724 3011
3012my $_log_backtrace;
3013
3014sub _log_backtrace {
3015 my ($msg, @addr) = @_;
3016
3017 $msg =~ s/\n//;
3018
3019 # limit the # of concurrent backtraces
3020 if ($_log_backtrace < 2) {
3021 ++$_log_backtrace;
3022 async {
3023 my @bt = fork_call {
3024 @addr = map { sprintf "%x", $_ } @addr;
3025 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3026 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3027 or die "addr2line: $!";
3028
3029 my @funcs;
3030 my @res = <$fh>;
3031 chomp for @res;
3032 while (@res) {
3033 my ($func, $line) = splice @res, 0, 2, ();
3034 push @funcs, "[$func] $line";
3035 }
3036
3037 @funcs
3038 };
3039
3040 LOG llevInfo, "[ABT] $msg\n";
3041 LOG llevInfo, "[ABT] $_\n" for @bt;
3042 --$_log_backtrace;
3043 };
3044 } else {
3045 LOG llevInfo, "[ABT] $msg\n";
3046 LOG llevInfo, "[ABT] [suppressed]\n";
3047 }
3048}
3049
3050# load additional modules
3051use cf::pod;
3052
2725END { cf::emergency_save } 3053END { cf::emergency_save }
2726 3054
27271 30551
2728 3056

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines