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.230 by root, Mon Apr 2 18:04:46 2007 UTC vs.
Revision 1.272 by root, Sun Jun 3 15:32: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;
23use Coro::Storable;
21 24
22use BDB (); 25use BDB ();
23use Data::Dumper; 26use Data::Dumper;
24use Digest::MD5; 27use Digest::MD5;
25use Fcntl; 28use Fcntl;
… …
28use Time::HiRes; 31use Time::HiRes;
29use Compress::LZF; 32use Compress::LZF;
30 33
31# configure various modules to our taste 34# configure various modules to our taste
32# 35#
36$Storable::canonical = 1; # reduce rsync transfers
33Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator 37Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
34Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later 38Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
35 39
36$Event::Eval = 1; # no idea why this is required, but it is 40$Event::Eval = 1; # no idea why this is required, but it is
37 41
… …
50our %EXT_CORO = (); # coroutines bound to extensions 54our %EXT_CORO = (); # coroutines bound to extensions
51our %EXT_MAP = (); # pluggable maps 55our %EXT_MAP = (); # pluggable maps
52 56
53our $RELOAD; # number of reloads so far 57our $RELOAD; # number of reloads so far
54our @EVENT; 58our @EVENT;
55our $LIBDIR = datadir . "/ext";
56 59
57our $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(!)
58our $TICK_WATCHER; 73our $TICK_WATCHER;
59our $AIO_POLL_WATCHER; 74our $AIO_POLL_WATCHER;
60our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 75our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
61our $NEXT_TICK; 76our $NEXT_TICK;
62our $NOW; 77our $NOW;
… …
71our $RUNTIME; 86our $RUNTIME;
72 87
73our %PLAYER; # all users 88our %PLAYER; # all users
74our %MAP; # all maps 89our %MAP; # all maps
75our $LINK_MAP; # the special {link} map, which is always available 90our $LINK_MAP; # the special {link} map, which is always available
76our $RANDOM_MAPS = cf::localdir . "/random";
77our $BDB_ENV_DIR = cf::localdir . "/db";
78
79our $WAIT_FOR_TICK; $WAIT_FOR_TICK ||= new Coro::Signal;
80our $WAIT_FOR_TICK_ONE; $WAIT_FOR_TICK_ONE ||= new Coro::Signal;
81 91
82# 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 ∕
83our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 93our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
84 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
85binmode STDOUT; 99binmode STDOUT;
86binmode STDERR; 100binmode STDERR;
87 101
88# read virtual server time, if available 102# read virtual server time, if available
89unless ($RUNTIME || !-e cf::localdir . "/runtime") { 103unless ($RUNTIME || !-e "$LOCALDIR/runtime") {
90 open my $fh, "<", cf::localdir . "/runtime" 104 open my $fh, "<", "$LOCALDIR/runtime"
91 or die "unable to read runtime file: $!"; 105 or die "unable to read runtime file: $!";
92 $RUNTIME = <$fh> + 0.; 106 $RUNTIME = <$fh> + 0.;
93} 107}
94 108
95mkdir cf::localdir; 109mkdir $_
96mkdir cf::localdir . "/" . cf::playerdir; 110 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
97mkdir cf::localdir . "/" . cf::tmpdir;
98mkdir cf::localdir . "/" . cf::uniquedir;
99mkdir $RANDOM_MAPS;
100mkdir $BDB_ENV_DIR;
101 111
102our $EMERGENCY_POSITION; 112our $EMERGENCY_POSITION;
103 113
104sub cf::map::normalise; 114sub cf::map::normalise;
105 115
… …
116=item $cf::RUNTIME 126=item $cf::RUNTIME
117 127
118The 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
119every server tick. 129every server tick.
120 130
121=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
122 134
123The perl library directory, where extensions and cf-specific modules can 135Various directories - "/etc", read-only install directory, perl-library
124be 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.
125 139
126=item $cf::NOW 140=item $cf::NOW
127 141
128The time of the last (current) server tick. 142The time of the last (current) server tick.
129 143
130=item $cf::TICK 144=item $cf::TICK
131 145
132The 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.
133 157
134=item %cf::CFG 158=item %cf::CFG
135 159
136Configuration for the server, loaded from C</etc/crossfire/config>, or 160Configuration for the server, loaded from C</etc/crossfire/config>, or
137from wherever your confdir points to. 161from wherever your confdir points to.
138 162
139=item $cf::WAIT_FOR_TICK, $cf::WAIT_FOR_TICK_ONE 163=item cf::wait_for_tick, cf::wait_for_tick_begin
140 164
141These 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
142or 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
143processing 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.
144window of cpu time available, or simply to synchronise to the server tick.
145 168
146=back 169=back
147 170
148=cut 171=cut
149 172
150BEGIN { 173BEGIN {
151 *CORE::GLOBAL::warn = sub { 174 *CORE::GLOBAL::warn = sub {
152 my $msg = join "", @_; 175 my $msg = join "", @_;
153 utf8::encode $msg;
154 176
155 $msg .= "\n" 177 $msg .= "\n"
156 unless $msg =~ /\n$/; 178 unless $msg =~ /\n$/;
157 179
180 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
181
182 utf8::encode $msg;
158 LOG llevError, $msg; 183 LOG llevError, $msg;
159 }; 184 };
160} 185}
161 186
162@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 187@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
… …
232returned. 257returned.
233 258
234Lock names should begin with a unique identifier (for example, cf::map::find 259Lock names should begin with a unique identifier (for example, cf::map::find
235uses map_find and cf::map::load uses map_load). 260uses map_find and cf::map::load uses map_load).
236 261
262=item $locked = cf::lock_active $string
263
264Return true if the lock is currently active, i.e. somebody has locked it.
265
237=cut 266=cut
238 267
239our %LOCK; 268our %LOCK;
240 269
241sub lock_wait($) { 270sub lock_wait($) {
… …
258 287
259 Coro::guard { 288 Coro::guard {
260 # wake up all waiters, to be on the safe side 289 # wake up all waiters, to be on the safe side
261 $_->ready for @{ delete $LOCK{$key} }; 290 $_->ready for @{ delete $LOCK{$key} };
262 } 291 }
292}
293
294sub lock_active($) {
295 my ($key) = @_;
296
297 ! ! $LOCK{$key}
263} 298}
264 299
265sub freeze_mainloop { 300sub freeze_mainloop {
266 return unless $TICK_WATCHER->is_active; 301 return unless $TICK_WATCHER->is_active;
267 302
… …
297 332
298sub sync_job(&) { 333sub sync_job(&) {
299 my ($job) = @_; 334 my ($job) = @_;
300 335
301 if ($Coro::current == $Coro::main) { 336 if ($Coro::current == $Coro::main) {
337 my $time = Event::time;
338
302 # this is the main coro, too bad, we have to block 339 # this is the main coro, too bad, we have to block
303 # till the operation succeeds, freezing the server :/ 340 # till the operation succeeds, freezing the server :/
304 341
305 # TODO: use suspend/resume instead 342 # TODO: use suspend/resume instead
306 # (but this is cancel-safe) 343 # (but this is cancel-safe)
… …
317 354
318 while ($busy) { 355 while ($busy) {
319 Coro::cede or Event::one_event; 356 Coro::cede or Event::one_event;
320 } 357 }
321 358
359 $time = Event::time - $time;
360
361 LOG llevError | logBacktrace, Carp::longmess "long sync job"
362 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
363
364 $tick_start += $time; # do not account sync jobs to server load
365
322 wantarray ? @res : $res[0] 366 wantarray ? @res : $res[0]
323 } else { 367 } else {
324 # we are in another coroutine, how wonderful, everything just works 368 # we are in another coroutine, how wonderful, everything just works
325 369
326 $job->() 370 $job->()
… …
346 390
347 $coro 391 $coro
348} 392}
349 393
350sub write_runtime { 394sub write_runtime {
395 my $runtime = "$LOCALDIR/runtime";
396
397 # first touch the runtime file to show we are still running:
398 # the fsync below can take a very very long time.
399
400 IO::AIO::aio_utime $runtime, undef, undef;
401
351 my $guard = cf::lock_acquire "write_runtime"; 402 my $guard = cf::lock_acquire "write_runtime";
352
353 my $runtime = cf::localdir . "/runtime";
354 403
355 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 404 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644
356 or return; 405 or return;
357 406
358 my $value = $cf::RUNTIME + 90 + 10; 407 my $value = $cf::RUNTIME + 90 + 10;
… …
364 413
365 # always fsync - this file is important 414 # always fsync - this file is important
366 aio_fsync $fh 415 aio_fsync $fh
367 and return; 416 and return;
368 417
418 # touch it again to show we are up-to-date
419 aio_utime $fh, undef, undef;
420
369 close $fh 421 close $fh
370 or return; 422 or return;
371 423
372 aio_rename "$runtime~", $runtime 424 aio_rename "$runtime~", $runtime
373 and return; 425 and return;
426
427 warn "runtime file written.\n";#d#
374 428
375 1 429 1
376} 430}
377 431
378=item cf::datalog type => key => value, ... 432=item cf::datalog type => key => value, ...
… …
571 $registry = $CB_TYPE[$object_type] ||= []; 625 $registry = $CB_TYPE[$object_type] ||= [];
572 626
573 } elsif ($type eq "subtype") { 627 } elsif ($type eq "subtype") {
574 defined $object_type or Carp::croak "subtype specified without type"; 628 defined $object_type or Carp::croak "subtype specified without type";
575 my $object_subtype = shift @arg; 629 my $object_subtype = shift @arg;
576 $registry = $CB_TYPE[$object_type + $object_subtype * NUM_SUBTYPES] ||= []; 630 $registry = $CB_TYPE[$object_type + $object_subtype * NUM_TYPES] ||= [];
577 631
578 } elsif ($type eq "package") { 632 } elsif ($type eq "package") {
579 my $pkg = shift @arg; 633 my $pkg = shift @arg;
580 634
581 while (my ($name, $id) = each %cb_id) { 635 while (my ($name, $id) = each %cb_id) {
… …
622 if (ref $_[0]) { 676 if (ref $_[0]) {
623 _object_attach @_; 677 _object_attach @_;
624 } else { 678 } else {
625 _attach shift->_attach_registry, @_; 679 _attach shift->_attach_registry, @_;
626 } 680 }
681 _recalc_want;
627}; 682};
628 683
629# all those should be optimised 684# all those should be optimised
630sub cf::attachable::detach { 685sub cf::attachable::detach {
631 my ($obj, $name) = @_; 686 my ($obj, $name) = @_;
… …
634 delete $obj->{_attachment}{$name}; 689 delete $obj->{_attachment}{$name};
635 reattach ($obj); 690 reattach ($obj);
636 } else { 691 } else {
637 Carp::croak "cannot, currently, detach class attachments"; 692 Carp::croak "cannot, currently, detach class attachments";
638 } 693 }
694 _recalc_want;
639}; 695};
640 696
641sub cf::attachable::attached { 697sub cf::attachable::attached {
642 my ($obj, $name) = @_; 698 my ($obj, $name) = @_;
643 699
… …
953Returns the given player object, loading it if necessary (might block). 1009Returns the given player object, loading it if necessary (might block).
954 1010
955=cut 1011=cut
956 1012
957sub playerdir($) { 1013sub playerdir($) {
958 cf::localdir 1014 "$PLAYERDIR/"
959 . "/"
960 . cf::playerdir
961 . "/"
962 . (ref $_[0] ? $_[0]->ob->name : $_[0]) 1015 . (ref $_[0] ? $_[0]->ob->name : $_[0])
963} 1016}
964 1017
965sub path($) { 1018sub path($) {
966 my $login = ref $_[0] ? $_[0]->ob->name : $_[0]; 1019 my $login = ref $_[0] ? $_[0]->ob->name : $_[0];
967 1020
968 (playerdir $login) . "/$login.pl" 1021 (playerdir $login) . "/playerdata"
969} 1022}
970 1023
971sub find_active($) { 1024sub find_active($) {
972 $cf::PLAYER{$_[0]} 1025 $cf::PLAYER{$_[0]}
973 and $cf::PLAYER{$_[0]}->active 1026 and $cf::PLAYER{$_[0]}->active
… …
986 my $login = $_[0]; 1039 my $login = $_[0];
987 1040
988 my $guard = cf::lock_acquire "user_find:$login"; 1041 my $guard = cf::lock_acquire "user_find:$login";
989 1042
990 $cf::PLAYER{$_[0]} || do { 1043 $cf::PLAYER{$_[0]} || do {
1044 # rename old playerfiles to new ones
1045 #TODO: remove when no longer required
1046 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1047 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1048 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1049 aio_unlink +(playerdir $login) . "/$login.pl";
1050
991 my $pl = load_pl path $login 1051 my $pl = load_pl path $login
992 or return; 1052 or return;
993 $cf::PLAYER{$login} = $pl 1053 $cf::PLAYER{$login} = $pl
994 } 1054 }
995 } 1055 }
… …
1079while and may block, so not sync_job-capable, ever. 1139while and may block, so not sync_job-capable, ever.
1080 1140
1081=cut 1141=cut
1082 1142
1083sub list_logins { 1143sub list_logins {
1084 my $dirs = aio_readdir cf::localdir . "/" . cf::playerdir 1144 my $dirs = aio_readdir $PLAYERDIR
1085 or return []; 1145 or return [];
1086 1146
1087 my @logins; 1147 my @logins;
1088 1148
1089 for my $login (@$dirs) { 1149 for my $login (@$dirs) {
… …
1124 } 1184 }
1125 1185
1126 \@paths 1186 \@paths
1127} 1187}
1128 1188
1129=item $player->ext_reply ($msgid, $msgtype, %msg) 1189=item $player->ext_reply ($msgid, %msg)
1130 1190
1131Sends an ext reply to the player. 1191Sends an ext reply to the player.
1132 1192
1133=cut 1193=cut
1134 1194
1135sub ext_reply($$$%) { 1195sub ext_reply($$%) {
1136 my ($self, $id, %msg) = @_; 1196 my ($self, $id, %msg) = @_;
1137 1197
1138 $msg{msgid} = $id; 1198 $msg{msgid} = $id;
1139 1199
1140 $self->send ("ext " . cf::to_json \%msg); 1200 $self->send ("ext " . cf::to_json \%msg);
1141} 1201}
1142 1202
1143package cf; 1203=item $player->ext_event ($type, %msg)
1204
1205Sends an ext event to the client.
1206
1207=cut
1208
1209sub ext_event($$%) {
1210 my ($self, $type, %msg) = @_;
1211
1212 $self->ns->ext_event ($type, %msg);
1213}
1214
1215=head3 cf::region
1216
1217=over 4
1218
1219=cut
1220
1221package cf::region;
1222
1223=item cf::region::find_by_path $path
1224
1225Tries to decuce the probable region for a map knowing only its path.
1226
1227=cut
1228
1229sub find_by_path($) {
1230 my ($path) = @_;
1231
1232 my ($match, $specificity);
1233
1234 for my $region (list) {
1235 if ($region->match && $path =~ $region->match) {
1236 ($match, $specificity) = ($region, $region->specificity)
1237 if $region->specificity > $specificity;
1238 }
1239 }
1240
1241 $match
1242}
1144 1243
1145=back 1244=back
1146
1147 1245
1148=head3 cf::map 1246=head3 cf::map
1149 1247
1150=over 4 1248=over 4
1151 1249
… …
1289 1387
1290# the original (read-only) location 1388# the original (read-only) location
1291sub load_path { 1389sub load_path {
1292 my ($self) = @_; 1390 my ($self) = @_;
1293 1391
1294 sprintf "%s/%s/%s.map", cf::datadir, cf::mapdir, $self->{path} 1392 "$MAPDIR/$self->{path}.map"
1295} 1393}
1296 1394
1297# the temporary/swap location 1395# the temporary/swap location
1298sub save_path { 1396sub save_path {
1299 my ($self) = @_; 1397 my ($self) = @_;
1300 1398
1301 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1399 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1302 sprintf "%s/%s/%s.map", cf::localdir, cf::tmpdir, $path 1400 "$TMPDIR/$path.map"
1303} 1401}
1304 1402
1305# the unique path, undef == no special unique path 1403# the unique path, undef == no special unique path
1306sub uniq_path { 1404sub uniq_path {
1307 my ($self) = @_; 1405 my ($self) = @_;
1308 1406
1309 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1407 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1310 sprintf "%s/%s/%s", cf::localdir, cf::uniquedir, $path 1408 "$UNIQUEDIR/$path"
1311} 1409}
1312 1410
1313# and all this just because we cannot iterate over 1411# and all this just because we cannot iterate over
1314# all maps in C++... 1412# all maps in C++...
1315sub change_all_map_light { 1413sub change_all_map_light {
… …
1382 $self->load_header_orig 1480 $self->load_header_orig
1383 or return; 1481 or return;
1384 $self->prepare_orig; 1482 $self->prepare_orig;
1385 } 1483 }
1386 1484
1485 $self->default_region (cf::region::find_by_path $self->{path})
1486 unless $self->default_region;
1487
1387 1 1488 1
1388} 1489}
1389 1490
1390sub find; 1491sub find;
1391sub find { 1492sub find {
… …
1424 my ($self) = @_; 1525 my ($self) = @_;
1425 1526
1426 local $self->{deny_reset} = 1; # loading can take a long time 1527 local $self->{deny_reset} = 1; # loading can take a long time
1427 1528
1428 my $path = $self->{path}; 1529 my $path = $self->{path};
1530
1531 {
1429 my $guard = cf::lock_acquire "map_load:$path"; 1532 my $guard = cf::lock_acquire "map_load:$path";
1430 1533
1431 return if $self->in_memory != cf::MAP_SWAPPED; 1534 return if $self->in_memory != cf::MAP_SWAPPED;
1432 1535
1433 $self->in_memory (cf::MAP_LOADING); 1536 $self->in_memory (cf::MAP_LOADING);
1434 1537
1435 $self->alloc; 1538 $self->alloc;
1436 1539
1437 $self->pre_load; 1540 $self->pre_load;
1438
1439 $self->_load_objects ($self->{load_path}, 1)
1440 or return;
1441
1442 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1443 if delete $self->{load_original};
1444
1445 if (my $uniq = $self->uniq_path) {
1446 utf8::encode $uniq;
1447 if (aio_open $uniq, O_RDONLY, 0) {
1448 $self->clear_unique_items;
1449 $self->_load_objects ($uniq, 0);
1450 }
1451 }
1452
1453 Coro::cede;
1454
1455 # now do the right thing for maps
1456 $self->link_multipart_objects;
1457
1458 unless ($self->{deny_activate}) {
1459 $self->decay_objects;
1460 $self->fix_auto_apply;
1461 $self->update_buttons;
1462 Coro::cede; 1541 Coro::cede;
1463 $self->set_darkness_map; 1542
1543 $self->_load_objects ($self->{load_path}, 1)
1544 or return;
1545
1546 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1547 if delete $self->{load_original};
1548
1549 if (my $uniq = $self->uniq_path) {
1550 utf8::encode $uniq;
1551 if (aio_open $uniq, O_RDONLY, 0) {
1552 $self->clear_unique_items;
1553 $self->_load_objects ($uniq, 0);
1554 }
1555 }
1556
1557 Coro::cede;
1558 # now do the right thing for maps
1559 $self->link_multipart_objects;
1464 $self->difficulty ($self->estimate_difficulty) 1560 $self->difficulty ($self->estimate_difficulty)
1465 unless $self->difficulty; 1561 unless $self->difficulty;
1466 Coro::cede; 1562 Coro::cede;
1563
1564 unless ($self->{deny_activate}) {
1565 $self->decay_objects;
1566 $self->fix_auto_apply;
1567 $self->update_buttons;
1568 Coro::cede;
1569 $self->set_darkness_map;
1570 Coro::cede;
1467 $self->activate; 1571 $self->activate;
1572 }
1573
1574 $self->in_memory (cf::MAP_IN_MEMORY);
1468 } 1575 }
1469 1576
1470 $self->post_load; 1577 $self->post_load;
1471
1472 $self->in_memory (cf::MAP_IN_MEMORY);
1473} 1578}
1474 1579
1475sub customise_for { 1580sub customise_for {
1476 my ($self, $ob) = @_; 1581 my ($self, $ob) = @_;
1477 1582
… …
1668instantiated unique items. May block. 1773instantiated unique items. May block.
1669 1774
1670=cut 1775=cut
1671 1776
1672sub unique_maps() { 1777sub unique_maps() {
1673 my $files = aio_readdir cf::localdir . "/" . cf::uniquedir 1778 my $files = aio_readdir $UNIQUEDIR
1674 or return; 1779 or return;
1675 1780
1676 my @paths; 1781 my @paths;
1677 1782
1678 for (@$files) { 1783 for (@$files) {
… …
1797 $self->deactivate_recursive; 1902 $self->deactivate_recursive;
1798 1903
1799 return if UNIVERSAL::isa $self->map, "ext::map_link"; 1904 return if UNIVERSAL::isa $self->map, "ext::map_link";
1800 1905
1801 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 1906 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
1802 if $self->map; 1907 if $self->map && $self->map->{path} ne "{link}";
1803 1908
1804 $self->enter_map ($LINK_MAP || link_map, 10, 10); 1909 $self->enter_map ($LINK_MAP || link_map, 10, 10);
1805} 1910}
1806 1911
1807sub cf::object::player::leave_link { 1912sub cf::object::player::leave_link {
1808 my ($self, $map, $x, $y) = @_; 1913 my ($self, $map, $x, $y) = @_;
1914
1915 return unless $self->contr->active;
1809 1916
1810 my $link_pos = delete $self->{_link_pos}; 1917 my $link_pos = delete $self->{_link_pos};
1811 1918
1812 unless ($map) { 1919 unless ($map) {
1813 # restore original map position 1920 # restore original map position
… …
1836 1943
1837 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 1944 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
1838 $self->enter_map ($map, $x, $y); 1945 $self->enter_map ($map, $x, $y);
1839} 1946}
1840 1947
1841cf::player->attach (
1842 on_logout => sub {
1843 my ($pl) = @_;
1844
1845 # abort map switching before logout
1846 if ($pl->ob->{_link_pos}) {
1847 cf::sync_job {
1848 $pl->ob->leave_link
1849 };
1850 }
1851 },
1852 on_login => sub {
1853 my ($pl) = @_;
1854
1855 # try to abort aborted map switching on player login :)
1856 # should happen only on crashes
1857 if ($pl->ob->{_link_pos}) {
1858 $pl->ob->enter_link;
1859 (async {
1860 $pl->ob->reply (undef,
1861 "There was an internal problem at your last logout, "
1862 . "the server will try to bring you to your intended destination in a second.",
1863 cf::NDI_RED);
1864 # we need this sleep as the login has a concurrent enter_exit running
1865 # and this sleep increases chances of the player not ending up in scorn
1866 Coro::Timer::sleep 1;
1867 $pl->ob->leave_link;
1868 })->prio (2);
1869 }
1870 },
1871);
1872
1873=item $player_object->goto ($path, $x, $y) 1948=item $player_object->goto ($path, $x, $y[, $check->($map)])
1874 1949
1950Moves the player to the given map-path and coordinates by first freezing
1951her, loading and preparing them map, calling the provided $check callback
1952that has to return the map if sucecssful, and then unfreezes the player on
1953the new (success) or old (failed) map position.
1954
1875=cut 1955=cut
1956
1957our $GOTOGEN;
1876 1958
1877sub cf::object::player::goto { 1959sub cf::object::player::goto {
1878 my ($self, $path, $x, $y) = @_; 1960 my ($self, $path, $x, $y, $check) = @_;
1961
1962 # do generation counting so two concurrent goto's will be executed in-order
1963 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
1879 1964
1880 $self->enter_link; 1965 $self->enter_link;
1881 1966
1882 (async { 1967 (async {
1883 my $map = eval { 1968 my $map = eval {
1884 my $map = cf::map::find $path; 1969 my $map = cf::map::find $path;
1970
1971 if ($map) {
1885 $map = $map->customise_for ($self) if $map; 1972 $map = $map->customise_for ($self);
1973 $map = $check->($map) if $check && $map;
1974 } else {
1975 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED);
1976 }
1977
1886 $map 1978 $map
1979 };
1980
1981 if ($@) {
1982 $self->message ("Something went wrong within the server, please report this incident!", cf::NDI_UNIQUE | cf::NDI_RED);
1983 LOG llevError | logBacktrace, Carp::longmess $@;
1887 } or 1984 }
1888 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED);
1889 1985
1986 if ($gen == $self->{_goto_generation}) {
1987 delete $self->{_goto_generation};
1890 $self->leave_link ($map, $x, $y); 1988 $self->leave_link ($map, $x, $y);
1989 }
1891 })->prio (1); 1990 })->prio (1);
1892} 1991}
1893 1992
1894=item $player_object->enter_exit ($exit_object) 1993=item $player_object->enter_exit ($exit_object)
1895 1994
… …
1934 2033
1935 $rmp->{random_seed} ||= $exit->random_seed; 2034 $rmp->{random_seed} ||= $exit->random_seed;
1936 2035
1937 my $data = cf::to_json $rmp; 2036 my $data = cf::to_json $rmp;
1938 my $md5 = Digest::MD5::md5_hex $data; 2037 my $md5 = Digest::MD5::md5_hex $data;
1939 my $meta = "$cf::RANDOM_MAPS/$md5.meta"; 2038 my $meta = "$RANDOMDIR/$md5.meta";
1940 2039
1941 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2040 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
1942 aio_write $fh, 0, (length $data), $data, 0; 2041 aio_write $fh, 0, (length $data), $data, 0;
1943 undef $fh; 2042 undef $fh;
1944 aio_rename "$meta~", $meta; 2043 aio_rename "$meta~", $meta;
… …
1953 2052
1954 return unless $self->type == cf::PLAYER; 2053 return unless $self->type == cf::PLAYER;
1955 2054
1956 if ($exit->slaying eq "/!") { 2055 if ($exit->slaying eq "/!") {
1957 #TODO: this should de-fi-ni-te-ly not be a sync-job 2056 #TODO: this should de-fi-ni-te-ly not be a sync-job
2057 # the problem is that $exit might not survive long enough
2058 # so it needs to be done right now, right here
1958 cf::sync_job { prepare_random_map $exit }; 2059 cf::sync_job { prepare_random_map $exit };
1959 } 2060 }
1960 2061
1961 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path; 2062 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
1962 my $hp = $exit->stats->hp; 2063 my $hp = $exit->stats->hp;
… …
1970 $self->goto ($slaying, $hp, $sp); 2071 $self->goto ($slaying, $hp, $sp);
1971 2072
1972 1; 2073 1;
1973 }) { 2074 }) {
1974 $self->message ("Something went wrong deep within the crossfire server. " 2075 $self->message ("Something went wrong deep within the crossfire server. "
1975 . "I'll try to bring you back to the map you were before. " 2076 . "I'll try to bring you back to the map you were before. "
1976 . "Please report this to the dungeon master!", 2077 . "Please report this to the dungeon master!",
1977 cf::NDI_UNIQUE | cf::NDI_RED); 2078 cf::NDI_UNIQUE | cf::NDI_RED);
1978 2079
1979 warn "ERROR in enter_exit: $@"; 2080 warn "ERROR in enter_exit: $@";
1980 $self->leave_link; 2081 $self->leave_link;
1981 } 2082 }
1982 })->prio (1); 2083 })->prio (1);
… …
1998 2099
1999 utf8::encode $text; 2100 utf8::encode $text;
2000 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2101 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2001} 2102}
2002 2103
2104=item $client->ext_event ($type, %msg)
2105
2106Sends an exti event to the client.
2107
2108=cut
2109
2110sub cf::client::ext_event($$%) {
2111 my ($self, $type, %msg) = @_;
2112
2113 $msg{msgtype} = "event_$type";
2114 $self->send_packet ("ext " . cf::to_json \%msg);
2115}
2003 2116
2004=item $success = $client->query ($flags, "text", \&cb) 2117=item $success = $client->query ($flags, "text", \&cb)
2005 2118
2006Queues a query to the client, calling the given callback with 2119Queues a query to the client, calling the given callback with
2007the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>, 2120the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>,
… …
2199############################################################################# 2312#############################################################################
2200 2313
2201=head2 EXTENSION DATABASE SUPPORT 2314=head2 EXTENSION DATABASE SUPPORT
2202 2315
2203Crossfire maintains a very simple database for extension use. It can 2316Crossfire maintains a very simple database for extension use. It can
2204currently store anything that can be serialised using Storable, which 2317currently store binary data only (use Compress::LZF::sfreeze_cr/sthaw to
2205excludes objects. 2318convert to/from binary).
2206 2319
2207The parameter C<$family> should best start with the name of the extension 2320The parameter C<$family> should best start with the name of the extension
2208using it, it should be unique. 2321using it, it should be unique.
2209 2322
2210=over 4 2323=over 4
… …
2233 BDB::CREATE | BDB::AUTO_COMMIT, 0666; 2346 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
2234 cf::cleanup "db_open(db): $!" if $!; 2347 cf::cleanup "db_open(db): $!" if $!;
2235 }; 2348 };
2236 cf::cleanup "db_open(db): $@" if $@; 2349 cf::cleanup "db_open(db): $@" if $@;
2237 }; 2350 };
2238
2239 my $path = cf::localdir . "/database.pst";
2240 if (stat $path) {
2241 cf::sync_job {
2242 my $pst = Storable::retrieve $path;
2243
2244 cf::db_put (board => data => $pst->{board});
2245 cf::db_put (guildrules => data => $pst->{guildrules});
2246 cf::db_put (rent => balance => $pst->{rent}{balance});
2247 BDB::db_env_txn_checkpoint $DB_ENV;
2248
2249 unlink $path;
2250 };
2251 }
2252 } 2351 }
2253} 2352}
2254 2353
2255sub db_get($$) { 2354sub db_get($$) {
2256 my $key = "$_[0]/$_[1]"; 2355 my $key = "$_[0]/$_[1]";
2257 2356
2258 cf::sync_job { 2357 cf::sync_job {
2259 BDB::db_get $DB, undef, $key, my $data; 2358 BDB::db_get $DB, undef, $key, my $data;
2260 2359
2261 $! ? () 2360 $! ? ()
2262 : Compress::LZF::sthaw $data 2361 : $data
2263 } 2362 }
2264} 2363}
2265 2364
2266sub db_put($$$) { 2365sub db_put($$$) {
2267 BDB::dbreq_pri 4; 2366 BDB::dbreq_pri 4;
2268 BDB::db_put $DB, undef, "$_[0]/$_[1]", Compress::LZF::sfreeze_cr $_[2], 0, sub { }; 2367 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
2368}
2369
2370=item cf::cache $id => [$paths...], $processversion => $process
2371
2372Generic caching function that returns the value of the resource $id,
2373caching and regenerating as required.
2374
2375This function can block.
2376
2377=cut
2378
2379sub cache {
2380 my ($id, $src, $processversion, $process) = @_;
2381
2382 my $meta =
2383 join "\x00",
2384 $processversion,
2385 map {
2386 aio_stat $_
2387 and Carp::croak "$_: $!";
2388
2389 ($_, (stat _)[7,9])
2390 } @$src;
2391
2392 my $dbmeta = db_get cache => "$id/meta";
2393 if ($dbmeta ne $meta) {
2394 # changed, we may need to process
2395
2396 my @data;
2397 my $md5;
2398
2399 for (0 .. $#$src) {
2400 0 <= aio_load $src->[$_], $data[$_]
2401 or Carp::croak "$src->[$_]: $!";
2402 }
2403
2404 # if processing is expensive, check
2405 # checksum first
2406 if (1) {
2407 $md5 =
2408 join "\x00",
2409 $processversion,
2410 map {
2411 Coro::cede;
2412 ($src->[$_], Digest::MD5::md5_hex $data[$_])
2413 } 0.. $#$src;
2414
2415
2416 my $dbmd5 = db_get cache => "$id/md5";
2417 if ($dbmd5 eq $md5) {
2418 db_put cache => "$id/meta", $meta;
2419
2420 return db_get cache => "$id/data";
2421 }
2422 }
2423
2424 my $t1 = Time::HiRes::time;
2425 my $data = $process->(\@data);
2426 my $t2 = Time::HiRes::time;
2427
2428 warn "cache: '$id' processed in ", $t2 - $t1, "s\n";
2429
2430 db_put cache => "$id/data", $data;
2431 db_put cache => "$id/md5" , $md5;
2432 db_put cache => "$id/meta", $meta;
2433
2434 return $data;
2435 }
2436
2437 db_get cache => "$id/data"
2438}
2439
2440=item fork_call { }, $args
2441
2442Executes the given code block with the given arguments in a seperate
2443process, returning the results. Everything must be serialisable with
2444Coro::Storable. May, of course, block. Note that the executed sub may
2445never block itself or use any form of Event handling.
2446
2447=cut
2448
2449sub fork_call(&@) {
2450 my ($cb, @args) = @_;
2451
2452# socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC
2453# or die "socketpair: $!";
2454 pipe my $fh1, my $fh2
2455 or die "pipe: $!";
2456
2457 if (my $pid = fork) {
2458 close $fh2;
2459
2460 my $res = (Coro::Handle::unblock $fh1)->readline (undef);
2461 $res = Coro::Storable::thaw $res;
2462
2463 waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
2464
2465 die $$res unless "ARRAY" eq ref $res;
2466
2467 return wantarray ? @$res : $res->[-1];
2468 } else {
2469 reset_signals;
2470 local $SIG{__WARN__};
2471 local $SIG{__DIE__};
2472 eval {
2473 close $fh1;
2474
2475 my @res = eval { $cb->(@args) };
2476 syswrite $fh2, Coro::Storable::freeze +($@ ? \"$@" : \@res);
2477 };
2478
2479 warn $@ if $@;
2480 _exit 0;
2481 }
2269} 2482}
2270 2483
2271############################################################################# 2484#############################################################################
2272# the server's init and main functions 2485# the server's init and main functions
2273 2486
2274sub load_facedata { 2487sub load_facedata($) {
2275 my $path = sprintf "%s/facedata", cf::datadir; 2488 my ($path) = @_;
2276 2489
2277 warn "loading facedata from $path\n"; 2490 warn "loading facedata from $path\n";
2278 2491
2279 my $faces; 2492 my $facedata;
2280 0 < aio_load $path, $faces 2493 0 < aio_load $path, $facedata
2281 or die "$path: $!"; 2494 or die "$path: $!";
2282 2495
2283 Coro::cede;
2284 $faces = Storable::thaw $faces; 2496 $facedata = Coro::Storable::thaw $facedata;
2285 Coro::cede;
2286 2497
2287 my $meta = delete $faces->{""};
2288 $meta->{version} == 1 2498 $facedata->{version} == 2
2289 or cf::cleanup "$path: version mismatch, cannot proceed."; 2499 or cf::cleanup "$path: version mismatch, cannot proceed.";
2290 2500
2501 {
2502 my $faces = $facedata->{faceinfo};
2503
2291 while (my ($face, $info) = each %$faces) { 2504 while (my ($face, $info) = each %$faces) {
2292 my $idx = (cf::face::find $face) || cf::face::alloc $face; 2505 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2506 warn "$face $info->{magicmap}\n" if $face =~ /obol/;#d#
2293 cf::face::set $idx, $info->{visibility}, $info->{magicmap}; 2507 cf::face::set $idx, $info->{visibility}, $info->{magicmap};
2294 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 2508 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32};
2295 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 2509 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64};
2296 Coro::cede; 2510 Coro::cede;
2297 } 2511 }
2298 2512
2299 while (my ($face, $info) = each %$faces) { 2513 while (my ($face, $info) = each %$faces) {
2300 next unless $info->{smooth}; 2514 next unless $info->{smooth};
2301 my $idx = cf::face::find $face 2515 my $idx = cf::face::find $face
2302 or next; 2516 or next;
2303 if (my $smooth = cf::face::find $info->{smooth}) { 2517 if (my $smooth = cf::face::find $info->{smooth}) {
2304 cf::face::set_smooth $idx, $smooth; 2518 cf::face::set_smooth $idx, $smooth, $info->{smoothlevel};
2305 } else { 2519 } else {
2306 warn "smooth face '$info->{smooth}' not found for face '$face'"; 2520 warn "smooth face '$info->{smooth}' not found for face '$face'";
2307 } 2521 }
2308 Coro::cede; 2522 Coro::cede;
2523 }
2524 }
2525
2526 {
2527 my $anims = $facedata->{animinfo};
2528
2529 while (my ($anim, $info) = each %$anims) {
2530 cf::anim::set $anim, $info->{frames}, $info->{facings};
2531 Coro::cede;
2532 }
2533
2534 cf::anim::invalidate_all; # d'oh
2309 } 2535 }
2310 2536
2311 1 2537 1
2312} 2538}
2313 2539
2540sub reload_regions {
2541 load_resource_file "$MAPDIR/regions"
2542 or die "unable to load regions file\n";
2543}
2544
2545sub reload_facedata {
2546 load_facedata "$DATADIR/facedata"
2547 or die "unable to load facedata\n";
2548}
2549
2550sub reload_archetypes {
2551 load_resource_file "$DATADIR/archetypes"
2552 or die "unable to load archetypes\n";
2553}
2554
2555sub reload_treasures {
2556 load_resource_file "$DATADIR/treasures"
2557 or die "unable to load treasurelists\n";
2558}
2559
2314sub reload_resources { 2560sub reload_resources {
2315 load_resource_file sprintf "%s/%s/regions", cf::datadir, cf::mapdir 2561 warn "reloading resource files...\n";
2316 or die "unable to load regions file\n";#d# 2562
2563 reload_regions;
2317 load_facedata 2564 reload_facedata;
2318 or die "unable to load facedata\n";#d# 2565 reload_archetypes;
2566 reload_treasures;
2567
2568 warn "finished reloading resource files\n";
2319} 2569}
2320 2570
2321sub init { 2571sub init {
2322 reload_resources; 2572 reload_resources;
2323} 2573}
2324 2574
2325sub cfg_load { 2575sub cfg_load {
2326 open my $fh, "<:utf8", cf::confdir . "/config" 2576 open my $fh, "<:utf8", "$CONFDIR/config"
2327 or return; 2577 or return;
2328 2578
2329 local $/; 2579 local $/;
2330 *CFG = YAML::Syck::Load <$fh>; 2580 *CFG = YAML::Syck::Load <$fh>;
2331 2581
… …
2416 2666
2417 warn Carp::longmess "post_cleanup backtrace" 2667 warn Carp::longmess "post_cleanup backtrace"
2418 if $make_core; 2668 if $make_core;
2419} 2669}
2420 2670
2421sub reload() { 2671sub do_reload_perl() {
2422 # can/must only be called in main 2672 # can/must only be called in main
2423 if ($Coro::current != $Coro::main) { 2673 if ($Coro::current != $Coro::main) {
2424 warn "can only reload from main coroutine"; 2674 warn "can only reload from main coroutine";
2425 return; 2675 return;
2426 } 2676 }
… …
2501 Symbol::delete_package "safe::$_" 2751 Symbol::delete_package "safe::$_"
2502 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 2752 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
2503 2753
2504 warn "unloading cf.pm \"a bit\""; 2754 warn "unloading cf.pm \"a bit\"";
2505 delete $INC{"cf.pm"}; 2755 delete $INC{"cf.pm"};
2756 delete $INC{"cf/pod.pm"};
2506 2757
2507 # don't, removes xs symbols, too, 2758 # don't, removes xs symbols, too,
2508 # and global variables created in xs 2759 # and global variables created in xs
2509 #Symbol::delete_package __PACKAGE__; 2760 #Symbol::delete_package __PACKAGE__;
2510 2761
… …
2525 warn "reattaching attachments to maps"; 2776 warn "reattaching attachments to maps";
2526 reattach $_ for values %MAP; 2777 reattach $_ for values %MAP;
2527 warn "reattaching attachments to players"; 2778 warn "reattaching attachments to players";
2528 reattach $_ for values %PLAYER; 2779 reattach $_ for values %PLAYER;
2529 2780
2530 warn "loading reloadable resources";
2531 reload_resources;
2532
2533 warn "leaving sync_job"; 2781 warn "leaving sync_job";
2534 2782
2535 1 2783 1
2536 } or do { 2784 } or do {
2537 warn $@; 2785 warn $@;
… …
2542 warn "reloaded"; 2790 warn "reloaded";
2543}; 2791};
2544 2792
2545our $RELOAD_WATCHER; # used only during reload 2793our $RELOAD_WATCHER; # used only during reload
2546 2794
2795sub reload_perl() {
2796 # doing reload synchronously and two reloads happen back-to-back,
2797 # coro crashes during coro_state_free->destroy here.
2798
2799 $RELOAD_WATCHER ||= Event->timer (
2800 reentrant => 0,
2801 after => 0,
2802 data => WF_AUTOCANCEL,
2803 cb => sub {
2804 do_reload_perl;
2805 undef $RELOAD_WATCHER;
2806 },
2807 );
2808}
2809
2547register_command "reload" => sub { 2810register_command "reload" => sub {
2548 my ($who, $arg) = @_; 2811 my ($who, $arg) = @_;
2549 2812
2550 if ($who->flag (FLAG_WIZ)) { 2813 if ($who->flag (FLAG_WIZ)) {
2551 $who->message ("reloading server."); 2814 $who->message ("reloading server.");
2552 2815 async { reload_perl };
2553 # doing reload synchronously and two reloads happen back-to-back,
2554 # coro crashes during coro_state_free->destroy here.
2555
2556 $RELOAD_WATCHER ||= Event->timer (
2557 reentrant => 0,
2558 after => 0,
2559 data => WF_AUTOCANCEL,
2560 cb => sub {
2561 reload;
2562 undef $RELOAD_WATCHER;
2563 },
2564 );
2565 } 2816 }
2566}; 2817};
2567 2818
2568unshift @INC, $LIBDIR; 2819unshift @INC, $LIBDIR;
2569 2820
2570my $bug_warning = 0; 2821my $bug_warning = 0;
2571 2822
2823our @WAIT_FOR_TICK;
2824our @WAIT_FOR_TICK_BEGIN;
2825
2826sub wait_for_tick {
2827 return unless $TICK_WATCHER->is_active;
2828 return if $Coro::current == $Coro::main;
2829
2830 my $signal = new Coro::Signal;
2831 push @WAIT_FOR_TICK, $signal;
2832 $signal->wait;
2833}
2834
2835sub wait_for_tick_begin {
2836 return unless $TICK_WATCHER->is_active;
2837 return if $Coro::current == $Coro::main;
2838
2839 my $signal = new Coro::Signal;
2840 push @WAIT_FOR_TICK_BEGIN, $signal;
2841 $signal->wait;
2842}
2843
2844 my $min = 1e6;#d#
2845 my $avg = 10;
2572$TICK_WATCHER = Event->timer ( 2846$TICK_WATCHER = Event->timer (
2573 reentrant => 0, 2847 reentrant => 0,
2574 parked => 1, 2848 parked => 1,
2575 prio => 0, 2849 prio => 0,
2576 at => $NEXT_TICK || $TICK, 2850 at => $NEXT_TICK || $TICK,
… …
2580 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 2854 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
2581 unless ++$bug_warning > 10; 2855 unless ++$bug_warning > 10;
2582 return; 2856 return;
2583 } 2857 }
2584 2858
2585 $NOW = Event::time; 2859 $NOW = $tick_start = Event::time;
2586 2860
2587 cf::server_tick; # one server iteration 2861 cf::server_tick; # one server iteration
2862
2863 0 && sync_job {#d#
2864 for(1..10) {
2865 my $t = Event::time;
2866 my $map = my $map = new_from_path cf::map "/tmp/x.map"
2867 or die;
2868
2869 $map->width (50);
2870 $map->height (50);
2871 $map->alloc;
2872 $map->_load_objects ("/tmp/x.map", 1);
2873 my $t = Event::time - $t;
2874
2875 #next unless $t < 0.0013;#d#
2876 if ($t < $min) {
2877 $min = $t;
2878 }
2879 $avg = $avg * 0.99 + $t * 0.01;
2880 }
2881 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
2882 exit 0;
2883 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
2884 };
2885
2588 $RUNTIME += $TICK; 2886 $RUNTIME += $TICK;
2589 $NEXT_TICK += $TICK; 2887 $NEXT_TICK += $TICK;
2590 2888
2591 if ($NOW >= $NEXT_RUNTIME_WRITE) { 2889 if ($NOW >= $NEXT_RUNTIME_WRITE) {
2592 $NEXT_RUNTIME_WRITE = $NOW + 10; 2890 $NEXT_RUNTIME_WRITE = $NOW + 10;
… …
2594 write_runtime 2892 write_runtime
2595 or warn "ERROR: unable to write runtime file: $!"; 2893 or warn "ERROR: unable to write runtime file: $!";
2596 }; 2894 };
2597 } 2895 }
2598 2896
2599 $WAIT_FOR_TICK->broadcast;
2600 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited;
2601
2602# my $AFTER = Event::time; 2897# my $AFTER = Event::time;
2603# warn $AFTER - $NOW;#d# 2898# warn $AFTER - $NOW;#d#
2604 2899
2900 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
2901 $sig->send;
2902 }
2903 while (my $sig = shift @WAIT_FOR_TICK) {
2904 $sig->send;
2905 }
2906
2907 $NOW = Event::time;
2908
2605 # if we are delayed by four ticks or more, skip them all 2909 # if we are delayed by four ticks or more, skip them all
2606 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; 2910 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
2607 2911
2608 $TICK_WATCHER->at ($NEXT_TICK); 2912 $TICK_WATCHER->at ($NEXT_TICK);
2609 $TICK_WATCHER->start; 2913 $TICK_WATCHER->start;
2914
2915 $LOAD = ($NOW - $tick_start) / $TICK;
2916 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
2917
2918 _post_tick;
2919
2920
2610 }, 2921 },
2611); 2922);
2612 2923
2613{ 2924{
2614 BDB::max_poll_time $TICK * 0.1; 2925 BDB::max_poll_time $TICK * 0.1;
… …
2642 2953
2643 cf::sync_job { 2954 cf::sync_job {
2644 eval { 2955 eval {
2645 BDB::db_env_open 2956 BDB::db_env_open
2646 $DB_ENV, 2957 $DB_ENV,
2647 $BDB_ENV_DIR, 2958 $BDBDIR,
2648 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 2959 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
2649 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 2960 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
2650 0666; 2961 0666;
2651 2962
2652 cf::cleanup "db_env_open($BDB_ENV_DIR): $!" if $!; 2963 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
2653 2964
2654 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1); 2965 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
2655 $DB_ENV->set_lk_detect; 2966 $DB_ENV->set_lk_detect;
2656 }; 2967 };
2657 2968
… …
2673 prio => 6, 2984 prio => 6,
2674 cb => \&IO::AIO::poll_cb, 2985 cb => \&IO::AIO::poll_cb,
2675 ); 2986 );
2676} 2987}
2677 2988
2989my $_log_backtrace;
2990
2991sub _log_backtrace {
2992 my ($msg, @addr) = @_;
2993
2994 $msg =~ s/\n//;
2995
2996 # limit the # of concurrent backtraces
2997 if ($_log_backtrace < 2) {
2998 ++$_log_backtrace;
2999 async {
3000 my @bt = fork_call {
3001 @addr = map { sprintf "%x", $_ } @addr;
3002 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3003 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3004 or die "addr2line: $!";
3005
3006 my @funcs;
3007 my @res = <$fh>;
3008 chomp for @res;
3009 while (@res) {
3010 my ($func, $line) = splice @res, 0, 2, ();
3011 push @funcs, "[$func] $line";
3012 }
3013
3014 @funcs
3015 };
3016
3017 LOG llevInfo, "[ABT] $msg\n";
3018 LOG llevInfo, "[ABT] $_\n" for @bt;
3019 --$_log_backtrace;
3020 };
3021 } else {
3022 LOG llevInfo, "[ABT] $msg\n";
3023 LOG llevInfo, "[ABT] [suppressed]\n";
3024 }
3025}
3026
3027# load additional modules
3028use cf::pod;
3029
2678END { cf::emergency_save } 3030END { cf::emergency_save }
2679 3031
26801 30321
2681 3033

Diff Legend

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