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.245 by root, Tue Apr 17 10:06:33 2007 UTC vs.
Revision 1.275 by root, Thu Jun 7 19:12:22 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.61 (); 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"; 59
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";
58 71
59our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 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
… …
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}) {
… …
1717instantiated unique items. May block. 1784instantiated unique items. May block.
1718 1785
1719=cut 1786=cut
1720 1787
1721sub unique_maps() { 1788sub unique_maps() {
1722 my $files = aio_readdir cf::localdir . "/" . cf::uniquedir 1789 my $files = aio_readdir $UNIQUEDIR
1723 or return; 1790 or return;
1724 1791
1725 my @paths; 1792 my @paths;
1726 1793
1727 for (@$files) { 1794 for (@$files) {
… …
1846 $self->deactivate_recursive; 1913 $self->deactivate_recursive;
1847 1914
1848 return if UNIVERSAL::isa $self->map, "ext::map_link"; 1915 return if UNIVERSAL::isa $self->map, "ext::map_link";
1849 1916
1850 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 1917 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
1851 if $self->map; 1918 if $self->map && $self->map->{path} ne "{link}";
1852 1919
1853 $self->enter_map ($LINK_MAP || link_map, 10, 10); 1920 $self->enter_map ($LINK_MAP || link_map, 10, 10);
1854} 1921}
1855 1922
1856sub cf::object::player::leave_link { 1923sub cf::object::player::leave_link {
1857 my ($self, $map, $x, $y) = @_; 1924 my ($self, $map, $x, $y) = @_;
1925
1926 return unless $self->contr->active;
1858 1927
1859 my $link_pos = delete $self->{_link_pos}; 1928 my $link_pos = delete $self->{_link_pos};
1860 1929
1861 unless ($map) { 1930 unless ($map) {
1862 # restore original map position 1931 # restore original map position
… …
1885 1954
1886 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 1955 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
1887 $self->enter_map ($map, $x, $y); 1956 $self->enter_map ($map, $x, $y);
1888} 1957}
1889 1958
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) 1959=item $player_object->goto ($path, $x, $y[, $check->($map)])
1923 1960
1961Moves the player to the given map-path and coordinates by first freezing
1962her, loading and preparing them map, calling the provided $check callback
1963that has to return the map if sucecssful, and then unfreezes the player on
1964the new (success) or old (failed) map position.
1965
1924=cut 1966=cut
1967
1968our $GOTOGEN;
1925 1969
1926sub cf::object::player::goto { 1970sub cf::object::player::goto {
1927 my ($self, $path, $x, $y) = @_; 1971 my ($self, $path, $x, $y, $check) = @_;
1972
1973 # do generation counting so two concurrent goto's will be executed in-order
1974 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
1928 1975
1929 $self->enter_link; 1976 $self->enter_link;
1930 1977
1931 (async { 1978 (async {
1932 my $map = eval { 1979 my $map = eval {
1933 my $map = cf::map::find $path; 1980 my $map = cf::map::find $path;
1981
1982 if ($map) {
1934 $map = $map->customise_for ($self) if $map; 1983 $map = $map->customise_for ($self);
1984 $map = $check->($map) if $check && $map;
1985 } else {
1986 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED);
1987 }
1988
1935 $map 1989 $map
1990 };
1991
1992 if ($@) {
1993 $self->message ("Something went wrong within the server, please report this incident!", cf::NDI_UNIQUE | cf::NDI_RED);
1994 LOG llevError | logBacktrace, Carp::longmess $@;
1936 } or 1995 }
1937 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED);
1938 1996
1997 if ($gen == $self->{_goto_generation}) {
1998 delete $self->{_goto_generation};
1939 $self->leave_link ($map, $x, $y); 1999 $self->leave_link ($map, $x, $y);
2000 }
1940 })->prio (1); 2001 })->prio (1);
1941} 2002}
1942 2003
1943=item $player_object->enter_exit ($exit_object) 2004=item $player_object->enter_exit ($exit_object)
1944 2005
… …
1983 2044
1984 $rmp->{random_seed} ||= $exit->random_seed; 2045 $rmp->{random_seed} ||= $exit->random_seed;
1985 2046
1986 my $data = cf::to_json $rmp; 2047 my $data = cf::to_json $rmp;
1987 my $md5 = Digest::MD5::md5_hex $data; 2048 my $md5 = Digest::MD5::md5_hex $data;
1988 my $meta = "$cf::RANDOM_MAPS/$md5.meta"; 2049 my $meta = "$RANDOMDIR/$md5.meta";
1989 2050
1990 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2051 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
1991 aio_write $fh, 0, (length $data), $data, 0; 2052 aio_write $fh, 0, (length $data), $data, 0;
1992 undef $fh; 2053 undef $fh;
1993 aio_rename "$meta~", $meta; 2054 aio_rename "$meta~", $meta;
… …
2262############################################################################# 2323#############################################################################
2263 2324
2264=head2 EXTENSION DATABASE SUPPORT 2325=head2 EXTENSION DATABASE SUPPORT
2265 2326
2266Crossfire maintains a very simple database for extension use. It can 2327Crossfire maintains a very simple database for extension use. It can
2267currently store anything that can be serialised using Storable, which 2328currently store binary data only (use Compress::LZF::sfreeze_cr/sthaw to
2268excludes objects. 2329convert to/from binary).
2269 2330
2270The parameter C<$family> should best start with the name of the extension 2331The parameter C<$family> should best start with the name of the extension
2271using it, it should be unique. 2332using it, it should be unique.
2272 2333
2273=over 4 2334=over 4
… …
2296 BDB::CREATE | BDB::AUTO_COMMIT, 0666; 2357 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
2297 cf::cleanup "db_open(db): $!" if $!; 2358 cf::cleanup "db_open(db): $!" if $!;
2298 }; 2359 };
2299 cf::cleanup "db_open(db): $@" if $@; 2360 cf::cleanup "db_open(db): $@" if $@;
2300 }; 2361 };
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 } 2362 }
2316} 2363}
2317 2364
2318sub db_get($$) { 2365sub db_get($$) {
2319 my $key = "$_[0]/$_[1]"; 2366 my $key = "$_[0]/$_[1]";
2320 2367
2321 cf::sync_job { 2368 cf::sync_job {
2322 BDB::db_get $DB, undef, $key, my $data; 2369 BDB::db_get $DB, undef, $key, my $data;
2323 2370
2324 $! ? () 2371 $! ? ()
2325 : Compress::LZF::sthaw $data 2372 : $data
2326 } 2373 }
2327} 2374}
2328 2375
2329sub db_put($$$) { 2376sub db_put($$$) {
2330 BDB::dbreq_pri 4; 2377 BDB::dbreq_pri 4;
2331 BDB::db_put $DB, undef, "$_[0]/$_[1]", Compress::LZF::sfreeze_cr $_[2], 0, sub { }; 2378 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
2379}
2380
2381=item cf::cache $id => [$paths...], $processversion => $process
2382
2383Generic caching function that returns the value of the resource $id,
2384caching and regenerating as required.
2385
2386This function can block.
2387
2388=cut
2389
2390sub cache {
2391 my ($id, $src, $processversion, $process) = @_;
2392
2393 my $meta =
2394 join "\x00",
2395 $processversion,
2396 map {
2397 aio_stat $_
2398 and Carp::croak "$_: $!";
2399
2400 ($_, (stat _)[7,9])
2401 } @$src;
2402
2403 my $dbmeta = db_get cache => "$id/meta";
2404 if ($dbmeta ne $meta) {
2405 # changed, we may need to process
2406
2407 my @data;
2408 my $md5;
2409
2410 for (0 .. $#$src) {
2411 0 <= aio_load $src->[$_], $data[$_]
2412 or Carp::croak "$src->[$_]: $!";
2413 }
2414
2415 # if processing is expensive, check
2416 # checksum first
2417 if (1) {
2418 $md5 =
2419 join "\x00",
2420 $processversion,
2421 map {
2422 Coro::cede;
2423 ($src->[$_], Digest::MD5::md5_hex $data[$_])
2424 } 0.. $#$src;
2425
2426
2427 my $dbmd5 = db_get cache => "$id/md5";
2428 if ($dbmd5 eq $md5) {
2429 db_put cache => "$id/meta", $meta;
2430
2431 return db_get cache => "$id/data";
2432 }
2433 }
2434
2435 my $t1 = Time::HiRes::time;
2436 my $data = $process->(\@data);
2437 my $t2 = Time::HiRes::time;
2438
2439 warn "cache: '$id' processed in ", $t2 - $t1, "s\n";
2440
2441 db_put cache => "$id/data", $data;
2442 db_put cache => "$id/md5" , $md5;
2443 db_put cache => "$id/meta", $meta;
2444
2445 return $data;
2446 }
2447
2448 db_get cache => "$id/data"
2449}
2450
2451=item fork_call { }, $args
2452
2453Executes the given code block with the given arguments in a seperate
2454process, returning the results. Everything must be serialisable with
2455Coro::Storable. May, of course, block. Note that the executed sub may
2456never block itself or use any form of Event handling.
2457
2458=cut
2459
2460sub fork_call(&@) {
2461 my ($cb, @args) = @_;
2462
2463# socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC
2464# or die "socketpair: $!";
2465 pipe my $fh1, my $fh2
2466 or die "pipe: $!";
2467
2468 if (my $pid = fork) {
2469 close $fh2;
2470
2471 my $res = (Coro::Handle::unblock $fh1)->readline (undef);
2472 $res = Coro::Storable::thaw $res;
2473
2474 waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
2475
2476 die $$res unless "ARRAY" eq ref $res;
2477
2478 return wantarray ? @$res : $res->[-1];
2479 } else {
2480 reset_signals;
2481 local $SIG{__WARN__};
2482 local $SIG{__DIE__};
2483 eval {
2484 close $fh1;
2485
2486 my @res = eval { $cb->(@args) };
2487 syswrite $fh2, Coro::Storable::freeze +($@ ? \"$@" : \@res);
2488 };
2489
2490 warn $@ if $@;
2491 _exit 0;
2492 }
2332} 2493}
2333 2494
2334############################################################################# 2495#############################################################################
2335# the server's init and main functions 2496# the server's init and main functions
2336 2497
2337sub load_facedata { 2498sub load_facedata($) {
2338 my $path = sprintf "%s/facedata", cf::datadir; 2499 my ($path) = @_;
2339 2500
2340 warn "loading facedata from $path\n"; 2501 warn "loading facedata from $path\n";
2341 2502
2342 my $facedata; 2503 my $facedata;
2343 0 < aio_load $path, $facedata 2504 0 < aio_load $path, $facedata
… …
2384 } 2545 }
2385 2546
2386 1 2547 1
2387} 2548}
2388 2549
2550sub reload_regions {
2551 load_resource_file "$MAPDIR/regions"
2552 or die "unable to load regions file\n";
2553}
2554
2555sub reload_facedata {
2556 load_facedata "$DATADIR/facedata"
2557 or die "unable to load facedata\n";
2558}
2559
2389sub load_archetypes { 2560sub reload_archetypes {
2390 load_archetype_file sprintf "%s/archetypes", cf::datadir; # remove when stable 2561 load_resource_file "$DATADIR/archetypes"
2391 load_archetype_file sprintf "%s/archetypes", cf::datadir 2562 or die "unable to load archetypes\n";
2392} 2563}
2393 2564
2394sub load_treasures { 2565sub reload_treasures {
2395 load_treasure_file sprintf "%s/treasures", cf::datadir 2566 load_resource_file "$DATADIR/treasures"
2567 or die "unable to load treasurelists\n";
2396} 2568}
2397 2569
2398sub reload_resources { 2570sub reload_resources {
2399 warn "reloading resource files...\n"; 2571 warn "reloading resource files...\n";
2400 2572
2401 load_resource_file sprintf "%s/%s/regions", cf::datadir, cf::mapdir 2573 reload_regions;
2402 or die "unable to load regions file\n";
2403 load_facedata 2574 reload_facedata;
2404 or die "unable to load facedata\n"; 2575 #reload_archetypes;#d#
2405 load_archetypes 2576 reload_archetypes;
2406 or die "unable to load archetypes\n";
2407 load_treasures 2577 reload_treasures;
2408 or die "unable to load treasurelists\n";
2409 2578
2410 warn "finished reloading resource files\n"; 2579 warn "finished reloading resource files\n";
2411} 2580}
2412 2581
2413sub init { 2582sub init {
2414 reload_resources; 2583 reload_resources;
2415} 2584}
2416 2585
2417sub cfg_load { 2586sub cfg_load {
2418 open my $fh, "<:utf8", cf::confdir . "/config" 2587 open my $fh, "<:utf8", "$CONFDIR/config"
2419 or return; 2588 or return;
2420 2589
2421 local $/; 2590 local $/;
2422 *CFG = YAML::Syck::Load <$fh>; 2591 *CFG = YAML::Syck::Load <$fh>;
2423 2592
… …
2508 2677
2509 warn Carp::longmess "post_cleanup backtrace" 2678 warn Carp::longmess "post_cleanup backtrace"
2510 if $make_core; 2679 if $make_core;
2511} 2680}
2512 2681
2513sub reload() { 2682sub do_reload_perl() {
2514 # can/must only be called in main 2683 # can/must only be called in main
2515 if ($Coro::current != $Coro::main) { 2684 if ($Coro::current != $Coro::main) {
2516 warn "can only reload from main coroutine"; 2685 warn "can only reload from main coroutine";
2517 return; 2686 return;
2518 } 2687 }
… …
2593 Symbol::delete_package "safe::$_" 2762 Symbol::delete_package "safe::$_"
2594 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 2763 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
2595 2764
2596 warn "unloading cf.pm \"a bit\""; 2765 warn "unloading cf.pm \"a bit\"";
2597 delete $INC{"cf.pm"}; 2766 delete $INC{"cf.pm"};
2767 delete $INC{"cf/pod.pm"};
2598 2768
2599 # don't, removes xs symbols, too, 2769 # don't, removes xs symbols, too,
2600 # and global variables created in xs 2770 # and global variables created in xs
2601 #Symbol::delete_package __PACKAGE__; 2771 #Symbol::delete_package __PACKAGE__;
2602 2772
… …
2617 warn "reattaching attachments to maps"; 2787 warn "reattaching attachments to maps";
2618 reattach $_ for values %MAP; 2788 reattach $_ for values %MAP;
2619 warn "reattaching attachments to players"; 2789 warn "reattaching attachments to players";
2620 reattach $_ for values %PLAYER; 2790 reattach $_ for values %PLAYER;
2621 2791
2622 warn "loading reloadable resources";
2623 reload_resources;
2624
2625 warn "leaving sync_job"; 2792 warn "leaving sync_job";
2626 2793
2627 1 2794 1
2628 } or do { 2795 } or do {
2629 warn $@; 2796 warn $@;
… …
2634 warn "reloaded"; 2801 warn "reloaded";
2635}; 2802};
2636 2803
2637our $RELOAD_WATCHER; # used only during reload 2804our $RELOAD_WATCHER; # used only during reload
2638 2805
2806sub reload_perl() {
2807 # doing reload synchronously and two reloads happen back-to-back,
2808 # coro crashes during coro_state_free->destroy here.
2809
2810 $RELOAD_WATCHER ||= Event->timer (
2811 reentrant => 0,
2812 after => 0,
2813 data => WF_AUTOCANCEL,
2814 cb => sub {
2815 do_reload_perl;
2816 undef $RELOAD_WATCHER;
2817 },
2818 );
2819}
2820
2639register_command "reload" => sub { 2821register_command "reload" => sub {
2640 my ($who, $arg) = @_; 2822 my ($who, $arg) = @_;
2641 2823
2642 if ($who->flag (FLAG_WIZ)) { 2824 if ($who->flag (FLAG_WIZ)) {
2643 $who->message ("reloading server."); 2825 $who->message ("reloading server.");
2644 2826 async { reload_perl };
2645 # doing reload synchronously and two reloads happen back-to-back,
2646 # coro crashes during coro_state_free->destroy here.
2647
2648 $RELOAD_WATCHER ||= Event->timer (
2649 reentrant => 0,
2650 after => 0,
2651 data => WF_AUTOCANCEL,
2652 cb => sub {
2653 reload;
2654 undef $RELOAD_WATCHER;
2655 },
2656 );
2657 } 2827 }
2658}; 2828};
2659 2829
2660unshift @INC, $LIBDIR; 2830unshift @INC, $LIBDIR;
2661 2831
… …
2680 my $signal = new Coro::Signal; 2850 my $signal = new Coro::Signal;
2681 push @WAIT_FOR_TICK_BEGIN, $signal; 2851 push @WAIT_FOR_TICK_BEGIN, $signal;
2682 $signal->wait; 2852 $signal->wait;
2683} 2853}
2684 2854
2855 my $min = 1e6;#d#
2856 my $avg = 10;
2685$TICK_WATCHER = Event->timer ( 2857$TICK_WATCHER = Event->timer (
2686 reentrant => 0, 2858 reentrant => 0,
2687 parked => 1, 2859 parked => 1,
2688 prio => 0, 2860 prio => 0,
2689 at => $NEXT_TICK || $TICK, 2861 at => $NEXT_TICK || $TICK,
… …
2693 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 2865 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
2694 unless ++$bug_warning > 10; 2866 unless ++$bug_warning > 10;
2695 return; 2867 return;
2696 } 2868 }
2697 2869
2698 $NOW = Event::time; 2870 $NOW = $tick_start = Event::time;
2699 2871
2700 cf::server_tick; # one server iteration 2872 cf::server_tick; # one server iteration
2873
2874 0 && sync_job {#d#
2875 for(1..10) {
2876 my $t = Event::time;
2877 my $map = my $map = new_from_path cf::map "/tmp/x.map"
2878 or die;
2879
2880 $map->width (50);
2881 $map->height (50);
2882 $map->alloc;
2883 $map->_load_objects ("/tmp/x.map", 1);
2884 my $t = Event::time - $t;
2885
2886 #next unless $t < 0.0013;#d#
2887 if ($t < $min) {
2888 $min = $t;
2889 }
2890 $avg = $avg * 0.99 + $t * 0.01;
2891 }
2892 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
2893 exit 0;
2894 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
2895 };
2701 2896
2702 $RUNTIME += $TICK; 2897 $RUNTIME += $TICK;
2703 $NEXT_TICK += $TICK; 2898 $NEXT_TICK += $TICK;
2704 2899
2705 if ($NOW >= $NEXT_RUNTIME_WRITE) { 2900 if ($NOW >= $NEXT_RUNTIME_WRITE) {
… …
2711 } 2906 }
2712 2907
2713# my $AFTER = Event::time; 2908# my $AFTER = Event::time;
2714# warn $AFTER - $NOW;#d# 2909# warn $AFTER - $NOW;#d#
2715 2910
2911 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
2912 $sig->send;
2913 }
2914 while (my $sig = shift @WAIT_FOR_TICK) {
2915 $sig->send;
2916 }
2917
2918 $NOW = Event::time;
2919
2716 # if we are delayed by four ticks or more, skip them all 2920 # if we are delayed by four ticks or more, skip them all
2717 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; 2921 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
2718 2922
2719 $TICK_WATCHER->at ($NEXT_TICK); 2923 $TICK_WATCHER->at ($NEXT_TICK);
2720 $TICK_WATCHER->start; 2924 $TICK_WATCHER->start;
2721 2925
2722 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 2926 $LOAD = ($NOW - $tick_start) / $TICK;
2723 $sig->send; 2927 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
2724 }
2725 while (my $sig = shift @WAIT_FOR_TICK) {
2726 $sig->send;
2727 }
2728 2928
2729 _post_tick; 2929 _post_tick;
2930
2931
2730 }, 2932 },
2731); 2933);
2732 2934
2733{ 2935{
2734 BDB::max_poll_time $TICK * 0.1; 2936 BDB::max_poll_time $TICK * 0.1;
… …
2762 2964
2763 cf::sync_job { 2965 cf::sync_job {
2764 eval { 2966 eval {
2765 BDB::db_env_open 2967 BDB::db_env_open
2766 $DB_ENV, 2968 $DB_ENV,
2767 $BDB_ENV_DIR, 2969 $BDBDIR,
2768 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 2970 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
2769 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 2971 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
2770 0666; 2972 0666;
2771 2973
2772 cf::cleanup "db_env_open($BDB_ENV_DIR): $!" if $!; 2974 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
2773 2975
2774 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1); 2976 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
2775 $DB_ENV->set_lk_detect; 2977 $DB_ENV->set_lk_detect;
2776 }; 2978 };
2777 2979
… …
2793 prio => 6, 2995 prio => 6,
2794 cb => \&IO::AIO::poll_cb, 2996 cb => \&IO::AIO::poll_cb,
2795 ); 2997 );
2796} 2998}
2797 2999
3000my $_log_backtrace;
3001
3002sub _log_backtrace {
3003 my ($msg, @addr) = @_;
3004
3005 $msg =~ s/\n//;
3006
3007 # limit the # of concurrent backtraces
3008 if ($_log_backtrace < 2) {
3009 ++$_log_backtrace;
3010 async {
3011 my @bt = fork_call {
3012 @addr = map { sprintf "%x", $_ } @addr;
3013 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3014 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3015 or die "addr2line: $!";
3016
3017 my @funcs;
3018 my @res = <$fh>;
3019 chomp for @res;
3020 while (@res) {
3021 my ($func, $line) = splice @res, 0, 2, ();
3022 push @funcs, "[$func] $line";
3023 }
3024
3025 @funcs
3026 };
3027
3028 LOG llevInfo, "[ABT] $msg\n";
3029 LOG llevInfo, "[ABT] $_\n" for @bt;
3030 --$_log_backtrace;
3031 };
3032 } else {
3033 LOG llevInfo, "[ABT] $msg\n";
3034 LOG llevInfo, "[ABT] [suppressed]\n";
3035 }
3036}
3037
3038# load additional modules
3039use cf::pod;
3040
2798END { cf::emergency_save } 3041END { cf::emergency_save }
2799 3042
28001 30431
2801 3044

Diff Legend

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