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.243 by root, Mon Apr 16 13:02:29 2007 UTC vs.
Revision 1.277 by root, Sun Jun 10 04:24:50 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 91
81# 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 ∕
82our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 93our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
83 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
84binmode STDOUT; 99binmode STDOUT;
85binmode STDERR; 100binmode STDERR;
86 101
87# read virtual server time, if available 102# read virtual server time, if available
88unless ($RUNTIME || !-e cf::localdir . "/runtime") { 103unless ($RUNTIME || !-e "$LOCALDIR/runtime") {
89 open my $fh, "<", cf::localdir . "/runtime" 104 open my $fh, "<", "$LOCALDIR/runtime"
90 or die "unable to read runtime file: $!"; 105 or die "unable to read runtime file: $!";
91 $RUNTIME = <$fh> + 0.; 106 $RUNTIME = <$fh> + 0.;
92} 107}
93 108
94mkdir cf::localdir; 109mkdir $_
95mkdir cf::localdir . "/" . cf::playerdir; 110 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
96mkdir cf::localdir . "/" . cf::tmpdir;
97mkdir cf::localdir . "/" . cf::uniquedir;
98mkdir $RANDOM_MAPS;
99mkdir $BDB_ENV_DIR;
100 111
101our $EMERGENCY_POSITION; 112our $EMERGENCY_POSITION;
102 113
103sub cf::map::normalise; 114sub cf::map::normalise;
104 115
… …
115=item $cf::RUNTIME 126=item $cf::RUNTIME
116 127
117The 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
118every server tick. 129every server tick.
119 130
120=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
121 134
122The perl library directory, where extensions and cf-specific modules can 135Various directories - "/etc", read-only install directory, perl-library
123be 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.
124 139
125=item $cf::NOW 140=item $cf::NOW
126 141
127The time of the last (current) server tick. 142The time of the last (current) server tick.
128 143
129=item $cf::TICK 144=item $cf::TICK
130 145
131The 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.
132 157
133=item %cf::CFG 158=item %cf::CFG
134 159
135Configuration for the server, loaded from C</etc/crossfire/config>, or 160Configuration for the server, loaded from C</etc/crossfire/config>, or
136from wherever your confdir points to. 161from wherever your confdir points to.
… …
146=cut 171=cut
147 172
148BEGIN { 173BEGIN {
149 *CORE::GLOBAL::warn = sub { 174 *CORE::GLOBAL::warn = sub {
150 my $msg = join "", @_; 175 my $msg = join "", @_;
151 utf8::encode $msg;
152 176
153 $msg .= "\n" 177 $msg .= "\n"
154 unless $msg =~ /\n$/; 178 unless $msg =~ /\n$/;
155 179
180 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
181
182 utf8::encode $msg;
156 LOG llevError, $msg; 183 LOG llevError, $msg;
157 }; 184 };
158} 185}
159 186
160@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 187@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
161@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 188@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
162@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 189@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
163@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 190@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
164@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';
165@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)
166 194
167# 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
168# within the Safe compartment. 196# within the Safe compartment.
169for my $pkg (qw( 197for my $pkg (qw(
170 cf::global cf::attachable 198 cf::global cf::attachable
… …
230returned. 258returned.
231 259
232Lock 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
233uses map_find and cf::map::load uses map_load). 261uses map_find and cf::map::load uses map_load).
234 262
263=item $locked = cf::lock_active $string
264
265Return true if the lock is currently active, i.e. somebody has locked it.
266
235=cut 267=cut
236 268
237our %LOCK; 269our %LOCK;
238 270
239sub lock_wait($) { 271sub lock_wait($) {
… …
256 288
257 Coro::guard { 289 Coro::guard {
258 # wake up all waiters, to be on the safe side 290 # wake up all waiters, to be on the safe side
259 $_->ready for @{ delete $LOCK{$key} }; 291 $_->ready for @{ delete $LOCK{$key} };
260 } 292 }
293}
294
295sub lock_active($) {
296 my ($key) = @_;
297
298 ! ! $LOCK{$key}
261} 299}
262 300
263sub freeze_mainloop { 301sub freeze_mainloop {
264 return unless $TICK_WATCHER->is_active; 302 return unless $TICK_WATCHER->is_active;
265 303
… …
295 333
296sub sync_job(&) { 334sub sync_job(&) {
297 my ($job) = @_; 335 my ($job) = @_;
298 336
299 if ($Coro::current == $Coro::main) { 337 if ($Coro::current == $Coro::main) {
338 my $time = Event::time;
339
300 # this is the main coro, too bad, we have to block 340 # this is the main coro, too bad, we have to block
301 # till the operation succeeds, freezing the server :/ 341 # till the operation succeeds, freezing the server :/
302 342
303 # TODO: use suspend/resume instead 343 # TODO: use suspend/resume instead
304 # (but this is cancel-safe) 344 # (but this is cancel-safe)
… …
315 355
316 while ($busy) { 356 while ($busy) {
317 Coro::cede or Event::one_event; 357 Coro::cede or Event::one_event;
318 } 358 }
319 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
320 wantarray ? @res : $res[0] 367 wantarray ? @res : $res[0]
321 } else { 368 } else {
322 # we are in another coroutine, how wonderful, everything just works 369 # we are in another coroutine, how wonderful, everything just works
323 370
324 $job->() 371 $job->()
… …
344 391
345 $coro 392 $coro
346} 393}
347 394
348sub 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
349 my $guard = cf::lock_acquire "write_runtime"; 403 my $guard = cf::lock_acquire "write_runtime";
350
351 my $runtime = cf::localdir . "/runtime";
352 404
353 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 405 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644
354 or return; 406 or return;
355 407
356 my $value = $cf::RUNTIME + 90 + 10; 408 my $value = $cf::RUNTIME + 90 + 10;
… …
362 414
363 # always fsync - this file is important 415 # always fsync - this file is important
364 aio_fsync $fh 416 aio_fsync $fh
365 and return; 417 and return;
366 418
419 # touch it again to show we are up-to-date
420 aio_utime $fh, undef, undef;
421
367 close $fh 422 close $fh
368 or return; 423 or return;
369 424
370 aio_rename "$runtime~", $runtime 425 aio_rename "$runtime~", $runtime
371 and return; 426 and return;
427
428 warn "runtime file written.\n";
372 429
373 1 430 1
374} 431}
375 432
376=item cf::datalog type => key => value, ... 433=item cf::datalog type => key => value, ...
… …
569 $registry = $CB_TYPE[$object_type] ||= []; 626 $registry = $CB_TYPE[$object_type] ||= [];
570 627
571 } elsif ($type eq "subtype") { 628 } elsif ($type eq "subtype") {
572 defined $object_type or Carp::croak "subtype specified without type"; 629 defined $object_type or Carp::croak "subtype specified without type";
573 my $object_subtype = shift @arg; 630 my $object_subtype = shift @arg;
574 $registry = $CB_TYPE[$object_type + $object_subtype * NUM_SUBTYPES] ||= []; 631 $registry = $CB_TYPE[$object_type + $object_subtype * NUM_TYPES] ||= [];
575 632
576 } elsif ($type eq "package") { 633 } elsif ($type eq "package") {
577 my $pkg = shift @arg; 634 my $pkg = shift @arg;
578 635
579 while (my ($name, $id) = each %cb_id) { 636 while (my ($name, $id) = each %cb_id) {
… …
620 if (ref $_[0]) { 677 if (ref $_[0]) {
621 _object_attach @_; 678 _object_attach @_;
622 } else { 679 } else {
623 _attach shift->_attach_registry, @_; 680 _attach shift->_attach_registry, @_;
624 } 681 }
682 _recalc_want;
625}; 683};
626 684
627# all those should be optimised 685# all those should be optimised
628sub cf::attachable::detach { 686sub cf::attachable::detach {
629 my ($obj, $name) = @_; 687 my ($obj, $name) = @_;
… …
632 delete $obj->{_attachment}{$name}; 690 delete $obj->{_attachment}{$name};
633 reattach ($obj); 691 reattach ($obj);
634 } else { 692 } else {
635 Carp::croak "cannot, currently, detach class attachments"; 693 Carp::croak "cannot, currently, detach class attachments";
636 } 694 }
695 _recalc_want;
637}; 696};
638 697
639sub cf::attachable::attached { 698sub cf::attachable::attached {
640 my ($obj, $name) = @_; 699 my ($obj, $name) = @_;
641 700
… …
814 or return; 873 or return;
815 $av = eval { (Storable::thaw $av)->{objs} }; 874 $av = eval { (Storable::thaw $av)->{objs} };
816 } 875 }
817 876
818 warn sprintf "loading %s (%d)\n", 877 warn sprintf "loading %s (%d)\n",
819 $filename, length $data, scalar @{$av || []};#d# 878 $filename, length $data, scalar @{$av || []};
820 return ($data, $av); 879 return ($data, $av);
821} 880}
822 881
823############################################################################# 882#############################################################################
824# command handling &c 883# command handling &c
… …
951Returns the given player object, loading it if necessary (might block). 1010Returns the given player object, loading it if necessary (might block).
952 1011
953=cut 1012=cut
954 1013
955sub playerdir($) { 1014sub playerdir($) {
956 cf::localdir 1015 "$PLAYERDIR/"
957 . "/"
958 . cf::playerdir
959 . "/"
960 . (ref $_[0] ? $_[0]->ob->name : $_[0]) 1016 . (ref $_[0] ? $_[0]->ob->name : $_[0])
961} 1017}
962 1018
963sub path($) { 1019sub path($) {
964 my $login = ref $_[0] ? $_[0]->ob->name : $_[0]; 1020 my $login = ref $_[0] ? $_[0]->ob->name : $_[0];
… …
1084while and may block, so not sync_job-capable, ever. 1140while and may block, so not sync_job-capable, ever.
1085 1141
1086=cut 1142=cut
1087 1143
1088sub list_logins { 1144sub list_logins {
1089 my $dirs = aio_readdir cf::localdir . "/" . cf::playerdir 1145 my $dirs = aio_readdir $PLAYERDIR
1090 or return []; 1146 or return [];
1091 1147
1092 my @logins; 1148 my @logins;
1093 1149
1094 for my $login (@$dirs) { 1150 for my $login (@$dirs) {
… …
1249 my ($self, $merge) = @_; 1305 my ($self, $merge) = @_;
1250 1306
1251 # we have to keep some variables in memory intact 1307 # we have to keep some variables in memory intact
1252 local $self->{path}; 1308 local $self->{path};
1253 local $self->{load_path}; 1309 local $self->{load_path};
1254 local $self->{deny_save};
1255 local $self->{deny_reset};
1256 1310
1257 $self->SUPER::thawer_merge ($merge); 1311 $self->SUPER::thawer_merge ($merge);
1258} 1312}
1259 1313
1260sub normalise { 1314sub normalise {
… …
1332 1386
1333# the original (read-only) location 1387# the original (read-only) location
1334sub load_path { 1388sub load_path {
1335 my ($self) = @_; 1389 my ($self) = @_;
1336 1390
1337 sprintf "%s/%s/%s.map", cf::datadir, cf::mapdir, $self->{path} 1391 "$MAPDIR/$self->{path}.map"
1338} 1392}
1339 1393
1340# the temporary/swap location 1394# the temporary/swap location
1341sub save_path { 1395sub save_path {
1342 my ($self) = @_; 1396 my ($self) = @_;
1343 1397
1344 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1398 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1345 sprintf "%s/%s/%s.map", cf::localdir, cf::tmpdir, $path 1399 "$TMPDIR/$path.map"
1346} 1400}
1347 1401
1348# the unique path, undef == no special unique path 1402# the unique path, undef == no special unique path
1349sub uniq_path { 1403sub uniq_path {
1350 my ($self) = @_; 1404 my ($self) = @_;
1351 1405
1352 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1406 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1353 sprintf "%s/%s/%s", cf::localdir, cf::uniquedir, $path 1407 "$UNIQUEDIR/$path"
1354} 1408}
1355 1409
1356# and all this just because we cannot iterate over 1410# and all this just because we cannot iterate over
1357# all maps in C++... 1411# all maps in C++...
1358sub change_all_map_light { 1412sub change_all_map_light {
1359 my ($change) = @_; 1413 my ($change) = @_;
1360 1414
1361 $_->change_map_light ($change) 1415 $_->change_map_light ($change)
1362 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;
1363} 1425}
1364 1426
1365sub unlink_save { 1427sub unlink_save {
1366 my ($self) = @_; 1428 my ($self) = @_;
1367 1429
… …
1425 $self->load_header_orig 1487 $self->load_header_orig
1426 or return; 1488 or return;
1427 $self->prepare_orig; 1489 $self->prepare_orig;
1428 } 1490 }
1429 1491
1492 $self->{deny_reset} = 1
1493 if $self->no_reset;
1494
1430 $self->default_region (cf::region::find_by_path $self->{path}) 1495 $self->default_region (cf::region::find_by_path $self->{path})
1431 unless $self->default_region; 1496 unless $self->default_region;
1432 1497
1433 1 1498 1
1434} 1499}
… …
1449 $map->{last_save} = $cf::RUNTIME; 1514 $map->{last_save} = $cf::RUNTIME;
1450 1515
1451 $map->load_header 1516 $map->load_header
1452 or return; 1517 or return;
1453 1518
1454 if ($map->should_reset && 0) {#d#TODO# disabled, crashy (locking issue?) 1519 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1455 # doing this can freeze the server in a sync job, obviously 1520 # doing this can freeze the server in a sync job, obviously
1456 #$cf::WAIT_FOR_TICK->wait; 1521 #$cf::WAIT_FOR_TICK->wait;
1457 $map->reset; 1522 $map->reset;
1458 undef $guard; 1523 undef $guard;
1459 return find $path; 1524 return find $path;
… …
1470 my ($self) = @_; 1535 my ($self) = @_;
1471 1536
1472 local $self->{deny_reset} = 1; # loading can take a long time 1537 local $self->{deny_reset} = 1; # loading can take a long time
1473 1538
1474 my $path = $self->{path}; 1539 my $path = $self->{path};
1540
1541 {
1475 my $guard = cf::lock_acquire "map_load:$path"; 1542 my $guard = cf::lock_acquire "map_load:$path";
1476 1543
1477 return if $self->in_memory != cf::MAP_SWAPPED; 1544 return if $self->in_memory != cf::MAP_SWAPPED;
1478 1545
1479 $self->in_memory (cf::MAP_LOADING); 1546 $self->in_memory (cf::MAP_LOADING);
1480 1547
1481 $self->alloc; 1548 $self->alloc;
1482 1549
1483 $self->pre_load; 1550 $self->pre_load;
1484 Coro::cede;
1485
1486 $self->_load_objects ($self->{load_path}, 1)
1487 or return;
1488
1489 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1490 if delete $self->{load_original};
1491
1492 if (my $uniq = $self->uniq_path) {
1493 utf8::encode $uniq;
1494 if (aio_open $uniq, O_RDONLY, 0) {
1495 $self->clear_unique_items;
1496 $self->_load_objects ($uniq, 0);
1497 }
1498 }
1499
1500 Coro::cede;
1501 # now do the right thing for maps
1502 $self->link_multipart_objects;
1503 Coro::cede;
1504
1505 unless ($self->{deny_activate}) {
1506 $self->decay_objects;
1507 $self->fix_auto_apply;
1508 $self->update_buttons;
1509 Coro::cede; 1551 Coro::cede;
1510 $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;
1511 $self->difficulty ($self->estimate_difficulty) 1570 $self->difficulty ($self->estimate_difficulty)
1512 unless $self->difficulty; 1571 unless $self->difficulty;
1513 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;
1514 $self->activate; 1581 $self->activate;
1515 Coro::cede; 1582 }
1583
1584 $self->in_memory (cf::MAP_IN_MEMORY);
1516 } 1585 }
1517 1586
1518 $self->post_load; 1587 $self->post_load;
1519 Coro::cede;
1520
1521 $self->in_memory (cf::MAP_IN_MEMORY);
1522} 1588}
1523 1589
1524sub customise_for { 1590sub customise_for {
1525 my ($self, $ob) = @_; 1591 my ($self, $ob) = @_;
1526 1592
1527 return find "~" . $ob->name . "/" . $self->{path} 1593 return find "~" . $ob->name . "/" . $self->{path}
1528 if $self->per_player; 1594 if $self->per_player;
1595
1596# return find "?party/" . $ob->name . "/" . $self->{path}
1597# if $self->per_party;
1529 1598
1530 $self 1599 $self
1531} 1600}
1532 1601
1533# 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
… …
1644 1713
1645sub reset_at { 1714sub reset_at {
1646 my ($self) = @_; 1715 my ($self) = @_;
1647 1716
1648 # TODO: safety, remove and allow resettable per-player maps 1717 # TODO: safety, remove and allow resettable per-player maps
1649 return 1e99 if $self->isa ("ext::map_per_player");#d#
1650 return 1e99 if $self->{deny_reset}; 1718 return 1e99 if $self->{deny_reset};
1651 1719
1652 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access; 1720 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
1653 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;
1654 1722
… …
1665 my ($self) = @_; 1733 my ($self) = @_;
1666 1734
1667 my $lock = cf::lock_acquire "map_data:$self->{path}"; 1735 my $lock = cf::lock_acquire "map_data:$self->{path}";
1668 1736
1669 return if $self->players; 1737 return if $self->players;
1670 return if $self->isa ("ext::map_per_player");#d#
1671 1738
1672 warn "resetting map ", $self->path;#d# 1739 warn "resetting map ", $self->path;
1673 1740
1674 $self->in_memory (cf::MAP_SWAPPED); 1741 $self->in_memory (cf::MAP_SWAPPED);
1675 1742
1676 # need to save uniques path 1743 # need to save uniques path
1677 unless ($self->{deny_save}) { 1744 unless ($self->{deny_save}) {
… …
1709 $cf::MAP{$self->path} = $self; 1776 $cf::MAP{$self->path} = $self;
1710 1777
1711 $self->reset; # polite request, might not happen 1778 $self->reset; # polite request, might not happen
1712} 1779}
1713 1780
1781=item $maps = cf::map::tmp_maps
1782
1783Returns an arrayref with all map paths of currently instantiated and saved
1784maps. May block.
1785
1786=cut
1787
1788sub tmp_maps() {
1789 [
1790 map {
1791 utf8::decode $_;
1792 /\.map$/
1793 ? normalise $_
1794 : ()
1795 } @{ aio_readdir $TMPDIR or [] }
1796 ]
1797}
1798
1799=item $maps = cf::map::random_maps
1800
1801Returns an arrayref with all map paths of currently instantiated and saved
1802random maps. May block.
1803
1804=cut
1805
1806sub random_maps() {
1807 [
1808 map {
1809 utf8::decode $_;
1810 /\.map$/
1811 ? normalise "?random/$_"
1812 : ()
1813 } @{ aio_readdir $RANDOMDIR or [] }
1814 ]
1815}
1816
1714=item cf::map::unique_maps 1817=item cf::map::unique_maps
1715 1818
1716Returns an arrayref of paths of all shared maps that have 1819Returns an arrayref of paths of all shared maps that have
1717instantiated unique items. May block. 1820instantiated unique items. May block.
1718 1821
1719=cut 1822=cut
1720 1823
1721sub unique_maps() { 1824sub unique_maps() {
1722 my $files = aio_readdir cf::localdir . "/" . cf::uniquedir 1825 [
1723 or return; 1826 map {
1724
1725 my @paths;
1726
1727 for (@$files) {
1728 utf8::decode $_; 1827 utf8::decode $_;
1729 next if /\.pst$/; 1828 /\.map$/
1730 next unless /^$PATH_SEP/o; 1829 ? normalise $_
1731 1830 : ()
1732 push @paths, cf::map::normalise $_; 1831 } @{ aio_readdir $UNIQUEDIR or [] }
1733 } 1832 ]
1734
1735 \@paths
1736} 1833}
1737 1834
1738package cf; 1835package cf;
1739 1836
1740=back 1837=back
… …
1846 $self->deactivate_recursive; 1943 $self->deactivate_recursive;
1847 1944
1848 return if UNIVERSAL::isa $self->map, "ext::map_link"; 1945 return if UNIVERSAL::isa $self->map, "ext::map_link";
1849 1946
1850 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 1947 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
1851 if $self->map; 1948 if $self->map && $self->map->{path} ne "{link}";
1852 1949
1853 $self->enter_map ($LINK_MAP || link_map, 10, 10); 1950 $self->enter_map ($LINK_MAP || link_map, 10, 10);
1854} 1951}
1855 1952
1856sub cf::object::player::leave_link { 1953sub cf::object::player::leave_link {
1857 my ($self, $map, $x, $y) = @_; 1954 my ($self, $map, $x, $y) = @_;
1955
1956 return unless $self->contr->active;
1858 1957
1859 my $link_pos = delete $self->{_link_pos}; 1958 my $link_pos = delete $self->{_link_pos};
1860 1959
1861 unless ($map) { 1960 unless ($map) {
1862 # restore original map position 1961 # restore original map position
… …
1885 1984
1886 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 1985 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
1887 $self->enter_map ($map, $x, $y); 1986 $self->enter_map ($map, $x, $y);
1888} 1987}
1889 1988
1890cf::player->attach (
1891 on_logout => sub {
1892 my ($pl) = @_;
1893
1894 # abort map switching before logout
1895 if ($pl->ob->{_link_pos}) {
1896 cf::sync_job {
1897 $pl->ob->leave_link
1898 };
1899 }
1900 },
1901 on_login => sub {
1902 my ($pl) = @_;
1903
1904 # try to abort aborted map switching on player login :)
1905 # should happen only on crashes
1906 if ($pl->ob->{_link_pos}) {
1907 $pl->ob->enter_link;
1908 (async {
1909 $pl->ob->reply (undef,
1910 "There was an internal problem at your last logout, "
1911 . "the server will try to bring you to your intended destination in a second.",
1912 cf::NDI_RED);
1913 # we need this sleep as the login has a concurrent enter_exit running
1914 # and this sleep increases chances of the player not ending up in scorn
1915 Coro::Timer::sleep 1;
1916 $pl->ob->leave_link;
1917 })->prio (2);
1918 }
1919 },
1920);
1921
1922=item $player_object->goto ($path, $x, $y) 1989=item $player_object->goto ($path, $x, $y[, $check->($map)])
1923 1990
1991Moves the player to the given map-path and coordinates by first freezing
1992her, loading and preparing them map, calling the provided $check callback
1993that has to return the map if sucecssful, and then unfreezes the player on
1994the new (success) or old (failed) map position.
1995
1924=cut 1996=cut
1997
1998our $GOTOGEN;
1925 1999
1926sub cf::object::player::goto { 2000sub cf::object::player::goto {
1927 my ($self, $path, $x, $y) = @_; 2001 my ($self, $path, $x, $y, $check) = @_;
2002
2003 # do generation counting so two concurrent goto's will be executed in-order
2004 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
1928 2005
1929 $self->enter_link; 2006 $self->enter_link;
1930 2007
1931 (async { 2008 (async {
1932 my $map = eval { 2009 my $map = eval {
1933 my $map = cf::map::find $path; 2010 my $map = cf::map::find $path;
2011
2012 if ($map) {
1934 $map = $map->customise_for ($self) if $map; 2013 $map = $map->customise_for ($self);
2014 $map = $check->($map) if $check && $map;
2015 } else {
2016 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED);
2017 }
2018
1935 $map 2019 $map
2020 };
2021
2022 if ($@) {
2023 $self->message ("Something went wrong within the server, please report this incident!", cf::NDI_UNIQUE | cf::NDI_RED);
2024 LOG llevError | logBacktrace, Carp::longmess $@;
1936 } or 2025 }
1937 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED);
1938 2026
2027 if ($gen == $self->{_goto_generation}) {
2028 delete $self->{_goto_generation};
1939 $self->leave_link ($map, $x, $y); 2029 $self->leave_link ($map, $x, $y);
2030 }
1940 })->prio (1); 2031 })->prio (1);
1941} 2032}
1942 2033
1943=item $player_object->enter_exit ($exit_object) 2034=item $player_object->enter_exit ($exit_object)
1944 2035
… …
1983 2074
1984 $rmp->{random_seed} ||= $exit->random_seed; 2075 $rmp->{random_seed} ||= $exit->random_seed;
1985 2076
1986 my $data = cf::to_json $rmp; 2077 my $data = cf::to_json $rmp;
1987 my $md5 = Digest::MD5::md5_hex $data; 2078 my $md5 = Digest::MD5::md5_hex $data;
1988 my $meta = "$cf::RANDOM_MAPS/$md5.meta"; 2079 my $meta = "$RANDOMDIR/$md5.meta";
1989 2080
1990 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2081 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
1991 aio_write $fh, 0, (length $data), $data, 0; 2082 aio_write $fh, 0, (length $data), $data, 0;
1992 undef $fh; 2083 undef $fh;
1993 aio_rename "$meta~", $meta; 2084 aio_rename "$meta~", $meta;
… …
2262############################################################################# 2353#############################################################################
2263 2354
2264=head2 EXTENSION DATABASE SUPPORT 2355=head2 EXTENSION DATABASE SUPPORT
2265 2356
2266Crossfire maintains a very simple database for extension use. It can 2357Crossfire maintains a very simple database for extension use. It can
2267currently store anything that can be serialised using Storable, which 2358currently store binary data only (use Compress::LZF::sfreeze_cr/sthaw to
2268excludes objects. 2359convert to/from binary).
2269 2360
2270The parameter C<$family> should best start with the name of the extension 2361The parameter C<$family> should best start with the name of the extension
2271using it, it should be unique. 2362using it, it should be unique.
2272 2363
2273=over 4 2364=over 4
… …
2296 BDB::CREATE | BDB::AUTO_COMMIT, 0666; 2387 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
2297 cf::cleanup "db_open(db): $!" if $!; 2388 cf::cleanup "db_open(db): $!" if $!;
2298 }; 2389 };
2299 cf::cleanup "db_open(db): $@" if $@; 2390 cf::cleanup "db_open(db): $@" if $@;
2300 }; 2391 };
2301
2302 my $path = cf::localdir . "/database.pst";
2303 if (stat $path) {
2304 cf::sync_job {
2305 my $pst = Storable::retrieve $path;
2306
2307 cf::db_put (board => data => $pst->{board});
2308 cf::db_put (guildrules => data => $pst->{guildrules});
2309 cf::db_put (rent => balance => $pst->{rent}{balance});
2310 BDB::db_env_txn_checkpoint $DB_ENV;
2311
2312 unlink $path;
2313 };
2314 }
2315 } 2392 }
2316} 2393}
2317 2394
2318sub db_get($$) { 2395sub db_get($$) {
2319 my $key = "$_[0]/$_[1]"; 2396 my $key = "$_[0]/$_[1]";
2320 2397
2321 cf::sync_job { 2398 cf::sync_job {
2322 BDB::db_get $DB, undef, $key, my $data; 2399 BDB::db_get $DB, undef, $key, my $data;
2323 2400
2324 $! ? () 2401 $! ? ()
2325 : Compress::LZF::sthaw $data 2402 : $data
2326 } 2403 }
2327} 2404}
2328 2405
2329sub db_put($$$) { 2406sub db_put($$$) {
2330 BDB::dbreq_pri 4; 2407 BDB::dbreq_pri 4;
2331 BDB::db_put $DB, undef, "$_[0]/$_[1]", Compress::LZF::sfreeze_cr $_[2], 0, sub { }; 2408 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
2409}
2410
2411=item cf::cache $id => [$paths...], $processversion => $process
2412
2413Generic caching function that returns the value of the resource $id,
2414caching and regenerating as required.
2415
2416This function can block.
2417
2418=cut
2419
2420sub cache {
2421 my ($id, $src, $processversion, $process) = @_;
2422
2423 my $meta =
2424 join "\x00",
2425 $processversion,
2426 map {
2427 aio_stat $_
2428 and Carp::croak "$_: $!";
2429
2430 ($_, (stat _)[7,9])
2431 } @$src;
2432
2433 my $dbmeta = db_get cache => "$id/meta";
2434 if ($dbmeta ne $meta) {
2435 # changed, we may need to process
2436
2437 my @data;
2438 my $md5;
2439
2440 for (0 .. $#$src) {
2441 0 <= aio_load $src->[$_], $data[$_]
2442 or Carp::croak "$src->[$_]: $!";
2443 }
2444
2445 # if processing is expensive, check
2446 # checksum first
2447 if (1) {
2448 $md5 =
2449 join "\x00",
2450 $processversion,
2451 map {
2452 Coro::cede;
2453 ($src->[$_], Digest::MD5::md5_hex $data[$_])
2454 } 0.. $#$src;
2455
2456
2457 my $dbmd5 = db_get cache => "$id/md5";
2458 if ($dbmd5 eq $md5) {
2459 db_put cache => "$id/meta", $meta;
2460
2461 return db_get cache => "$id/data";
2462 }
2463 }
2464
2465 my $t1 = Time::HiRes::time;
2466 my $data = $process->(\@data);
2467 my $t2 = Time::HiRes::time;
2468
2469 warn "cache: '$id' processed in ", $t2 - $t1, "s\n";
2470
2471 db_put cache => "$id/data", $data;
2472 db_put cache => "$id/md5" , $md5;
2473 db_put cache => "$id/meta", $meta;
2474
2475 return $data;
2476 }
2477
2478 db_get cache => "$id/data"
2479}
2480
2481=item fork_call { }, $args
2482
2483Executes the given code block with the given arguments in a seperate
2484process, returning the results. Everything must be serialisable with
2485Coro::Storable. May, of course, block. Note that the executed sub may
2486never block itself or use any form of Event handling.
2487
2488=cut
2489
2490sub fork_call(&@) {
2491 my ($cb, @args) = @_;
2492
2493# socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC
2494# or die "socketpair: $!";
2495 pipe my $fh1, my $fh2
2496 or die "pipe: $!";
2497
2498 if (my $pid = fork) {
2499 close $fh2;
2500
2501 my $res = (Coro::Handle::unblock $fh1)->readline (undef);
2502 $res = Coro::Storable::thaw $res;
2503
2504 waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
2505
2506 die $$res unless "ARRAY" eq ref $res;
2507
2508 return wantarray ? @$res : $res->[-1];
2509 } else {
2510 reset_signals;
2511 local $SIG{__WARN__};
2512 local $SIG{__DIE__};
2513 eval {
2514 close $fh1;
2515
2516 my @res = eval { $cb->(@args) };
2517 syswrite $fh2, Coro::Storable::freeze +($@ ? \"$@" : \@res);
2518 };
2519
2520 warn $@ if $@;
2521 _exit 0;
2522 }
2332} 2523}
2333 2524
2334############################################################################# 2525#############################################################################
2335# the server's init and main functions 2526# the server's init and main functions
2336 2527
2337sub load_facedata { 2528sub load_facedata($) {
2338 my $path = sprintf "%s/facedata", cf::datadir; 2529 my ($path) = @_;
2339 2530
2340 warn "loading facedata from $path\n"; 2531 warn "loading facedata from $path\n";
2341 2532
2342 my $facedata; 2533 my $facedata;
2343 0 < aio_load $path, $facedata 2534 0 < aio_load $path, $facedata
… …
2384 } 2575 }
2385 2576
2386 1 2577 1
2387} 2578}
2388 2579
2389our $archetypes_loaded; 2580sub reload_regions {
2581 load_resource_file "$MAPDIR/regions"
2582 or die "unable to load regions file\n";
2583}
2390 2584
2585sub reload_facedata {
2586 load_facedata "$DATADIR/facedata"
2587 or die "unable to load facedata\n";
2588}
2589
2391sub load_archetypes { 2590sub reload_archetypes {
2392 return 1 if $archetypes_loaded++; # current can only load them once 2591 load_resource_file "$DATADIR/archetypes"
2393 load_archetype_file sprintf "%s/archetypes", cf::datadir; # remove when stable 2592 or die "unable to load archetypes\n";
2394 load_archetype_file sprintf "%s/archetypes", cf::datadir
2395} 2593}
2396 2594
2397sub load_treasures { 2595sub reload_treasures {
2398 load_treasure_file sprintf "%s/treasures", cf::datadir 2596 load_resource_file "$DATADIR/treasures"
2597 or die "unable to load treasurelists\n";
2399} 2598}
2400 2599
2401sub reload_resources { 2600sub reload_resources {
2402 load_resource_file sprintf "%s/%s/regions", cf::datadir, cf::mapdir 2601 warn "reloading resource files...\n";
2403 or die "unable to load regions file\n"; 2602
2603 reload_regions;
2404 load_facedata 2604 reload_facedata;
2405 or die "unable to load facedata\n"; 2605 #reload_archetypes;#d#
2406 load_archetypes 2606 reload_archetypes;
2407 or die "unable to load archetypes\n";
2408 load_treasures 2607 reload_treasures;
2409 or die "unable to load treasurelists\n"; 2608
2609 warn "finished reloading resource files\n";
2410} 2610}
2411 2611
2412sub init { 2612sub init {
2413 reload_resources; 2613 reload_resources;
2414} 2614}
2415 2615
2416sub cfg_load { 2616sub cfg_load {
2417 open my $fh, "<:utf8", cf::confdir . "/config" 2617 open my $fh, "<:utf8", "$CONFDIR/config"
2418 or return; 2618 or return;
2419 2619
2420 local $/; 2620 local $/;
2421 *CFG = YAML::Syck::Load <$fh>; 2621 *CFG = YAML::Syck::Load <$fh>;
2422 2622
… …
2507 2707
2508 warn Carp::longmess "post_cleanup backtrace" 2708 warn Carp::longmess "post_cleanup backtrace"
2509 if $make_core; 2709 if $make_core;
2510} 2710}
2511 2711
2512sub reload() { 2712sub do_reload_perl() {
2513 # can/must only be called in main 2713 # can/must only be called in main
2514 if ($Coro::current != $Coro::main) { 2714 if ($Coro::current != $Coro::main) {
2515 warn "can only reload from main coroutine"; 2715 warn "can only reload from main coroutine";
2516 return; 2716 return;
2517 } 2717 }
… …
2592 Symbol::delete_package "safe::$_" 2792 Symbol::delete_package "safe::$_"
2593 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 2793 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
2594 2794
2595 warn "unloading cf.pm \"a bit\""; 2795 warn "unloading cf.pm \"a bit\"";
2596 delete $INC{"cf.pm"}; 2796 delete $INC{"cf.pm"};
2797 delete $INC{"cf/pod.pm"};
2597 2798
2598 # don't, removes xs symbols, too, 2799 # don't, removes xs symbols, too,
2599 # and global variables created in xs 2800 # and global variables created in xs
2600 #Symbol::delete_package __PACKAGE__; 2801 #Symbol::delete_package __PACKAGE__;
2601 2802
… …
2616 warn "reattaching attachments to maps"; 2817 warn "reattaching attachments to maps";
2617 reattach $_ for values %MAP; 2818 reattach $_ for values %MAP;
2618 warn "reattaching attachments to players"; 2819 warn "reattaching attachments to players";
2619 reattach $_ for values %PLAYER; 2820 reattach $_ for values %PLAYER;
2620 2821
2621 warn "loading reloadable resources";
2622 reload_resources;
2623
2624 warn "leaving sync_job"; 2822 warn "leaving sync_job";
2625 2823
2626 1 2824 1
2627 } or do { 2825 } or do {
2628 warn $@; 2826 warn $@;
… …
2633 warn "reloaded"; 2831 warn "reloaded";
2634}; 2832};
2635 2833
2636our $RELOAD_WATCHER; # used only during reload 2834our $RELOAD_WATCHER; # used only during reload
2637 2835
2836sub reload_perl() {
2837 # doing reload synchronously and two reloads happen back-to-back,
2838 # coro crashes during coro_state_free->destroy here.
2839
2840 $RELOAD_WATCHER ||= Event->timer (
2841 reentrant => 0,
2842 after => 0,
2843 data => WF_AUTOCANCEL,
2844 cb => sub {
2845 do_reload_perl;
2846 undef $RELOAD_WATCHER;
2847 },
2848 );
2849}
2850
2638register_command "reload" => sub { 2851register_command "reload" => sub {
2639 my ($who, $arg) = @_; 2852 my ($who, $arg) = @_;
2640 2853
2641 if ($who->flag (FLAG_WIZ)) { 2854 if ($who->flag (FLAG_WIZ)) {
2642 $who->message ("reloading server."); 2855 $who->message ("reloading server.");
2643 2856 async { reload_perl };
2644 # doing reload synchronously and two reloads happen back-to-back,
2645 # coro crashes during coro_state_free->destroy here.
2646
2647 $RELOAD_WATCHER ||= Event->timer (
2648 reentrant => 0,
2649 after => 0,
2650 data => WF_AUTOCANCEL,
2651 cb => sub {
2652 reload;
2653 undef $RELOAD_WATCHER;
2654 },
2655 );
2656 } 2857 }
2657}; 2858};
2658 2859
2659unshift @INC, $LIBDIR; 2860unshift @INC, $LIBDIR;
2660 2861
… …
2679 my $signal = new Coro::Signal; 2880 my $signal = new Coro::Signal;
2680 push @WAIT_FOR_TICK_BEGIN, $signal; 2881 push @WAIT_FOR_TICK_BEGIN, $signal;
2681 $signal->wait; 2882 $signal->wait;
2682} 2883}
2683 2884
2885 my $min = 1e6;#d#
2886 my $avg = 10;
2684$TICK_WATCHER = Event->timer ( 2887$TICK_WATCHER = Event->timer (
2685 reentrant => 0, 2888 reentrant => 0,
2686 parked => 1, 2889 parked => 1,
2687 prio => 0, 2890 prio => 0,
2688 at => $NEXT_TICK || $TICK, 2891 at => $NEXT_TICK || $TICK,
… …
2692 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 2895 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
2693 unless ++$bug_warning > 10; 2896 unless ++$bug_warning > 10;
2694 return; 2897 return;
2695 } 2898 }
2696 2899
2697 $NOW = Event::time; 2900 $NOW = $tick_start = Event::time;
2698 2901
2699 cf::server_tick; # one server iteration 2902 cf::server_tick; # one server iteration
2903
2904 0 && sync_job {#d#
2905 for(1..10) {
2906 my $t = Event::time;
2907 my $map = my $map = new_from_path cf::map "/tmp/x.map"
2908 or die;
2909
2910 $map->width (50);
2911 $map->height (50);
2912 $map->alloc;
2913 $map->_load_objects ("/tmp/x.map", 1);
2914 my $t = Event::time - $t;
2915
2916 #next unless $t < 0.0013;#d#
2917 if ($t < $min) {
2918 $min = $t;
2919 }
2920 $avg = $avg * 0.99 + $t * 0.01;
2921 }
2922 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
2923 exit 0;
2924 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
2925 };
2926
2700 $RUNTIME += $TICK; 2927 $RUNTIME += $TICK;
2701 $NEXT_TICK += $TICK; 2928 $NEXT_TICK += $TICK;
2702 2929
2703 if ($NOW >= $NEXT_RUNTIME_WRITE) { 2930 if ($NOW >= $NEXT_RUNTIME_WRITE) {
2704 $NEXT_RUNTIME_WRITE = $NOW + 10; 2931 $NEXT_RUNTIME_WRITE = $NOW + 10;
… …
2706 write_runtime 2933 write_runtime
2707 or warn "ERROR: unable to write runtime file: $!"; 2934 or warn "ERROR: unable to write runtime file: $!";
2708 }; 2935 };
2709 } 2936 }
2710 2937
2938# my $AFTER = Event::time;
2939# warn $AFTER - $NOW;#d#
2940
2711 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 2941 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
2712 $sig->send; 2942 $sig->send;
2713 } 2943 }
2714 while (my $sig = shift @WAIT_FOR_TICK) { 2944 while (my $sig = shift @WAIT_FOR_TICK) {
2715 $sig->send; 2945 $sig->send;
2716 } 2946 }
2717 2947
2718# my $AFTER = Event::time; 2948 $NOW = Event::time;
2719# warn $AFTER - $NOW;#d#
2720 2949
2721 # if we are delayed by four ticks or more, skip them all 2950 # if we are delayed by four ticks or more, skip them all
2722 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; 2951 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
2723 2952
2724 $TICK_WATCHER->at ($NEXT_TICK); 2953 $TICK_WATCHER->at ($NEXT_TICK);
2725 $TICK_WATCHER->start; 2954 $TICK_WATCHER->start;
2955
2956 $LOAD = ($NOW - $tick_start) / $TICK;
2957 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
2958
2959 _post_tick;
2960
2961
2726 }, 2962 },
2727); 2963);
2728 2964
2729{ 2965{
2730 BDB::max_poll_time $TICK * 0.1; 2966 BDB::max_poll_time $TICK * 0.1;
… …
2758 2994
2759 cf::sync_job { 2995 cf::sync_job {
2760 eval { 2996 eval {
2761 BDB::db_env_open 2997 BDB::db_env_open
2762 $DB_ENV, 2998 $DB_ENV,
2763 $BDB_ENV_DIR, 2999 $BDBDIR,
2764 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 3000 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
2765 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3001 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
2766 0666; 3002 0666;
2767 3003
2768 cf::cleanup "db_env_open($BDB_ENV_DIR): $!" if $!; 3004 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
2769 3005
2770 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1); 3006 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
2771 $DB_ENV->set_lk_detect; 3007 $DB_ENV->set_lk_detect;
2772 }; 3008 };
2773 3009
… …
2789 prio => 6, 3025 prio => 6,
2790 cb => \&IO::AIO::poll_cb, 3026 cb => \&IO::AIO::poll_cb,
2791 ); 3027 );
2792} 3028}
2793 3029
3030my $_log_backtrace;
3031
3032sub _log_backtrace {
3033 my ($msg, @addr) = @_;
3034
3035 $msg =~ s/\n//;
3036
3037 # limit the # of concurrent backtraces
3038 if ($_log_backtrace < 2) {
3039 ++$_log_backtrace;
3040 async {
3041 my @bt = fork_call {
3042 @addr = map { sprintf "%x", $_ } @addr;
3043 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3044 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3045 or die "addr2line: $!";
3046
3047 my @funcs;
3048 my @res = <$fh>;
3049 chomp for @res;
3050 while (@res) {
3051 my ($func, $line) = splice @res, 0, 2, ();
3052 push @funcs, "[$func] $line";
3053 }
3054
3055 @funcs
3056 };
3057
3058 LOG llevInfo, "[ABT] $msg\n";
3059 LOG llevInfo, "[ABT] $_\n" for @bt;
3060 --$_log_backtrace;
3061 };
3062 } else {
3063 LOG llevInfo, "[ABT] $msg\n";
3064 LOG llevInfo, "[ABT] [suppressed]\n";
3065 }
3066}
3067
3068# load additional modules
3069use cf::pod;
3070
2794END { cf::emergency_save } 3071END { cf::emergency_save }
2795 3072
27961 30731
2797 3074

Diff Legend

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