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.228 by root, Mon Mar 26 16:53:33 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;
374 426
427 warn "runtime file written.\n";#d#
428
375 1 429 1
430}
431
432=item cf::datalog type => key => value, ...
433
434Log a datalog packet of the given type with the given key-value pairs.
435
436=cut
437
438sub datalog($@) {
439 my ($type, %kv) = @_;
440 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
376} 441}
377 442
378=back 443=back
379 444
380=cut 445=cut
… …
560 $registry = $CB_TYPE[$object_type] ||= []; 625 $registry = $CB_TYPE[$object_type] ||= [];
561 626
562 } elsif ($type eq "subtype") { 627 } elsif ($type eq "subtype") {
563 defined $object_type or Carp::croak "subtype specified without type"; 628 defined $object_type or Carp::croak "subtype specified without type";
564 my $object_subtype = shift @arg; 629 my $object_subtype = shift @arg;
565 $registry = $CB_TYPE[$object_type + $object_subtype * NUM_SUBTYPES] ||= []; 630 $registry = $CB_TYPE[$object_type + $object_subtype * NUM_TYPES] ||= [];
566 631
567 } elsif ($type eq "package") { 632 } elsif ($type eq "package") {
568 my $pkg = shift @arg; 633 my $pkg = shift @arg;
569 634
570 while (my ($name, $id) = each %cb_id) { 635 while (my ($name, $id) = each %cb_id) {
… …
611 if (ref $_[0]) { 676 if (ref $_[0]) {
612 _object_attach @_; 677 _object_attach @_;
613 } else { 678 } else {
614 _attach shift->_attach_registry, @_; 679 _attach shift->_attach_registry, @_;
615 } 680 }
681 _recalc_want;
616}; 682};
617 683
618# all those should be optimised 684# all those should be optimised
619sub cf::attachable::detach { 685sub cf::attachable::detach {
620 my ($obj, $name) = @_; 686 my ($obj, $name) = @_;
… …
623 delete $obj->{_attachment}{$name}; 689 delete $obj->{_attachment}{$name};
624 reattach ($obj); 690 reattach ($obj);
625 } else { 691 } else {
626 Carp::croak "cannot, currently, detach class attachments"; 692 Carp::croak "cannot, currently, detach class attachments";
627 } 693 }
694 _recalc_want;
628}; 695};
629 696
630sub cf::attachable::attached { 697sub cf::attachable::attached {
631 my ($obj, $name) = @_; 698 my ($obj, $name) = @_;
632 699
… …
942Returns the given player object, loading it if necessary (might block). 1009Returns the given player object, loading it if necessary (might block).
943 1010
944=cut 1011=cut
945 1012
946sub playerdir($) { 1013sub playerdir($) {
947 cf::localdir 1014 "$PLAYERDIR/"
948 . "/"
949 . cf::playerdir
950 . "/"
951 . (ref $_[0] ? $_[0]->ob->name : $_[0]) 1015 . (ref $_[0] ? $_[0]->ob->name : $_[0])
952} 1016}
953 1017
954sub path($) { 1018sub path($) {
955 my $login = ref $_[0] ? $_[0]->ob->name : $_[0]; 1019 my $login = ref $_[0] ? $_[0]->ob->name : $_[0];
956 1020
957 (playerdir $login) . "/$login.pl" 1021 (playerdir $login) . "/playerdata"
958} 1022}
959 1023
960sub find_active($) { 1024sub find_active($) {
961 $cf::PLAYER{$_[0]} 1025 $cf::PLAYER{$_[0]}
962 and $cf::PLAYER{$_[0]}->active 1026 and $cf::PLAYER{$_[0]}->active
… …
975 my $login = $_[0]; 1039 my $login = $_[0];
976 1040
977 my $guard = cf::lock_acquire "user_find:$login"; 1041 my $guard = cf::lock_acquire "user_find:$login";
978 1042
979 $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
980 my $pl = load_pl path $login 1051 my $pl = load_pl path $login
981 or return; 1052 or return;
982 $cf::PLAYER{$login} = $pl 1053 $cf::PLAYER{$login} = $pl
983 } 1054 }
984 } 1055 }
… …
1068while and may block, so not sync_job-capable, ever. 1139while and may block, so not sync_job-capable, ever.
1069 1140
1070=cut 1141=cut
1071 1142
1072sub list_logins { 1143sub list_logins {
1073 my $dirs = aio_readdir cf::localdir . "/" . cf::playerdir 1144 my $dirs = aio_readdir $PLAYERDIR
1074 or return []; 1145 or return [];
1075 1146
1076 my @logins; 1147 my @logins;
1077 1148
1078 for my $login (@$dirs) { 1149 for my $login (@$dirs) {
… …
1113 } 1184 }
1114 1185
1115 \@paths 1186 \@paths
1116} 1187}
1117 1188
1118=item $player->ext_reply ($msgid, $msgtype, %msg) 1189=item $player->ext_reply ($msgid, %msg)
1119 1190
1120Sends an ext reply to the player. 1191Sends an ext reply to the player.
1121 1192
1122=cut 1193=cut
1123 1194
1124sub ext_reply($$$%) { 1195sub ext_reply($$%) {
1125 my ($self, $id, %msg) = @_; 1196 my ($self, $id, %msg) = @_;
1126 1197
1127 $msg{msgid} = $id; 1198 $msg{msgid} = $id;
1128 1199
1129 $self->send ("ext " . cf::to_json \%msg); 1200 $self->send ("ext " . cf::to_json \%msg);
1130} 1201}
1131 1202
1132package 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}
1133 1243
1134=back 1244=back
1135
1136 1245
1137=head3 cf::map 1246=head3 cf::map
1138 1247
1139=over 4 1248=over 4
1140 1249
… …
1278 1387
1279# the original (read-only) location 1388# the original (read-only) location
1280sub load_path { 1389sub load_path {
1281 my ($self) = @_; 1390 my ($self) = @_;
1282 1391
1283 sprintf "%s/%s/%s.map", cf::datadir, cf::mapdir, $self->{path} 1392 "$MAPDIR/$self->{path}.map"
1284} 1393}
1285 1394
1286# the temporary/swap location 1395# the temporary/swap location
1287sub save_path { 1396sub save_path {
1288 my ($self) = @_; 1397 my ($self) = @_;
1289 1398
1290 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1399 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1291 sprintf "%s/%s/%s.map", cf::localdir, cf::tmpdir, $path 1400 "$TMPDIR/$path.map"
1292} 1401}
1293 1402
1294# the unique path, undef == no special unique path 1403# the unique path, undef == no special unique path
1295sub uniq_path { 1404sub uniq_path {
1296 my ($self) = @_; 1405 my ($self) = @_;
1297 1406
1298 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1407 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1299 sprintf "%s/%s/%s", cf::localdir, cf::uniquedir, $path 1408 "$UNIQUEDIR/$path"
1300} 1409}
1301 1410
1302# and all this just because we cannot iterate over 1411# and all this just because we cannot iterate over
1303# all maps in C++... 1412# all maps in C++...
1304sub change_all_map_light { 1413sub change_all_map_light {
… …
1371 $self->load_header_orig 1480 $self->load_header_orig
1372 or return; 1481 or return;
1373 $self->prepare_orig; 1482 $self->prepare_orig;
1374 } 1483 }
1375 1484
1485 $self->default_region (cf::region::find_by_path $self->{path})
1486 unless $self->default_region;
1487
1376 1 1488 1
1377} 1489}
1378 1490
1379sub find; 1491sub find;
1380sub find { 1492sub find {
… …
1413 my ($self) = @_; 1525 my ($self) = @_;
1414 1526
1415 local $self->{deny_reset} = 1; # loading can take a long time 1527 local $self->{deny_reset} = 1; # loading can take a long time
1416 1528
1417 my $path = $self->{path}; 1529 my $path = $self->{path};
1530
1531 {
1418 my $guard = cf::lock_acquire "map_load:$path"; 1532 my $guard = cf::lock_acquire "map_load:$path";
1419 1533
1420 return if $self->in_memory != cf::MAP_SWAPPED; 1534 return if $self->in_memory != cf::MAP_SWAPPED;
1421 1535
1422 $self->in_memory (cf::MAP_LOADING); 1536 $self->in_memory (cf::MAP_LOADING);
1423 1537
1424 $self->alloc; 1538 $self->alloc;
1425 1539
1426 $self->pre_load; 1540 $self->pre_load;
1427
1428 $self->_load_objects ($self->{load_path}, 1)
1429 or return;
1430
1431 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1432 if delete $self->{load_original};
1433
1434 if (my $uniq = $self->uniq_path) {
1435 utf8::encode $uniq;
1436 if (aio_open $uniq, O_RDONLY, 0) {
1437 $self->clear_unique_items;
1438 $self->_load_objects ($uniq, 0);
1439 }
1440 }
1441
1442 Coro::cede;
1443
1444 # now do the right thing for maps
1445 $self->link_multipart_objects;
1446
1447 unless ($self->{deny_activate}) {
1448 $self->decay_objects;
1449 $self->fix_auto_apply;
1450 $self->update_buttons;
1451 Coro::cede; 1541 Coro::cede;
1452 $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;
1453 $self->difficulty ($self->estimate_difficulty) 1560 $self->difficulty ($self->estimate_difficulty)
1454 unless $self->difficulty; 1561 unless $self->difficulty;
1455 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;
1456 $self->activate; 1571 $self->activate;
1572 }
1573
1574 $self->in_memory (cf::MAP_IN_MEMORY);
1457 } 1575 }
1458 1576
1459 $self->post_load; 1577 $self->post_load;
1460
1461 $self->in_memory (cf::MAP_IN_MEMORY);
1462} 1578}
1463 1579
1464sub customise_for { 1580sub customise_for {
1465 my ($self, $ob) = @_; 1581 my ($self, $ob) = @_;
1466 1582
… …
1657instantiated unique items. May block. 1773instantiated unique items. May block.
1658 1774
1659=cut 1775=cut
1660 1776
1661sub unique_maps() { 1777sub unique_maps() {
1662 my $files = aio_readdir cf::localdir . "/" . cf::uniquedir 1778 my $files = aio_readdir $UNIQUEDIR
1663 or return; 1779 or return;
1664 1780
1665 my @paths; 1781 my @paths;
1666 1782
1667 for (@$files) { 1783 for (@$files) {
… …
1786 $self->deactivate_recursive; 1902 $self->deactivate_recursive;
1787 1903
1788 return if UNIVERSAL::isa $self->map, "ext::map_link"; 1904 return if UNIVERSAL::isa $self->map, "ext::map_link";
1789 1905
1790 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 1906 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
1791 if $self->map; 1907 if $self->map && $self->map->{path} ne "{link}";
1792 1908
1793 $self->enter_map ($LINK_MAP || link_map, 10, 10); 1909 $self->enter_map ($LINK_MAP || link_map, 10, 10);
1794} 1910}
1795 1911
1796sub cf::object::player::leave_link { 1912sub cf::object::player::leave_link {
1797 my ($self, $map, $x, $y) = @_; 1913 my ($self, $map, $x, $y) = @_;
1914
1915 return unless $self->contr->active;
1798 1916
1799 my $link_pos = delete $self->{_link_pos}; 1917 my $link_pos = delete $self->{_link_pos};
1800 1918
1801 unless ($map) { 1919 unless ($map) {
1802 # restore original map position 1920 # restore original map position
… …
1825 1943
1826 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 1944 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
1827 $self->enter_map ($map, $x, $y); 1945 $self->enter_map ($map, $x, $y);
1828} 1946}
1829 1947
1830cf::player->attach (
1831 on_logout => sub {
1832 my ($pl) = @_;
1833
1834 # abort map switching before logout
1835 if ($pl->ob->{_link_pos}) {
1836 cf::sync_job {
1837 $pl->ob->leave_link
1838 };
1839 }
1840 },
1841 on_login => sub {
1842 my ($pl) = @_;
1843
1844 # try to abort aborted map switching on player login :)
1845 # should happen only on crashes
1846 if ($pl->ob->{_link_pos}) {
1847 $pl->ob->enter_link;
1848 (async {
1849 $pl->ob->reply (undef,
1850 "There was an internal problem at your last logout, "
1851 . "the server will try to bring you to your intended destination in a second.",
1852 cf::NDI_RED);
1853 # we need this sleep as the login has a concurrent enter_exit running
1854 # and this sleep increases chances of the player not ending up in scorn
1855 Coro::Timer::sleep 1;
1856 $pl->ob->leave_link;
1857 })->prio (2);
1858 }
1859 },
1860);
1861
1862=item $player_object->goto ($path, $x, $y) 1948=item $player_object->goto ($path, $x, $y[, $check->($map)])
1863 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
1864=cut 1955=cut
1956
1957our $GOTOGEN;
1865 1958
1866sub cf::object::player::goto { 1959sub cf::object::player::goto {
1867 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;
1868 1964
1869 $self->enter_link; 1965 $self->enter_link;
1870 1966
1871 (async { 1967 (async {
1872 my $map = eval { 1968 my $map = eval {
1873 my $map = cf::map::find $path; 1969 my $map = cf::map::find $path;
1970
1971 if ($map) {
1874 $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
1875 $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 $@;
1876 } or 1984 }
1877 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED);
1878 1985
1986 if ($gen == $self->{_goto_generation}) {
1987 delete $self->{_goto_generation};
1879 $self->leave_link ($map, $x, $y); 1988 $self->leave_link ($map, $x, $y);
1989 }
1880 })->prio (1); 1990 })->prio (1);
1881} 1991}
1882 1992
1883=item $player_object->enter_exit ($exit_object) 1993=item $player_object->enter_exit ($exit_object)
1884 1994
… …
1923 2033
1924 $rmp->{random_seed} ||= $exit->random_seed; 2034 $rmp->{random_seed} ||= $exit->random_seed;
1925 2035
1926 my $data = cf::to_json $rmp; 2036 my $data = cf::to_json $rmp;
1927 my $md5 = Digest::MD5::md5_hex $data; 2037 my $md5 = Digest::MD5::md5_hex $data;
1928 my $meta = "$cf::RANDOM_MAPS/$md5.meta"; 2038 my $meta = "$RANDOMDIR/$md5.meta";
1929 2039
1930 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2040 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
1931 aio_write $fh, 0, (length $data), $data, 0; 2041 aio_write $fh, 0, (length $data), $data, 0;
1932 undef $fh; 2042 undef $fh;
1933 aio_rename "$meta~", $meta; 2043 aio_rename "$meta~", $meta;
… …
1942 2052
1943 return unless $self->type == cf::PLAYER; 2053 return unless $self->type == cf::PLAYER;
1944 2054
1945 if ($exit->slaying eq "/!") { 2055 if ($exit->slaying eq "/!") {
1946 #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
1947 cf::sync_job { prepare_random_map $exit }; 2059 cf::sync_job { prepare_random_map $exit };
1948 } 2060 }
1949 2061
1950 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;
1951 my $hp = $exit->stats->hp; 2063 my $hp = $exit->stats->hp;
… …
1959 $self->goto ($slaying, $hp, $sp); 2071 $self->goto ($slaying, $hp, $sp);
1960 2072
1961 1; 2073 1;
1962 }) { 2074 }) {
1963 $self->message ("Something went wrong deep within the crossfire server. " 2075 $self->message ("Something went wrong deep within the crossfire server. "
1964 . "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. "
1965 . "Please report this to the dungeon master!", 2077 . "Please report this to the dungeon master!",
1966 cf::NDI_UNIQUE | cf::NDI_RED); 2078 cf::NDI_UNIQUE | cf::NDI_RED);
1967 2079
1968 warn "ERROR in enter_exit: $@"; 2080 warn "ERROR in enter_exit: $@";
1969 $self->leave_link; 2081 $self->leave_link;
1970 } 2082 }
1971 })->prio (1); 2083 })->prio (1);
… …
1987 2099
1988 utf8::encode $text; 2100 utf8::encode $text;
1989 $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);
1990} 2102}
1991 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}
1992 2116
1993=item $success = $client->query ($flags, "text", \&cb) 2117=item $success = $client->query ($flags, "text", \&cb)
1994 2118
1995Queues a query to the client, calling the given callback with 2119Queues a query to the client, calling the given callback with
1996the 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>,
… …
2188############################################################################# 2312#############################################################################
2189 2313
2190=head2 EXTENSION DATABASE SUPPORT 2314=head2 EXTENSION DATABASE SUPPORT
2191 2315
2192Crossfire maintains a very simple database for extension use. It can 2316Crossfire maintains a very simple database for extension use. It can
2193currently store anything that can be serialised using Storable, which 2317currently store binary data only (use Compress::LZF::sfreeze_cr/sthaw to
2194excludes objects. 2318convert to/from binary).
2195 2319
2196The 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
2197using it, it should be unique. 2321using it, it should be unique.
2198 2322
2199=over 4 2323=over 4
… …
2222 BDB::CREATE | BDB::AUTO_COMMIT, 0666; 2346 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
2223 cf::cleanup "db_open(db): $!" if $!; 2347 cf::cleanup "db_open(db): $!" if $!;
2224 }; 2348 };
2225 cf::cleanup "db_open(db): $@" if $@; 2349 cf::cleanup "db_open(db): $@" if $@;
2226 }; 2350 };
2227
2228 my $path = cf::localdir . "/database.pst";
2229 if (stat $path) {
2230 cf::sync_job {
2231 my $pst = Storable::retrieve $path;
2232
2233 cf::db_put (board => data => $pst->{board});
2234 cf::db_put (guildrules => data => $pst->{guildrules});
2235 cf::db_put (rent => balance => $pst->{rent}{balance});
2236 BDB::db_env_txn_checkpoint $DB_ENV;
2237
2238 unlink $path;
2239 };
2240 }
2241 } 2351 }
2242} 2352}
2243 2353
2244sub db_get($$) { 2354sub db_get($$) {
2245 my $key = "$_[0]/$_[1]"; 2355 my $key = "$_[0]/$_[1]";
2246 2356
2247 cf::sync_job { 2357 cf::sync_job {
2248 BDB::db_get $DB, undef, $key, my $data; 2358 BDB::db_get $DB, undef, $key, my $data;
2249 2359
2250 $! ? () 2360 $! ? ()
2251 : Compress::LZF::sthaw $data 2361 : $data
2252 } 2362 }
2253} 2363}
2254 2364
2255sub db_put($$$) { 2365sub db_put($$$) {
2256 BDB::dbreq_pri 4; 2366 BDB::dbreq_pri 4;
2257 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 }
2258} 2482}
2259 2483
2260############################################################################# 2484#############################################################################
2261# the server's init and main functions 2485# the server's init and main functions
2262 2486
2263sub load_faces { 2487sub load_facedata($) {
2264 my $path = sprintf "%s/faces", cf::datadir; 2488 my ($path) = @_;
2265 2489
2266 warn "loading faces from $path\n"; 2490 warn "loading facedata from $path\n";
2267 2491
2268 my $faces; 2492 my $facedata;
2269 0 < aio_load $path, $faces 2493 0 < aio_load $path, $facedata
2270 or die "$path: $!"; 2494 or die "$path: $!";
2271 2495
2272 Coro::cede;
2273 $faces = Storable::thaw $faces; 2496 $facedata = Coro::Storable::thaw $facedata;
2274 Coro::cede;
2275 2497
2276 my $meta = delete $faces->{""};
2277 $meta->{version} == 1 2498 $facedata->{version} == 2
2278 or cf::cleanup "$path: version mismatch, cannot proceed."; 2499 or cf::cleanup "$path: version mismatch, cannot proceed.";
2279 2500
2501 {
2502 my $faces = $facedata->{faceinfo};
2503
2280 while (my ($face, $info) = each %$faces) { 2504 while (my ($face, $info) = each %$faces) {
2281 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#
2282 cf::face::set $idx, $info->{visibility}, $info->{magicmap}; 2507 cf::face::set $idx, $info->{visibility}, $info->{magicmap};
2283 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 2508 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32};
2509 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64};
2284 Coro::cede; 2510 Coro::cede;
2285 } 2511 }
2286 2512
2287 while (my ($face, $info) = each %$faces) { 2513 while (my ($face, $info) = each %$faces) {
2288 next unless $info->{smooth}; 2514 next unless $info->{smooth};
2289 my $idx = cf::face::find $face 2515 my $idx = cf::face::find $face
2290 or next; 2516 or next;
2291 if (my $smooth = cf::face::find $info->{smooth}) { 2517 if (my $smooth = cf::face::find $info->{smooth}) {
2292 cf::face::set_smooth $idx, $smooth; 2518 cf::face::set_smooth $idx, $smooth, $info->{smoothlevel};
2293 } else { 2519 } else {
2294 warn "smooth face '$info->{smooth}' not found for face '$face'"; 2520 warn "smooth face '$info->{smooth}' not found for face '$face'";
2295 } 2521 }
2296 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
2297 } 2535 }
2298 2536
2299 1 2537 1
2300} 2538}
2301 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
2302sub reload_resources { 2560sub reload_resources {
2303 load_resource_file sprintf "%s/%s/regions", cf::datadir, cf::mapdir 2561 warn "reloading resource files...\n";
2304 or die "unable to load regions file\n";#d# 2562
2563 reload_regions;
2305 load_faces 2564 reload_facedata;
2306 or die "unable to load faces\n";#d# 2565 reload_archetypes;
2566 reload_treasures;
2567
2568 warn "finished reloading resource files\n";
2307} 2569}
2308 2570
2309sub init { 2571sub init {
2310 reload_resources; 2572 reload_resources;
2311} 2573}
2312 2574
2313sub cfg_load { 2575sub cfg_load {
2314 open my $fh, "<:utf8", cf::confdir . "/config" 2576 open my $fh, "<:utf8", "$CONFDIR/config"
2315 or return; 2577 or return;
2316 2578
2317 local $/; 2579 local $/;
2318 *CFG = YAML::Syck::Load <$fh>; 2580 *CFG = YAML::Syck::Load <$fh>;
2319 2581
… …
2404 2666
2405 warn Carp::longmess "post_cleanup backtrace" 2667 warn Carp::longmess "post_cleanup backtrace"
2406 if $make_core; 2668 if $make_core;
2407} 2669}
2408 2670
2409sub reload() { 2671sub do_reload_perl() {
2410 # can/must only be called in main 2672 # can/must only be called in main
2411 if ($Coro::current != $Coro::main) { 2673 if ($Coro::current != $Coro::main) {
2412 warn "can only reload from main coroutine"; 2674 warn "can only reload from main coroutine";
2413 return; 2675 return;
2414 } 2676 }
… …
2489 Symbol::delete_package "safe::$_" 2751 Symbol::delete_package "safe::$_"
2490 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);
2491 2753
2492 warn "unloading cf.pm \"a bit\""; 2754 warn "unloading cf.pm \"a bit\"";
2493 delete $INC{"cf.pm"}; 2755 delete $INC{"cf.pm"};
2756 delete $INC{"cf/pod.pm"};
2494 2757
2495 # don't, removes xs symbols, too, 2758 # don't, removes xs symbols, too,
2496 # and global variables created in xs 2759 # and global variables created in xs
2497 #Symbol::delete_package __PACKAGE__; 2760 #Symbol::delete_package __PACKAGE__;
2498 2761
… …
2513 warn "reattaching attachments to maps"; 2776 warn "reattaching attachments to maps";
2514 reattach $_ for values %MAP; 2777 reattach $_ for values %MAP;
2515 warn "reattaching attachments to players"; 2778 warn "reattaching attachments to players";
2516 reattach $_ for values %PLAYER; 2779 reattach $_ for values %PLAYER;
2517 2780
2518 warn "loading reloadable resources";
2519 reload_resources;
2520
2521 warn "leaving sync_job"; 2781 warn "leaving sync_job";
2522 2782
2523 1 2783 1
2524 } or do { 2784 } or do {
2525 warn $@; 2785 warn $@;
… …
2530 warn "reloaded"; 2790 warn "reloaded";
2531}; 2791};
2532 2792
2533our $RELOAD_WATCHER; # used only during reload 2793our $RELOAD_WATCHER; # used only during reload
2534 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
2535register_command "reload" => sub { 2810register_command "reload" => sub {
2536 my ($who, $arg) = @_; 2811 my ($who, $arg) = @_;
2537 2812
2538 if ($who->flag (FLAG_WIZ)) { 2813 if ($who->flag (FLAG_WIZ)) {
2539 $who->message ("reloading server."); 2814 $who->message ("reloading server.");
2540 2815 async { reload_perl };
2541 # doing reload synchronously and two reloads happen back-to-back,
2542 # coro crashes during coro_state_free->destroy here.
2543
2544 $RELOAD_WATCHER ||= Event->timer (
2545 reentrant => 0,
2546 after => 0,
2547 data => WF_AUTOCANCEL,
2548 cb => sub {
2549 reload;
2550 undef $RELOAD_WATCHER;
2551 },
2552 );
2553 } 2816 }
2554}; 2817};
2555 2818
2556unshift @INC, $LIBDIR; 2819unshift @INC, $LIBDIR;
2557 2820
2558my $bug_warning = 0; 2821my $bug_warning = 0;
2559 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;
2560$TICK_WATCHER = Event->timer ( 2846$TICK_WATCHER = Event->timer (
2561 reentrant => 0, 2847 reentrant => 0,
2562 parked => 1, 2848 parked => 1,
2563 prio => 0, 2849 prio => 0,
2564 at => $NEXT_TICK || $TICK, 2850 at => $NEXT_TICK || $TICK,
… …
2568 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"
2569 unless ++$bug_warning > 10; 2855 unless ++$bug_warning > 10;
2570 return; 2856 return;
2571 } 2857 }
2572 2858
2573 $NOW = Event::time; 2859 $NOW = $tick_start = Event::time;
2574 2860
2575 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
2576 $RUNTIME += $TICK; 2886 $RUNTIME += $TICK;
2577 $NEXT_TICK += $TICK; 2887 $NEXT_TICK += $TICK;
2578 2888
2579 if ($NOW >= $NEXT_RUNTIME_WRITE) { 2889 if ($NOW >= $NEXT_RUNTIME_WRITE) {
2580 $NEXT_RUNTIME_WRITE = $NOW + 10; 2890 $NEXT_RUNTIME_WRITE = $NOW + 10;
… …
2582 write_runtime 2892 write_runtime
2583 or warn "ERROR: unable to write runtime file: $!"; 2893 or warn "ERROR: unable to write runtime file: $!";
2584 }; 2894 };
2585 } 2895 }
2586 2896
2587 $WAIT_FOR_TICK->broadcast;
2588 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited;
2589
2590# my $AFTER = Event::time; 2897# my $AFTER = Event::time;
2591# warn $AFTER - $NOW;#d# 2898# warn $AFTER - $NOW;#d#
2592 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
2593 # 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
2594 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; 2910 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
2595 2911
2596 $TICK_WATCHER->at ($NEXT_TICK); 2912 $TICK_WATCHER->at ($NEXT_TICK);
2597 $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
2598 }, 2921 },
2599); 2922);
2600 2923
2601{ 2924{
2602 BDB::max_poll_time $TICK * 0.1; 2925 BDB::max_poll_time $TICK * 0.1;
… …
2630 2953
2631 cf::sync_job { 2954 cf::sync_job {
2632 eval { 2955 eval {
2633 BDB::db_env_open 2956 BDB::db_env_open
2634 $DB_ENV, 2957 $DB_ENV,
2635 $BDB_ENV_DIR, 2958 $BDBDIR,
2636 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
2637 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 2960 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
2638 0666; 2961 0666;
2639 2962
2640 cf::cleanup "db_env_open($BDB_ENV_DIR): $!" if $!; 2963 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
2641 2964
2642 $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);
2643 $DB_ENV->set_lk_detect; 2966 $DB_ENV->set_lk_detect;
2644 }; 2967 };
2645 2968
… …
2661 prio => 6, 2984 prio => 6,
2662 cb => \&IO::AIO::poll_cb, 2985 cb => \&IO::AIO::poll_cb,
2663 ); 2986 );
2664} 2987}
2665 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
2666END { cf::emergency_save } 3030END { cf::emergency_save }
2667 3031
26681 30321
2669 3033

Diff Legend

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