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.167 by root, Sat Jan 13 23:32:43 2007 UTC vs.
Revision 1.353 by root, Sun Sep 2 08:43:46 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;
10use Event;
9use Opcode; 11use Opcode;
10use Safe; 12use Safe;
11use Safe::Hole; 13use Safe::Hole;
12 14
13use Coro 3.3 (); 15use Coro 3.64 ();
16use Coro::State;
17use Coro::Handle;
14use Coro::Event; 18use Coro::Event;
15use Coro::Timer; 19use Coro::Timer;
16use Coro::Signal; 20use Coro::Signal;
17use Coro::Semaphore; 21use Coro::Semaphore;
18use Coro::AIO; 22use Coro::AIO;
23use Coro::Storable;
24use Coro::Util ();
19 25
26use JSON::XS ();
27use BDB ();
20use Data::Dumper; 28use Data::Dumper;
21use Digest::MD5; 29use Digest::MD5;
22use Fcntl; 30use Fcntl;
31use YAML::Syck ();
23use IO::AIO 2.32 (); 32use IO::AIO 2.32 ();
24use YAML::Syck ();
25use Time::HiRes; 33use Time::HiRes;
34use Compress::LZF;
35use Digest::MD5 ();
26 36
37# configure various modules to our taste
38#
39$Storable::canonical = 1; # reduce rsync transfers
40Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
41Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
42
27use Event; $Event::Eval = 1; # no idea why this is required, but it is 43$Event::Eval = 1; # no idea why this is required, but it is
28
29sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
30 44
31# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode? 45# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?
32$YAML::Syck::ImplicitUnicode = 1; 46$YAML::Syck::ImplicitUnicode = 1;
33 47
34$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority 48$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
35 49
50sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
51
36our %COMMAND = (); 52our %COMMAND = ();
37our %COMMAND_TIME = (); 53our %COMMAND_TIME = ();
38 54
39our @EXTS = (); # list of extension package names 55our @EXTS = (); # list of extension package names
40our %EXTCMD = (); 56our %EXTCMD = ();
57our %EXTICMD = ();
41our %EXT_CORO = (); # coroutines bound to extensions 58our %EXT_CORO = (); # coroutines bound to extensions
42our %EXT_MAP = (); # pluggable maps 59our %EXT_MAP = (); # pluggable maps
43 60
61our $RELOAD; # number of reloads so far
44our @EVENT; 62our @EVENT;
45our $LIBDIR = datadir . "/ext";
46 63
47our $TICK = MAX_TIME * 1e-6; 64our $CONFDIR = confdir;
65our $DATADIR = datadir;
66our $LIBDIR = "$DATADIR/ext";
67our $PODDIR = "$DATADIR/pod";
68our $MAPDIR = "$DATADIR/" . mapdir;
69our $LOCALDIR = localdir;
70our $TMPDIR = "$LOCALDIR/" . tmpdir;
71our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
72our $PLAYERDIR = "$LOCALDIR/" . playerdir;
73our $RANDOMDIR = "$LOCALDIR/random";
74our $BDBDIR = "$LOCALDIR/db";
75
76our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
48our $TICK_WATCHER; 77our $TICK_WATCHER;
78our $AIO_POLL_WATCHER;
79our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
49our $NEXT_TICK; 80our $NEXT_TICK;
50our $NOW; 81our $NOW;
82our $USE_FSYNC = 1; # use fsync to write maps - default off
83
84our $BDB_POLL_WATCHER;
85our $DB_ENV;
51 86
52our %CFG; 87our %CFG;
53 88
54our $UPTIME; $UPTIME ||= time; 89our $UPTIME; $UPTIME ||= time;
55our $RUNTIME; 90our $RUNTIME;
56 91
57our %PLAYER; # all users 92our %PLAYER; # all users
58our %MAP; # all maps 93our %MAP; # all maps
59our $LINK_MAP; # the special {link} map, which is always available 94our $LINK_MAP; # the special {link} map, which is always available
60our $RANDOM_MAPS = cf::localdir . "/random";
61
62our $WAIT_FOR_TICK; $WAIT_FOR_TICK ||= new Coro::Signal;
63our $WAIT_FOR_TICK_ONE; $WAIT_FOR_TICK_ONE ||= new Coro::Signal;
64 95
65# used to convert map paths into valid unix filenames by replacing / by ∕ 96# used to convert map paths into valid unix filenames by replacing / by ∕
66our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 97our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
67 98
99our $LOAD; # a number between 0 (idle) and 1 (too many objects)
100our $LOADAVG; # same thing, but with alpha-smoothing
101our $tick_start; # for load detecting purposes
102
68binmode STDOUT; 103binmode STDOUT;
69binmode STDERR; 104binmode STDERR;
70 105
71# read virtual server time, if available 106# read virtual server time, if available
72unless ($RUNTIME || !-e cf::localdir . "/runtime") { 107unless ($RUNTIME || !-e "$LOCALDIR/runtime") {
73 open my $fh, "<", cf::localdir . "/runtime" 108 open my $fh, "<", "$LOCALDIR/runtime"
74 or die "unable to read runtime file: $!"; 109 or die "unable to read runtime file: $!";
75 $RUNTIME = <$fh> + 0.; 110 $RUNTIME = <$fh> + 0.;
76} 111}
77 112
78mkdir cf::localdir; 113mkdir $_
79mkdir cf::localdir . "/" . cf::playerdir; 114 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
80mkdir cf::localdir . "/" . cf::tmpdir;
81mkdir cf::localdir . "/" . cf::uniquedir;
82mkdir $RANDOM_MAPS;
83 115
84our $EMERGENCY_POSITION; 116our $EMERGENCY_POSITION;
117
118sub cf::map::normalise;
85 119
86############################################################################# 120#############################################################################
87 121
88=head2 GLOBAL VARIABLES 122=head2 GLOBAL VARIABLES
89 123
… …
96=item $cf::RUNTIME 130=item $cf::RUNTIME
97 131
98The time this server has run, starts at 0 and is increased by $cf::TICK on 132The time this server has run, starts at 0 and is increased by $cf::TICK on
99every server tick. 133every server tick.
100 134
101=item $cf::LIBDIR 135=item $cf::CONFDIR $cf::DATADIR $cf::LIBDIR $cf::PODDIR
136$cf::MAPDIR $cf::LOCALDIR $cf::TMPDIR $cf::UNIQUEDIR
137$cf::PLAYERDIR $cf::RANDOMDIR $cf::BDBDIR
102 138
103The perl library directory, where extensions and cf-specific modules can 139Various directories - "/etc", read-only install directory, perl-library
104be found. It will be added to C<@INC> automatically. 140directory, pod-directory, read-only maps directory, "/var", "/var/tmp",
141unique-items directory, player file directory, random maps directory and
142database environment.
105 143
106=item $cf::NOW 144=item $cf::NOW
107 145
108The time of the last (current) server tick. 146The time of the last (current) server tick.
109 147
110=item $cf::TICK 148=item $cf::TICK
111 149
112The interval between server ticks, in seconds. 150The interval between server ticks, in seconds.
151
152=item $cf::LOADAVG
153
154The current CPU load on the server (alpha-smoothed), as a value between 0
155(none) and 1 (overloaded), indicating how much time is spent on processing
156objects per tick. Healthy values are < 0.5.
157
158=item $cf::LOAD
159
160The raw value load value from the last tick.
113 161
114=item %cf::CFG 162=item %cf::CFG
115 163
116Configuration for the server, loaded from C</etc/crossfire/config>, or 164Configuration for the server, loaded from C</etc/crossfire/config>, or
117from wherever your confdir points to. 165from wherever your confdir points to.
118 166
119=item $cf::WAIT_FOR_TICK, $cf::WAIT_FOR_TICK_ONE 167=item cf::wait_for_tick, cf::wait_for_tick_begin
120 168
121These are Coro::Signal objects that are C<< ->broadcast >> (WAIT_FOR_TICK) 169These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
122or C<< ->send >> (WAIT_FOR_TICK_ONE) on after normal server tick 170returns directly I<after> the tick processing (and consequently, can only wake one process
123processing has been done. Call C<< ->wait >> on them to maximise the 171per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
124window of cpu time available, or simply to synchronise to the server tick. 172
173=item @cf::INVOKE_RESULTS
174
175This array contains the results of the last C<invoke ()> call. When
176C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
177that call.
125 178
126=back 179=back
127 180
128=cut 181=cut
129 182
130BEGIN { 183BEGIN {
131 *CORE::GLOBAL::warn = sub { 184 *CORE::GLOBAL::warn = sub {
132 my $msg = join "", @_; 185 my $msg = join "", @_;
133 utf8::encode $msg;
134 186
135 $msg .= "\n" 187 $msg .= "\n"
136 unless $msg =~ /\n$/; 188 unless $msg =~ /\n$/;
137 189
190 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
191
192 utf8::encode $msg;
138 LOG llevError, $msg; 193 LOG llevError, $msg;
139 }; 194 };
140} 195}
141 196
142@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 197@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
143@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 198@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
144@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 199@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
145@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 200@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
146@safe::cf::map::ISA = @cf::map::ISA = 'cf::attachable'; 201@safe::cf::map::ISA = @cf::map::ISA = 'cf::attachable';
202@safe::cf::arch::ISA = @cf::arch::ISA = 'cf::object';
147@safe::cf::object::player::ISA = @cf::object::player::ISA = 'cf::object'; 203@safe::cf::object::player::ISA = @cf::object::player::ISA = 'cf::object'; # not really true (yet)
148 204
149# we bless all objects into (empty) derived classes to force a method lookup 205# we bless all objects into (empty) derived classes to force a method lookup
150# within the Safe compartment. 206# within the Safe compartment.
151for my $pkg (qw( 207for my $pkg (qw(
152 cf::global cf::attachable 208 cf::global cf::attachable
… …
160} 216}
161 217
162$Event::DIED = sub { 218$Event::DIED = sub {
163 warn "error in event callback: @_"; 219 warn "error in event callback: @_";
164}; 220};
221
222#############################################################################
165 223
166=head2 UTILITY FUNCTIONS 224=head2 UTILITY FUNCTIONS
167 225
168=over 4 226=over 4
169 227
… …
188 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 246 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
189 $d 247 $d
190 } || "[unable to dump $_[0]: '$@']"; 248 } || "[unable to dump $_[0]: '$@']";
191} 249}
192 250
193use JSON::Syck (); # TODO# replace by JSON::PC once working
194
195=item $ref = cf::from_json $json 251=item $ref = cf::from_json $json
196 252
197Converts a JSON string into the corresponding perl data structure. 253Converts a JSON string into the corresponding perl data structure.
198 254
199=cut
200
201sub from_json($) {
202 $JSON::Syck::ImplicitUnicode = 1; # work around JSON::Syck bugs
203 JSON::Syck::Load $_[0]
204}
205
206=item $json = cf::to_json $ref 255=item $json = cf::to_json $ref
207 256
208Converts a perl data structure into its JSON representation. 257Converts a perl data structure into its JSON representation.
209 258
210=cut 259=cut
211 260
212sub to_json($) { 261our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
213 $JSON::Syck::ImplicitUnicode = 0; # work around JSON::Syck bugs 262
214 JSON::Syck::Dump $_[0] 263sub to_json ($) { $json_coder->encode ($_[0]) }
215} 264sub from_json ($) { $json_coder->decode ($_[0]) }
216 265
217=item cf::lock_wait $string 266=item cf::lock_wait $string
218 267
219Wait until the given lock is available. See cf::lock_acquire. 268Wait until the given lock is available. See cf::lock_acquire.
220 269
… …
223Wait until the given lock is available and then acquires it and returns 272Wait until the given lock is available and then acquires it and returns
224a Coro::guard object. If the guard object gets destroyed (goes out of scope, 273a Coro::guard object. If the guard object gets destroyed (goes out of scope,
225for example when the coroutine gets canceled), the lock is automatically 274for example when the coroutine gets canceled), the lock is automatically
226returned. 275returned.
227 276
277Locks are *not* recursive, locking from the same coro twice results in a
278deadlocked coro.
279
228Lock names should begin with a unique identifier (for example, cf::map::find 280Lock names should begin with a unique identifier (for example, cf::map::find
229uses map_find and cf::map::load uses map_load). 281uses map_find and cf::map::load uses map_load).
282
283=item $locked = cf::lock_active $string
284
285Return true if the lock is currently active, i.e. somebody has locked it.
230 286
231=cut 287=cut
232 288
233our %LOCK; 289our %LOCK;
234 290
… …
254 # wake up all waiters, to be on the safe side 310 # wake up all waiters, to be on the safe side
255 $_->ready for @{ delete $LOCK{$key} }; 311 $_->ready for @{ delete $LOCK{$key} };
256 } 312 }
257} 313}
258 314
315sub lock_active($) {
316 my ($key) = @_;
317
318 ! ! $LOCK{$key}
319}
320
259sub freeze_mainloop { 321sub freeze_mainloop {
260 return unless $TICK_WATCHER->is_active; 322 return unless $TICK_WATCHER->is_active;
261 323
262 my $guard = Coro::guard { $TICK_WATCHER->start }; 324 my $guard = Coro::guard {
325 $TICK_WATCHER->start;
326 };
263 $TICK_WATCHER->stop; 327 $TICK_WATCHER->stop;
264 $guard 328 $guard
329}
330
331=item cf::get_slot $time[, $priority[, $name]]
332
333Allocate $time seconds of blocking CPU time at priority C<$priority>:
334This call blocks and returns only when you have at least C<$time> seconds
335of cpu time till the next tick. The slot is only valid till the next cede.
336
337The optional C<$name> can be used to identify the job to run. It might be
338used for statistical purposes and should identify the same time-class.
339
340Useful for short background jobs.
341
342=cut
343
344our @SLOT_QUEUE;
345our $SLOT_QUEUE;
346
347$SLOT_QUEUE->cancel if $SLOT_QUEUE;
348$SLOT_QUEUE = Coro::async {
349 my $signal = new Coro::Signal;
350
351 while () {
352 next_job:
353 my $avail = cf::till_tick;
354 if ($avail > 0.01) {
355 for (0 .. $#SLOT_QUEUE) {
356 if ($SLOT_QUEUE[$_][0] < $avail) {
357 my $job = splice @SLOT_QUEUE, $_, 1, ();
358 $job->[2]->send;
359 Coro::cede;
360 goto next_job;
361 }
362 }
363 }
364
365 if (@SLOT_QUEUE) {
366 # we do not use wait_For_tick() as it returns immediately when tick is inactive
367 push @cf::WAIT_FOR_TICK, $signal;
368 $signal->wait;
369 } else {
370 Coro::schedule;
371 }
372 }
373};
374
375sub get_slot($;$$) {
376 my ($time, $pri, $name) = @_;
377
378 $time = $TICK * .6 if $time > $TICK * .6;
379 my $sig = new Coro::Signal;
380
381 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
382 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
383 $SLOT_QUEUE->ready;
384 $sig->wait;
265} 385}
266 386
267=item cf::async { BLOCK } 387=item cf::async { BLOCK }
268 388
269Currently the same as Coro::async_pool, meaning you cannot use 389Currently the same as Coro::async_pool, meaning you cannot use
… …
274 394
275BEGIN { *async = \&Coro::async_pool } 395BEGIN { *async = \&Coro::async_pool }
276 396
277=item cf::sync_job { BLOCK } 397=item cf::sync_job { BLOCK }
278 398
279The design of crossfire+ requires that the main coro ($Coro::main) is 399The design of Crossfire TRT requires that the main coroutine ($Coro::main)
280always able to handle events or runnable, as crossfire+ is only partly 400is always able to handle events or runnable, as Crossfire TRT is only
281reentrant. Thus "blocking" it by e.g. waiting for I/O is not acceptable. 401partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not
402acceptable.
282 403
283If it must be done, put the blocking parts into C<sync_job>. This will run 404If it must be done, put the blocking parts into C<sync_job>. This will run
284the given BLOCK in another coroutine while waiting for the result. The 405the given BLOCK in another coroutine while waiting for the result. The
285server will be frozen during this time, so the block should either finish 406server will be frozen during this time, so the block should either finish
286fast or be very important. 407fast or be very important.
… …
289 410
290sub sync_job(&) { 411sub sync_job(&) {
291 my ($job) = @_; 412 my ($job) = @_;
292 413
293 if ($Coro::current == $Coro::main) { 414 if ($Coro::current == $Coro::main) {
415 my $time = Event::time;
416
294 # this is the main coro, too bad, we have to block 417 # this is the main coro, too bad, we have to block
295 # till the operation succeeds, freezing the server :/ 418 # till the operation succeeds, freezing the server :/
296 419
297 # TODO: use suspend/resume instead 420 # TODO: use suspend/resume instead
298 # (but this is cancel-safe) 421 # (but this is cancel-safe)
… …
309 432
310 while ($busy) { 433 while ($busy) {
311 Coro::cede or Event::one_event; 434 Coro::cede or Event::one_event;
312 } 435 }
313 436
437 $time = Event::time - $time;
438
439 LOG llevError | logBacktrace, Carp::longmess "long sync job"
440 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
441
442 $tick_start += $time; # do not account sync jobs to server load
443
314 wantarray ? @res : $res[0] 444 wantarray ? @res : $res[0]
315 } else { 445 } else {
316 # we are in another coroutine, how wonderful, everything just works 446 # we are in another coroutine, how wonderful, everything just works
317 447
318 $job->() 448 $job->()
… …
337 $EXT_CORO{$coro+0} = $coro; 467 $EXT_CORO{$coro+0} = $coro;
338 468
339 $coro 469 $coro
340} 470}
341 471
342sub write_runtime { 472=item fork_call { }, $args
343 return unless $TICK_WATCHER->is_active;
344 473
345 my $runtime = cf::localdir . "/runtime"; 474Executes the given code block with the given arguments in a seperate
475process, returning the results. Everything must be serialisable with
476Coro::Storable. May, of course, block. Note that the executed sub may
477never block itself or use any form of Event handling.
346 478
347 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 479=cut
348 or return;
349 480
350 my $value = $cf::RUNTIME + 1 + 10; # 10 is the runtime save interval, for a monotonic clock 481sub fork_call(&@) {
351 (aio_write $fh, 0, (length $value), $value, 0) <= 0 482 my ($cb, @args) = @_;
352 and return;
353 483
354 aio_fsync $fh 484 # we seemingly have to make a local copy of the whole thing,
355 and return; 485 # otherwise perl prematurely frees the stuff :/
486 # TODO: investigate and fix (liekly this will be rather laborious)
356 487
357 close $fh 488 my @res = Coro::Util::fork_eval {
358 or return; 489 reset_signals;
490 &$cb
491 }, @args;
359 492
360 aio_rename "$runtime~", $runtime 493 wantarray ? @res : $res[-1]
361 and return; 494}
362 495
496=item $value = cf::db_get $family => $key
497
498Returns a single value from the environment database.
499
500=item cf::db_put $family => $key => $value
501
502Stores the given C<$value> in the family. It can currently store binary
503data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary).
504
505=cut
506
507our $DB;
508
509sub db_init {
510 unless ($DB) {
511 $DB = BDB::db_create $DB_ENV;
512
513 cf::sync_job {
514 eval {
515 $DB->set_flags (BDB::CHKSUM);
516
517 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
518 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
519 cf::cleanup "db_open(db): $!" if $!;
520 };
521 cf::cleanup "db_open(db): $@" if $@;
522 };
363 1 523 }
524}
525
526sub db_get($$) {
527 my $key = "$_[0]/$_[1]";
528
529 cf::sync_job {
530 BDB::db_get $DB, undef, $key, my $data;
531
532 $! ? ()
533 : $data
534 }
535}
536
537sub db_put($$$) {
538 BDB::dbreq_pri 4;
539 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
540}
541
542=item cf::cache $id => [$paths...], $processversion => $process
543
544Generic caching function that returns the value of the resource $id,
545caching and regenerating as required.
546
547This function can block.
548
549=cut
550
551sub cache {
552 my ($id, $src, $processversion, $process) = @_;
553
554 my $meta =
555 join "\x00",
556 $processversion,
557 map {
558 aio_stat $_
559 and Carp::croak "$_: $!";
560
561 ($_, (stat _)[7,9])
562 } @$src;
563
564 my $dbmeta = db_get cache => "$id/meta";
565 if ($dbmeta ne $meta) {
566 # changed, we may need to process
567
568 my @data;
569 my $md5;
570
571 for (0 .. $#$src) {
572 0 <= aio_load $src->[$_], $data[$_]
573 or Carp::croak "$src->[$_]: $!";
574 }
575
576 # if processing is expensive, check
577 # checksum first
578 if (1) {
579 $md5 =
580 join "\x00",
581 $processversion,
582 map {
583 cf::cede_to_tick;
584 ($src->[$_], Digest::MD5::md5_hex $data[$_])
585 } 0.. $#$src;
586
587
588 my $dbmd5 = db_get cache => "$id/md5";
589 if ($dbmd5 eq $md5) {
590 db_put cache => "$id/meta", $meta;
591
592 return db_get cache => "$id/data";
593 }
594 }
595
596 my $t1 = Time::HiRes::time;
597 my $data = $process->(\@data);
598 my $t2 = Time::HiRes::time;
599
600 warn "cache: '$id' processed in ", $t2 - $t1, "s\n";
601
602 db_put cache => "$id/data", $data;
603 db_put cache => "$id/md5" , $md5;
604 db_put cache => "$id/meta", $meta;
605
606 return $data;
607 }
608
609 db_get cache => "$id/data"
610}
611
612=item cf::datalog type => key => value, ...
613
614Log a datalog packet of the given type with the given key-value pairs.
615
616=cut
617
618sub datalog($@) {
619 my ($type, %kv) = @_;
620 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
364} 621}
365 622
366=back 623=back
367 624
368=cut 625=cut
… …
375attach callbacks/event handlers (a collection of which is called an "attachment") 632attach callbacks/event handlers (a collection of which is called an "attachment")
376to it. All such attachable objects support the following methods. 633to it. All such attachable objects support the following methods.
377 634
378In the following description, CLASS can be any of C<global>, C<object> 635In the following description, CLASS can be any of C<global>, C<object>
379C<player>, C<client> or C<map> (i.e. the attachable objects in 636C<player>, C<client> or C<map> (i.e. the attachable objects in
380crossfire+). 637Crossfire TRT).
381 638
382=over 4 639=over 4
383 640
384=item $attachable->attach ($attachment, key => $value...) 641=item $attachable->attach ($attachment, key => $value...)
385 642
… …
499our @CB_TYPE = (); # registry for type (cf-object class) based events 756our @CB_TYPE = (); # registry for type (cf-object class) based events
500our @CB_MAP = (); 757our @CB_MAP = ();
501 758
502my %attachment; 759my %attachment;
503 760
761sub cf::attachable::thawer_merge {
762 # simply override everything except _meta
763 local $_[0]{_meta};
764 %{$_[0]} = %{$_[1]};
765}
766
504sub _attach_cb($$$$) { 767sub _attach_cb($$$$) {
505 my ($registry, $event, $prio, $cb) = @_; 768 my ($registry, $event, $prio, $cb) = @_;
506 769
507 use sort 'stable'; 770 use sort 'stable';
508 771
… …
542 $registry = $CB_TYPE[$object_type] ||= []; 805 $registry = $CB_TYPE[$object_type] ||= [];
543 806
544 } elsif ($type eq "subtype") { 807 } elsif ($type eq "subtype") {
545 defined $object_type or Carp::croak "subtype specified without type"; 808 defined $object_type or Carp::croak "subtype specified without type";
546 my $object_subtype = shift @arg; 809 my $object_subtype = shift @arg;
547 $registry = $CB_TYPE[$object_type + $object_subtype * NUM_SUBTYPES] ||= []; 810 $registry = $CB_TYPE[$object_type + $object_subtype * NUM_TYPES] ||= [];
548 811
549 } elsif ($type eq "package") { 812 } elsif ($type eq "package") {
550 my $pkg = shift @arg; 813 my $pkg = shift @arg;
551 814
552 while (my ($name, $id) = each %cb_id) { 815 while (my ($name, $id) = each %cb_id) {
… …
581 _attach $registry, $klass, @attach; 844 _attach $registry, $klass, @attach;
582 } 845 }
583 846
584 $obj->{$name} = \%arg; 847 $obj->{$name} = \%arg;
585 } else { 848 } else {
586 warn "object uses attachment '$name' that is not available, postponing.\n"; 849 warn "object uses attachment '$name' which is not available, postponing.\n";
587 } 850 }
588 851
589 $obj->{_attachment}{$name} = undef; 852 $obj->{_attachment}{$name} = undef;
590} 853}
591 854
… …
593 if (ref $_[0]) { 856 if (ref $_[0]) {
594 _object_attach @_; 857 _object_attach @_;
595 } else { 858 } else {
596 _attach shift->_attach_registry, @_; 859 _attach shift->_attach_registry, @_;
597 } 860 }
861 _recalc_want;
598}; 862};
599 863
600# all those should be optimised 864# all those should be optimised
601sub cf::attachable::detach { 865sub cf::attachable::detach {
602 my ($obj, $name) = @_; 866 my ($obj, $name) = @_;
… …
605 delete $obj->{_attachment}{$name}; 869 delete $obj->{_attachment}{$name};
606 reattach ($obj); 870 reattach ($obj);
607 } else { 871 } else {
608 Carp::croak "cannot, currently, detach class attachments"; 872 Carp::croak "cannot, currently, detach class attachments";
609 } 873 }
874 _recalc_want;
610}; 875};
611 876
612sub cf::attachable::attached { 877sub cf::attachable::attached {
613 my ($obj, $name) = @_; 878 my ($obj, $name) = @_;
614 879
… …
629 "; 894 ";
630 die if $@; 895 die if $@;
631} 896}
632 897
633our $override; 898our $override;
634our @invoke_results = (); # referenced from .xs code. TODO: play tricks with reify and mortals? 899our @INVOKE_RESULTS = (); # referenced from .xs code. TODO: play tricks with reify and mortals?
635 900
636sub override { 901sub override {
637 $override = 1; 902 $override = 1;
638 @invoke_results = (); 903 @INVOKE_RESULTS = (@_);
639} 904}
640 905
641sub do_invoke { 906sub do_invoke {
642 my $event = shift; 907 my $event = shift;
643 my $callbacks = shift; 908 my $callbacks = shift;
644 909
645 @invoke_results = (); 910 @INVOKE_RESULTS = ();
646 911
647 local $override; 912 local $override;
648 913
649 for (@$callbacks) { 914 for (@$callbacks) {
650 eval { &{$_->[1]} }; 915 eval { &{$_->[1]} };
… …
667 932
668Generate an object-specific event with the given arguments. 933Generate an object-specific event with the given arguments.
669 934
670This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be 935This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be
671removed in future versions), and there is no public API to access override 936removed in future versions), and there is no public API to access override
672results (if you must, access C<@cf::invoke_results> directly). 937results (if you must, access C<@cf::INVOKE_RESULTS> directly).
673 938
674=back 939=back
675 940
676=cut 941=cut
677 942
678############################################################################# 943#############################################################################
679# object support 944# object support
945#
946
947sub _can_merge {
948 my ($ob1, $ob2) = @_;
949
950 local $Storable::canonical = 1;
951 my $fob1 = Storable::freeze $ob1;
952 my $fob2 = Storable::freeze $ob2;
953
954 $fob1 eq $fob2
955}
680 956
681sub reattach { 957sub reattach {
682 # basically do the same as instantiate, without calling instantiate 958 # basically do the same as instantiate, without calling instantiate
683 my ($obj) = @_; 959 my ($obj) = @_;
960
961 bless $obj, ref $obj; # re-bless in case extensions have been reloaded
684 962
685 my $registry = $obj->registry; 963 my $registry = $obj->registry;
686 964
687 @$registry = (); 965 @$registry = ();
688 966
… …
735 $filename, length $$rdata, scalar @$objs; 1013 $filename, length $$rdata, scalar @$objs;
736 1014
737 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1015 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
738 chmod SAVE_MODE, $fh; 1016 chmod SAVE_MODE, $fh;
739 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1017 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
740 aio_fsync $fh; 1018 aio_fsync $fh if $cf::USE_FSYNC;
741 close $fh; 1019 close $fh;
742 1020
743 if (@$objs) { 1021 if (@$objs) {
744 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1022 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
745 chmod SAVE_MODE, $fh; 1023 chmod SAVE_MODE, $fh;
746 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1024 my $data = Storable::nfreeze { version => 1, objs => $objs };
747 aio_write $fh, 0, (length $data), $data, 0; 1025 aio_write $fh, 0, (length $data), $data, 0;
748 aio_fsync $fh; 1026 aio_fsync $fh if $cf::USE_FSYNC;
749 close $fh; 1027 close $fh;
750 aio_rename "$filename.pst~", "$filename.pst"; 1028 aio_rename "$filename.pst~", "$filename.pst";
751 } 1029 }
752 } else { 1030 } else {
753 aio_unlink "$filename.pst"; 1031 aio_unlink "$filename.pst";
… …
785 or return; 1063 or return;
786 $av = eval { (Storable::thaw $av)->{objs} }; 1064 $av = eval { (Storable::thaw $av)->{objs} };
787 } 1065 }
788 1066
789 warn sprintf "loading %s (%d)\n", 1067 warn sprintf "loading %s (%d)\n",
790 $filename, length $data, scalar @{$av || []};#d# 1068 $filename, length $data, scalar @{$av || []};
791 return ($data, $av); 1069 return ($data, $av);
792} 1070}
1071
1072=head2 COMMAND CALLBACKS
1073
1074=over 4
1075
1076=cut
793 1077
794############################################################################# 1078#############################################################################
795# command handling &c 1079# command handling &c
796 1080
797=item cf::register_command $name => \&callback($ob,$args); 1081=item cf::register_command $name => \&callback($ob,$args);
… …
810 push @{ $COMMAND{$name} }, [$caller, $cb]; 1094 push @{ $COMMAND{$name} }, [$caller, $cb];
811} 1095}
812 1096
813=item cf::register_extcmd $name => \&callback($pl,$packet); 1097=item cf::register_extcmd $name => \&callback($pl,$packet);
814 1098
815Register a callbackf ro execution when the client sends an extcmd packet. 1099Register a callback for execution when the client sends an (synchronous)
1100extcmd packet. Ext commands will be processed in the order they are
1101received by the server, like other user commands. The first argument is
1102the logged-in player. Ext commands can only be processed after a player
1103has logged in successfully.
816 1104
817If the callback returns something, it is sent back as if reply was being 1105If the callback returns something, it is sent back as if reply was being
818called. 1106called.
819 1107
1108=item cf::register_exticmd $name => \&callback($ns,$packet);
1109
1110Register a callback for execution when the client sends an (asynchronous)
1111exticmd packet. Exti commands are processed by the server as soon as they
1112are received, i.e. out of order w.r.t. other commands. The first argument
1113is a client socket. Exti commands can be received anytime, even before
1114log-in.
1115
1116If the callback returns something, it is sent back as if reply was being
1117called.
1118
820=cut 1119=cut
821 1120
822sub register_extcmd { 1121sub register_extcmd {
823 my ($name, $cb) = @_; 1122 my ($name, $cb) = @_;
824 1123
825 $EXTCMD{$name} = $cb; 1124 $EXTCMD{$name} = $cb;
1125}
1126
1127sub register_exticmd {
1128 my ($name, $cb) = @_;
1129
1130 $EXTICMD{$name} = $cb;
826} 1131}
827 1132
828cf::player->attach ( 1133cf::player->attach (
829 on_command => sub { 1134 on_command => sub {
830 my ($pl, $name, $params) = @_; 1135 my ($pl, $name, $params) = @_;
… …
839 cf::override; 1144 cf::override;
840 }, 1145 },
841 on_extcmd => sub { 1146 on_extcmd => sub {
842 my ($pl, $buf) = @_; 1147 my ($pl, $buf) = @_;
843 1148
844 my $msg = eval { from_json $buf }; 1149 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
845 1150
846 if (ref $msg) { 1151 if (ref $msg) {
1152 my ($type, $reply, @payload) =
1153 "ARRAY" eq ref $msg
1154 ? @$msg
1155 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1156
1157 my @reply;
1158
847 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 1159 if (my $cb = $EXTCMD{$type}) {
848 if (my %reply = $cb->($pl, $msg)) { 1160 @reply = $cb->($pl, @payload);
849 $pl->ext_reply ($msg->{msgid}, %reply);
850 }
851 } 1161 }
1162
1163 $pl->ext_reply ($reply, @reply)
1164 if $reply;
1165
852 } else { 1166 } else {
853 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1167 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
854 } 1168 }
855 1169
856 cf::override; 1170 cf::override;
857 }, 1171 },
858); 1172);
859 1173
860sub load_extension {
861 my ($path) = @_;
862
863 $path =~ /([^\/\\]+)\.ext$/ or die "$path";
864 my $base = $1;
865 my $pkg = $1;
866 $pkg =~ s/[^[:word:]]/_/g;
867 $pkg = "ext::$pkg";
868
869 warn "... loading '$path' into '$pkg'\n";
870
871 open my $fh, "<:utf8", $path
872 or die "$path: $!";
873
874 my $source =
875 "package $pkg; use strict; use utf8;\n"
876 . "#line 1 \"$path\"\n{\n"
877 . (do { local $/; <$fh> })
878 . "\n};\n1";
879
880 unless (eval $source) {
881 my $msg = $@ ? "$path: $@\n"
882 : "extension disabled.\n";
883 if ($source =~ /^#!.*perl.*#.*MANDATORY/m) { # ugly match
884 warn $@;
885 warn "mandatory extension failed to load, exiting.\n";
886 exit 1;
887 }
888 die $@;
889 }
890
891 push @EXTS, $pkg;
892}
893
894sub load_extensions { 1174sub load_extensions {
1175 cf::sync_job {
1176 my %todo;
1177
895 for my $ext (<$LIBDIR/*.ext>) { 1178 for my $path (<$LIBDIR/*.ext>) {
896 next unless -r $ext; 1179 next unless -r $path;
897 eval { 1180
898 load_extension $ext; 1181 $path =~ /([^\/\\]+)\.ext$/ or die "$path";
1182 my $base = $1;
1183 my $pkg = $1;
1184 $pkg =~ s/[^[:word:]]/_/g;
1185 $pkg = "ext::$pkg";
1186
1187 open my $fh, "<:utf8", $path
1188 or die "$path: $!";
1189
1190 my $source = do { local $/; <$fh> };
1191
1192 my %ext = (
1193 path => $path,
1194 base => $base,
1195 pkg => $pkg,
1196 );
1197
1198 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1199 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1200
1201 $ext{source} =
1202 "package $pkg; use strict; use utf8;\n"
1203 . "#line 1 \"$path\"\n{\n"
1204 . $source
1205 . "\n};\n1";
1206
1207 $todo{$base} = \%ext;
1208 }
1209
1210 my %done;
1211 while (%todo) {
1212 my $progress;
1213
1214 while (my ($k, $v) = each %todo) {
1215 for (split /,\s*/, $v->{meta}{depends}) {
1216 goto skip
1217 unless exists $done{$_};
1218 }
1219
1220 warn "... loading '$k' into '$v->{pkg}'\n";
1221
1222 unless (eval $v->{source}) {
1223 my $msg = $@ ? "$v->{path}: $@\n"
1224 : "$v->{base}: extension inactive.\n";
1225
1226 if (exists $v->{meta}{mandatory}) {
1227 warn $msg;
1228 warn "mandatory extension failed to load, exiting.\n";
1229 exit 1;
1230 }
1231
1232 warn $msg;
1233 }
1234
1235 $done{$k} = delete $todo{$k};
1236 push @EXTS, $v->{pkg};
1237 $progress = 1;
899 1 1238 }
900 } or warn "$ext not loaded: $@"; 1239
1240 skip:
1241 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n"
1242 unless $progress;
1243 }
901 } 1244 };
902} 1245}
903 1246
904############################################################################# 1247#############################################################################
905 1248
1249=back
1250
906=head2 CORE EXTENSIONS 1251=head2 CORE EXTENSIONS
907 1252
908Functions and methods that extend core crossfire objects. 1253Functions and methods that extend core crossfire objects.
909 1254
910=cut 1255=cut
… …
922Returns the given player object, loading it if necessary (might block). 1267Returns the given player object, loading it if necessary (might block).
923 1268
924=cut 1269=cut
925 1270
926sub playerdir($) { 1271sub playerdir($) {
927 cf::localdir 1272 "$PLAYERDIR/"
928 . "/"
929 . cf::playerdir
930 . "/"
931 . (ref $_[0] ? $_[0]->ob->name : $_[0]) 1273 . (ref $_[0] ? $_[0]->ob->name : $_[0])
932} 1274}
933 1275
934sub path($) { 1276sub path($) {
935 my $login = ref $_[0] ? $_[0]->ob->name : $_[0]; 1277 my $login = ref $_[0] ? $_[0]->ob->name : $_[0];
936 1278
937 (playerdir $login) . "/$login.pl" 1279 (playerdir $login) . "/playerdata"
938} 1280}
939 1281
940sub find_active($) { 1282sub find_active($) {
941 $cf::PLAYER{$_[0]} 1283 $cf::PLAYER{$_[0]}
942 and $cf::PLAYER{$_[0]}->active 1284 and $cf::PLAYER{$_[0]}->active
… …
945 1287
946sub exists($) { 1288sub exists($) {
947 my ($login) = @_; 1289 my ($login) = @_;
948 1290
949 $cf::PLAYER{$login} 1291 $cf::PLAYER{$login}
950 or cf::sync_job { !aio_stat $login } 1292 or cf::sync_job { !aio_stat path $login }
951} 1293}
952 1294
953sub find($) { 1295sub find($) {
954 return $cf::PLAYER{$_[0]} || do { 1296 return $cf::PLAYER{$_[0]} || do {
955 my $login = $_[0]; 1297 my $login = $_[0];
956 1298
957 my $guard = cf::lock_acquire "user_find:$login"; 1299 my $guard = cf::lock_acquire "user_find:$login";
958 1300
959 $cf::PLAYER{$_[0]} || do { 1301 $cf::PLAYER{$_[0]} || do {
1302 # rename old playerfiles to new ones
1303 #TODO: remove when no longer required
1304 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1305 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1306 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1307 aio_unlink +(playerdir $login) . "/$login.pl";
1308
960 my $pl = load_pl path $login 1309 my $pl = load_pl path $login
961 or return; 1310 or return;
962 $cf::PLAYER{$login} = $pl 1311 $cf::PLAYER{$login} = $pl
963 } 1312 }
964 } 1313 }
… …
976 1325
977 aio_mkdir playerdir $pl, 0770; 1326 aio_mkdir playerdir $pl, 0770;
978 $pl->{last_save} = $cf::RUNTIME; 1327 $pl->{last_save} = $cf::RUNTIME;
979 1328
980 $pl->save_pl ($path); 1329 $pl->save_pl ($path);
981 Coro::cede; 1330 cf::cede_to_tick;
982} 1331}
983 1332
984sub new($) { 1333sub new($) {
985 my ($login) = @_; 1334 my ($login) = @_;
986 1335
… …
992 $cf::PLAYER{$login} = $self; 1341 $cf::PLAYER{$login} = $self;
993 1342
994 $self 1343 $self
995} 1344}
996 1345
1346=item $player->send_msg ($channel, $msg, $color, [extra...])
1347
1348=cut
1349
1350sub send_msg {
1351 my $ns = shift->ns
1352 or return;
1353 $ns->send_msg (@_);
1354}
1355
997=item $pl->quit_character 1356=item $pl->quit_character
998 1357
999Nukes the player without looking back. If logged in, the connection will 1358Nukes the player without looking back. If logged in, the connection will
1000be destroyed. May block for a long time. 1359be destroyed. May block for a long time.
1001 1360
1002=cut 1361=cut
1003 1362
1004sub quit_character { 1363sub quit_character {
1005 my ($pl) = @_; 1364 my ($pl) = @_;
1365
1366 my $name = $pl->ob->name;
1006 1367
1007 $pl->{deny_save} = 1; 1368 $pl->{deny_save} = 1;
1008 $pl->password ("*"); # this should lock out the player until we nuked the dir 1369 $pl->password ("*"); # this should lock out the player until we nuked the dir
1009 1370
1010 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1371 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
… …
1015 my $path = playerdir $pl; 1376 my $path = playerdir $pl;
1016 my $temp = "$path~$cf::RUNTIME~deleting~"; 1377 my $temp = "$path~$cf::RUNTIME~deleting~";
1017 aio_rename $path, $temp; 1378 aio_rename $path, $temp;
1018 delete $cf::PLAYER{$pl->ob->name}; 1379 delete $cf::PLAYER{$pl->ob->name};
1019 $pl->destroy; 1380 $pl->destroy;
1381
1382 my $prefix = qr<^~\Q$name\E/>;
1383
1384 # nuke player maps
1385 $cf::MAP{$_}->nuke for grep /$prefix/, keys %cf::MAP;
1386
1020 IO::AIO::aio_rmtree $temp; 1387 IO::AIO::aio_rmtree $temp;
1388}
1389
1390=item $pl->kick
1391
1392Kicks a player out of the game. This destroys the connection.
1393
1394=cut
1395
1396sub kick {
1397 my ($pl, $kicker) = @_;
1398
1399 $pl->invoke (cf::EVENT_PLAYER_KICK, $kicker);
1400 $pl->killer ("kicked");
1401 $pl->ns->destroy;
1021} 1402}
1022 1403
1023=item cf::player::list_logins 1404=item cf::player::list_logins
1024 1405
1025Returns am arrayref of all valid playernames in the system, can take a 1406Returns am arrayref of all valid playernames in the system, can take a
1026while and may block, so not sync_job-capable, ever. 1407while and may block, so not sync_job-capable, ever.
1027 1408
1028=cut 1409=cut
1029 1410
1030sub list_logins { 1411sub list_logins {
1031 my $dirs = aio_readdir cf::localdir . "/" . cf::playerdir 1412 my $dirs = aio_readdir $PLAYERDIR
1032 or return []; 1413 or return [];
1033 1414
1034 my @logins; 1415 my @logins;
1035 1416
1036 for my $login (@$dirs) { 1417 for my $login (@$dirs) {
… …
1053=cut 1434=cut
1054 1435
1055sub maps($) { 1436sub maps($) {
1056 my ($pl) = @_; 1437 my ($pl) = @_;
1057 1438
1439 $pl = ref $pl ? $pl->ob->name : $pl;
1440
1058 my $files = aio_readdir playerdir $pl 1441 my $files = aio_readdir playerdir $pl
1059 or return; 1442 or return;
1060 1443
1061 my @paths; 1444 my @paths;
1062 1445
1063 for (@$files) { 1446 for (@$files) {
1064 utf8::decode $_; 1447 utf8::decode $_;
1065 next if /\.(?:pl|pst)$/; 1448 next if /\.(?:pl|pst)$/;
1066 next unless /^$PATH_SEP/o; 1449 next unless /^$PATH_SEP/o;
1067 1450
1068 s/\.map$//; 1451 push @paths, cf::map::normalise "~$pl/$_";
1069 push @paths, "~" . $pl->ob->name . "/" . $_;
1070 } 1452 }
1071 1453
1072 \@paths 1454 \@paths
1073} 1455}
1074 1456
1457=item $protocol_xml = $player->expand_cfpod ($crossfire_pod)
1458
1459Expand crossfire pod fragments into protocol xml.
1460
1461=cut
1462
1463sub expand_cfpod {
1464 ((my $self), (local $_)) = @_;
1465
1466 # escape & and <
1467 s/&/&amp;/g;
1468 s/(?<![BIUGHT])</&lt;/g;
1469
1470 # this is buggy, it needs to properly take care of nested <'s
1471
1472 1 while
1473 # replace B<>, I<>, U<> etc.
1474 s/B<([^\>]*)>/<b>$1<\/b>/
1475 || s/I<([^\>]*)>/<i>$1<\/i>/
1476 || s/U<([^\>]*)>/<u>$1<\/u>/
1477 || s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/
1478 # replace G<male|female> tags
1479 || s{G<([^>|]*)\|([^>]*)>}{
1480 $self->gender ? $2 : $1
1481 }ge
1482 # replace H<hint text>
1483 || s{H<([^\>]*)>}
1484 {
1485 ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>",
1486 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1487 "")
1488 [$self->{hintmode}]
1489 }ge;
1490
1491 # create single paragraphs (very hackish)
1492 s/(?<=\S)\n(?=\w)/ /g;
1493
1494 # compress some whitespace
1495 s/\s+\n/\n/g; # ws line-ends
1496 s/\n\n+/\n/g; # double lines
1497 s/^\n+//; # beginning lines
1498 s/\n+$//; # ending lines
1499
1500 $_
1501}
1502
1503sub hintmode {
1504 $_[0]{hintmode} = $_[1] if @_ > 1;
1505 $_[0]{hintmode}
1506}
1507
1075=item $player->ext_reply ($msgid, $msgtype, %msg) 1508=item $player->ext_reply ($msgid, @msg)
1076 1509
1077Sends an ext reply to the player. 1510Sends an ext reply to the player.
1078 1511
1079=cut 1512=cut
1080 1513
1081sub ext_reply($$$%) { 1514sub ext_reply($$@) {
1082 my ($self, $id, %msg) = @_; 1515 my ($self, $id, @msg) = @_;
1083 1516
1084 $msg{msgid} = $id; 1517 $self->ns->ext_reply ($id, @msg)
1085
1086 $self->send ("ext " . cf::to_json \%msg);
1087} 1518}
1088 1519
1089package cf; 1520=item $player->ext_msg ($type, @msg)
1521
1522Sends an ext event to the client.
1523
1524=cut
1525
1526sub ext_msg($$@) {
1527 my ($self, $type, @msg) = @_;
1528
1529 $self->ns->ext_msg ($type, @msg);
1530}
1531
1532=head3 cf::region
1533
1534=over 4
1535
1536=cut
1537
1538package cf::region;
1539
1540=item cf::region::find_by_path $path
1541
1542Tries to decuce the likely region for a map knowing only its path.
1543
1544=cut
1545
1546sub find_by_path($) {
1547 my ($path) = @_;
1548
1549 my ($match, $specificity);
1550
1551 for my $region (list) {
1552 if ($region->{match} && $path =~ $region->{match}) {
1553 ($match, $specificity) = ($region, $region->specificity)
1554 if $region->specificity > $specificity;
1555 }
1556 }
1557
1558 $match
1559}
1090 1560
1091=back 1561=back
1092
1093 1562
1094=head3 cf::map 1563=head3 cf::map
1095 1564
1096=over 4 1565=over 4
1097 1566
… …
1101 1570
1102use Fcntl; 1571use Fcntl;
1103use Coro::AIO; 1572use Coro::AIO;
1104 1573
1105use overload 1574use overload
1106 '""' => \&as_string; 1575 '""' => \&as_string,
1576 fallback => 1;
1107 1577
1108our $MAX_RESET = 3600; 1578our $MAX_RESET = 3600;
1109our $DEFAULT_RESET = 3000; 1579our $DEFAULT_RESET = 3000;
1110 1580
1111sub generate_random_map { 1581sub generate_random_map {
1112 my ($self, $rmp) = @_; 1582 my ($self, $rmp) = @_;
1113
1114 # mit "rum" bekleckern, nicht 1583 # mit "rum" bekleckern, nicht
1115 $self->_create_random_map ( 1584 $self->_create_random_map (
1116 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1585 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1117 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1586 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1118 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1587 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
… …
1125 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used}, 1594 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1126 (cf::region::find $rmp->{region}), $rmp->{custom} 1595 (cf::region::find $rmp->{region}), $rmp->{custom}
1127 ) 1596 )
1128} 1597}
1129 1598
1599=item cf::map->register ($regex, $prio)
1600
1601Register a handler for the map path matching the given regex at the
1602givne priority (higher is better, built-in handlers have priority 0, the
1603default).
1604
1605=cut
1606
1130sub register { 1607sub register {
1131 my (undef, $regex) = @_; 1608 my (undef, $regex, $prio) = @_;
1132 my $pkg = caller; 1609 my $pkg = caller;
1133 1610
1134 no strict; 1611 no strict;
1135 push @{"$pkg\::ISA"}, __PACKAGE__; 1612 push @{"$pkg\::ISA"}, __PACKAGE__;
1136 1613
1137 $EXT_MAP{$pkg} = qr<$regex>; 1614 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1138} 1615}
1139 1616
1140# also paths starting with '/' 1617# also paths starting with '/'
1141$EXT_MAP{"cf::map"} = qr{^(?=/)}; 1618$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}];
1619
1620sub thawer_merge {
1621 my ($self, $merge) = @_;
1622
1623 # we have to keep some variables in memory intact
1624 local $self->{path};
1625 local $self->{load_path};
1626
1627 $self->SUPER::thawer_merge ($merge);
1628}
1142 1629
1143sub normalise { 1630sub normalise {
1144 my ($path, $base) = @_; 1631 my ($path, $base) = @_;
1632
1633 $path = "$path"; # make sure its a string
1634
1635 $path =~ s/\.map$//;
1145 1636
1146 # map plan: 1637 # map plan:
1147 # 1638 #
1148 # /! non-realised random map exit (special hack!) 1639 # /! non-realised random map exit (special hack!)
1149 # {... are special paths that are not being touched 1640 # {... are special paths that are not being touched
… …
1177 1668
1178 return $path if UNIVERSAL::isa $path, "cf::map"; # already a map object 1669 return $path if UNIVERSAL::isa $path, "cf::map"; # already a map object
1179 1670
1180 $path = normalise $path, $base; 1671 $path = normalise $path, $base;
1181 1672
1182 for my $pkg (keys %EXT_MAP) { 1673 for my $pkg (sort { $EXT_MAP{$b}[0] <=> $EXT_MAP{$a}[0] } keys %EXT_MAP) {
1183 if ($path =~ $EXT_MAP{$pkg}) { 1674 if ($path =~ $EXT_MAP{$pkg}[1]) {
1184 my $self = bless cf::map::new, $pkg; 1675 my $self = bless cf::map::new, $pkg;
1185 $self->{path} = $path; $self->path ($path); 1676 $self->{path} = $path; $self->path ($path);
1186 $self->init; # pass $1 etc. 1677 $self->init; # pass $1 etc.
1187 return $self; 1678 return $self;
1188 } 1679 }
1189 } 1680 }
1190 1681
1191 Carp::carp "unable to resolve path '$path'."; 1682 Carp::cluck "unable to resolve path '$path' (base '$base').";
1192 () 1683 ()
1193} 1684}
1194 1685
1195sub init { 1686sub init {
1196 my ($self) = @_; 1687 my ($self) = @_;
… …
1211 1702
1212# the original (read-only) location 1703# the original (read-only) location
1213sub load_path { 1704sub load_path {
1214 my ($self) = @_; 1705 my ($self) = @_;
1215 1706
1216 sprintf "%s/%s/%s", cf::datadir, cf::mapdir, $self->{path} 1707 "$MAPDIR/$self->{path}.map"
1217} 1708}
1218 1709
1219# the temporary/swap location 1710# the temporary/swap location
1220sub save_path { 1711sub save_path {
1221 my ($self) = @_; 1712 my ($self) = @_;
1222 1713
1223 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1714 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1224 sprintf "%s/%s/%s", cf::localdir, cf::tmpdir, $path 1715 "$TMPDIR/$path.map"
1225} 1716}
1226 1717
1227# the unique path, undef == no special unique path 1718# the unique path, undef == no special unique path
1228sub uniq_path { 1719sub uniq_path {
1229 my ($self) = @_; 1720 my ($self) = @_;
1230 1721
1231 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1722 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1232 sprintf "%s/%s/%s", cf::localdir, cf::uniquedir, $path 1723 "$UNIQUEDIR/$path"
1233} 1724}
1234 1725
1235# and all this just because we cannot iterate over 1726# and all this just because we cannot iterate over
1236# all maps in C++... 1727# all maps in C++...
1237sub change_all_map_light { 1728sub change_all_map_light {
… …
1239 1730
1240 $_->change_map_light ($change) 1731 $_->change_map_light ($change)
1241 for grep $_->outdoor, values %cf::MAP; 1732 for grep $_->outdoor, values %cf::MAP;
1242} 1733}
1243 1734
1735sub decay_objects {
1736 my ($self) = @_;
1737
1738 return if $self->{deny_reset};
1739
1740 $self->do_decay_objects;
1741}
1742
1244sub unlink_save { 1743sub unlink_save {
1245 my ($self) = @_; 1744 my ($self) = @_;
1246 1745
1247 utf8::encode (my $save = $self->save_path); 1746 utf8::encode (my $save = $self->save_path);
1248 IO::AIO::aioreq_pri 4; IO::AIO::aio_unlink $save; 1747 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save;
1249 IO::AIO::aioreq_pri 4; IO::AIO::aio_unlink "$save.pst"; 1748 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink "$save.pst";
1250} 1749}
1251 1750
1252sub load_header_from($) { 1751sub load_header_from($) {
1253 my ($self, $path) = @_; 1752 my ($self, $path) = @_;
1254 1753
1255 utf8::encode $path; 1754 utf8::encode $path;
1256 aio_open $path, O_RDONLY, 0 1755 #aio_open $path, O_RDONLY, 0
1257 or return; 1756 # or return;
1258 1757
1259 $self->_load_header ($path) 1758 $self->_load_header ($path)
1260 or return; 1759 or return;
1261 1760
1262 $self->{load_path} = $path; 1761 $self->{load_path} = $path;
1263 1762
1264 1 1763 1
1265} 1764}
1266 1765
1267sub load_orig { 1766sub load_header_orig {
1268 my ($self) = @_; 1767 my ($self) = @_;
1269 1768
1270 $self->load_header_from ($self->load_path) 1769 $self->load_header_from ($self->load_path)
1271} 1770}
1272 1771
1273sub load_temp { 1772sub load_header_temp {
1274 my ($self) = @_; 1773 my ($self) = @_;
1275 1774
1276 $self->load_header_from ($self->save_path) 1775 $self->load_header_from ($self->save_path)
1776}
1777
1778sub prepare_temp {
1779 my ($self) = @_;
1780
1781 $self->last_access ((delete $self->{last_access})
1782 || $cf::RUNTIME); #d#
1783 # safety
1784 $self->{instantiate_time} = $cf::RUNTIME
1785 if $self->{instantiate_time} > $cf::RUNTIME;
1786}
1787
1788sub prepare_orig {
1789 my ($self) = @_;
1790
1791 $self->{load_original} = 1;
1792 $self->{instantiate_time} = $cf::RUNTIME;
1793 $self->last_access ($cf::RUNTIME);
1794 $self->instantiate;
1277} 1795}
1278 1796
1279sub load_header { 1797sub load_header {
1280 my ($self) = @_; 1798 my ($self) = @_;
1281 1799
1282 if ($self->load_temp) { 1800 if ($self->load_header_temp) {
1283 $self->last_access ((delete $self->{last_access}) 1801 $self->prepare_temp;
1284 || $cf::RUNTIME); #d#
1285 # safety
1286 $self->{instantiate_time} = $cf::RUNTIME
1287 if $self->{instantiate_time} > $cf::RUNTIME;
1288 } else { 1802 } else {
1289 $self->load_orig 1803 $self->load_header_orig
1290 or return; 1804 or return;
1291 1805 $self->prepare_orig;
1292 $self->{load_original} = 1;
1293 $self->{instantiate_time} = $cf::RUNTIME;
1294 $self->last_access ($cf::RUNTIME);
1295 $self->instantiate;
1296 } 1806 }
1807
1808 $self->{deny_reset} = 1
1809 if $self->no_reset;
1810
1811 $self->default_region (cf::region::find_by_path $self->{path})
1812 unless $self->default_region;
1297 1813
1298 1 1814 1
1299} 1815}
1300 1816
1301sub find; 1817sub find;
… …
1314 $map->{last_save} = $cf::RUNTIME; 1830 $map->{last_save} = $cf::RUNTIME;
1315 1831
1316 $map->load_header 1832 $map->load_header
1317 or return; 1833 or return;
1318 1834
1319 if ($map->should_reset) { 1835 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1836 # doing this can freeze the server in a sync job, obviously
1837 #$cf::WAIT_FOR_TICK->wait;
1320 $map->reset; 1838 $map->reset;
1321 undef $guard; 1839 undef $guard;
1322 $map = find $path 1840 return find $path;
1323 or return;
1324 } 1841 }
1325 1842
1326 $cf::MAP{$path} = $map 1843 $cf::MAP{$path} = $map
1327 } 1844 }
1328} 1845}
1846
1847sub pre_load { }
1848sub post_load { }
1329 1849
1330sub load { 1850sub load {
1331 my ($self) = @_; 1851 my ($self) = @_;
1332 1852
1853 local $self->{deny_reset} = 1; # loading can take a long time
1854
1333 my $path = $self->{path}; 1855 my $path = $self->{path};
1856
1857 {
1858 my $guard1 = cf::lock_acquire "map_data:$path";
1334 my $guard = cf::lock_acquire "map_load:$path"; 1859 my $guard2 = cf::lock_acquire "map_load:$path";
1335 1860
1336 return if $self->in_memory != cf::MAP_SWAPPED; 1861 return if $self->in_memory != cf::MAP_SWAPPED;
1337 1862
1338 $self->in_memory (cf::MAP_LOADING); 1863 $self->in_memory (cf::MAP_LOADING);
1339 1864
1340 $self->alloc; 1865 $self->alloc;
1866
1867 $self->pre_load;
1868 cf::cede_to_tick;
1869
1341 $self->_load_objects ($self->{load_path}, 1) 1870 $self->_load_objects ($self->{load_path}, 1)
1342 or return; 1871 or return;
1343 1872
1344 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1873 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1345 if delete $self->{load_original}; 1874 if delete $self->{load_original};
1346 1875
1347 if (my $uniq = $self->uniq_path) { 1876 if (my $uniq = $self->uniq_path) {
1348 utf8::encode $uniq; 1877 utf8::encode $uniq;
1349 if (aio_open $uniq, O_RDONLY, 0) { 1878 if (aio_open $uniq, O_RDONLY, 0) {
1350 $self->clear_unique_items; 1879 $self->clear_unique_items;
1351 $self->_load_objects ($uniq, 0); 1880 $self->_load_objects ($uniq, 0);
1352 } 1881 }
1353 } 1882 }
1354 1883
1355 Coro::cede; 1884 cf::cede_to_tick;
1356
1357 # now do the right thing for maps 1885 # now do the right thing for maps
1358 $self->link_multipart_objects; 1886 $self->link_multipart_objects;
1359
1360 unless ($self->{deny_activate}) {
1361 $self->decay_objects;
1362 $self->fix_auto_apply;
1363 $self->update_buttons;
1364 Coro::cede;
1365 $self->set_darkness_map;
1366 $self->difficulty ($self->estimate_difficulty) 1887 $self->difficulty ($self->estimate_difficulty)
1367 unless $self->difficulty; 1888 unless $self->difficulty;
1368 Coro::cede; 1889 cf::cede_to_tick;
1890
1891 unless ($self->{deny_activate}) {
1892 $self->decay_objects;
1893 $self->fix_auto_apply;
1894 $self->update_buttons;
1895 cf::cede_to_tick;
1896 $self->set_darkness_map;
1897 cf::cede_to_tick;
1369 $self->activate; 1898 $self->activate;
1370 } 1899 }
1371 1900
1901 $self->{last_save} = $cf::RUNTIME;
1902 $self->last_access ($cf::RUNTIME);
1903
1372 $self->in_memory (cf::MAP_IN_MEMORY); 1904 $self->in_memory (cf::MAP_IN_MEMORY);
1905 }
1906
1907 $self->post_load;
1373} 1908}
1374 1909
1375sub customise_for { 1910sub customise_for {
1376 my ($self, $ob) = @_; 1911 my ($self, $ob) = @_;
1377 1912
1378 return find "~" . $ob->name . "/" . $self->{path} 1913 return find "~" . $ob->name . "/" . $self->{path}
1379 if $self->per_player; 1914 if $self->per_player;
1380 1915
1916# return find "?party/" . $ob->name . "/" . $self->{path}
1917# if $self->per_party;
1918
1381 $self 1919 $self
1382} 1920}
1383 1921
1384# find and load all maps in the 3x3 area around a map 1922# find and load all maps in the 3x3 area around a map
1385sub load_diag { 1923sub load_neighbours {
1386 my ($map) = @_; 1924 my ($map) = @_;
1387 1925
1388 my @diag; # diagonal neighbours 1926 my @neigh; # diagonal neighbours
1389 1927
1390 for (0 .. 3) { 1928 for (0 .. 3) {
1391 my $neigh = $map->tile_path ($_) 1929 my $neigh = $map->tile_path ($_)
1392 or next; 1930 or next;
1393 $neigh = find $neigh, $map 1931 $neigh = find $neigh, $map
1394 or next; 1932 or next;
1395 $neigh->load; 1933 $neigh->load;
1396 1934
1935 push @neigh,
1397 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 1936 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1398 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 1937 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1399 } 1938 }
1400 1939
1401 for (@diag) { 1940 for (grep defined $_->[0], @neigh) {
1941 my ($path, $origin) = @$_;
1402 my $neigh = find @$_ 1942 my $neigh = find $path, $origin
1403 or next; 1943 or next;
1404 $neigh->load; 1944 $neigh->load;
1405 } 1945 }
1406} 1946}
1407 1947
… …
1412} 1952}
1413 1953
1414sub do_load_sync { 1954sub do_load_sync {
1415 my ($map) = @_; 1955 my ($map) = @_;
1416 1956
1957 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
1958 if $Coro::current == $Coro::main;
1959
1417 cf::sync_job { $map->load }; 1960 cf::sync_job { $map->load };
1418} 1961}
1419 1962
1420our %MAP_PREFETCH; 1963our %MAP_PREFETCH;
1421our $MAP_PREFETCHER = Coro::async { 1964our $MAP_PREFETCHER = undef;
1422 while () {
1423 for my $path (keys %MAP_PREFETCH) {
1424 my $map = find $path
1425 or next;
1426 $map->load;
1427
1428 delete $MAP_PREFETCH{$path};
1429 }
1430 Coro::schedule;
1431 }
1432};
1433 1965
1434sub find_async { 1966sub find_async {
1435 my ($path, $origin) = @_; 1967 my ($path, $origin, $load) = @_;
1436 1968
1437 $path = normalise $path, $origin && $origin->{path}; 1969 $path = normalise $path, $origin && $origin->{path};
1438 1970
1439 if (my $map = $cf::MAP{$path}) { 1971 if (my $map = $cf::MAP{$path}) {
1440 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 1972 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY;
1973 }
1974
1975 $MAP_PREFETCH{$path} |= $load;
1976
1977 $MAP_PREFETCHER ||= cf::async {
1978 while (%MAP_PREFETCH) {
1979 while (my ($k, $v) = each %MAP_PREFETCH) {
1980 if (my $map = find $k) {
1981 $map->load if $v;
1982 }
1983
1984 delete $MAP_PREFETCH{$k};
1985 }
1986 }
1987 undef $MAP_PREFETCHER;
1441 } 1988 };
1442
1443 $MAP_PREFETCH{$path} = 0;
1444 $MAP_PREFETCHER->ready; 1989 $MAP_PREFETCHER->prio (6);
1445 1990
1446 () 1991 ()
1447} 1992}
1448 1993
1449sub save { 1994sub save {
1450 my ($self) = @_; 1995 my ($self) = @_;
1451 1996
1452 my $lock = cf::lock_acquire "map_data:" . $self->path; 1997 my $lock = cf::lock_acquire "map_data:$self->{path}";
1453 1998
1454 $self->{last_save} = $cf::RUNTIME; 1999 $self->{last_save} = $cf::RUNTIME;
1455 2000
1456 return unless $self->dirty; 2001 return unless $self->dirty;
1457 2002
… …
1480 my ($self) = @_; 2025 my ($self) = @_;
1481 2026
1482 # save first because save cedes 2027 # save first because save cedes
1483 $self->save; 2028 $self->save;
1484 2029
1485 my $lock = cf::lock_acquire "map_data:" . $self->path; 2030 my $lock = cf::lock_acquire "map_data:$self->{path}";
1486 2031
1487 return if $self->players; 2032 return if $self->players;
1488 return if $self->in_memory != cf::MAP_IN_MEMORY; 2033 return if $self->in_memory != cf::MAP_IN_MEMORY;
1489 return if $self->{deny_save}; 2034 return if $self->{deny_save};
1490 2035
… …
1494 2039
1495sub reset_at { 2040sub reset_at {
1496 my ($self) = @_; 2041 my ($self) = @_;
1497 2042
1498 # TODO: safety, remove and allow resettable per-player maps 2043 # TODO: safety, remove and allow resettable per-player maps
1499 return 1e99 if $self->isa ("ext::map_per_player");
1500 return 1e99 if $self->{deny_reset}; 2044 return 1e99 if $self->{deny_reset};
1501 2045
1502 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access; 2046 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
1503 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET; 2047 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
1504 2048
… …
1509 my ($self) = @_; 2053 my ($self) = @_;
1510 2054
1511 $self->reset_at <= $cf::RUNTIME 2055 $self->reset_at <= $cf::RUNTIME
1512} 2056}
1513 2057
1514sub rename {
1515 my ($self, $new_path) = @_;
1516
1517 normalise $new_path;
1518
1519 $self->unlink_save;
1520
1521 delete $cf::MAP{$self->path};
1522 $self->{path} = $new_path; $self->path ($self->{path});
1523 $cf::MAP{$self->path} = $self;
1524
1525 $self->save;
1526}
1527
1528sub reset { 2058sub reset {
1529 my ($self) = @_; 2059 my ($self) = @_;
1530 2060
1531 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2061 my $lock = cf::lock_acquire "map_data:$self->{path}";
1532 2062
1533 return if $self->players; 2063 return if $self->players;
1534 return if $self->isa ("ext::map_per_player");#d#
1535 2064
1536 warn "resetting map ", $self->path;#d# 2065 warn "resetting map ", $self->path;
2066
2067 $self->in_memory (cf::MAP_SWAPPED);
2068
2069 # need to save uniques path
2070 unless ($self->{deny_save}) {
2071 my $uniq = $self->uniq_path; utf8::encode $uniq;
2072
2073 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2074 if $uniq;
2075 }
1537 2076
1538 delete $cf::MAP{$self->path}; 2077 delete $cf::MAP{$self->path};
1539 2078
1540 $self->in_memory (cf::MAP_SWAPPED);
1541 $self->clear; 2079 $self->clear;
1542 2080
1543 $_->clear_links_to ($self) for values %cf::MAP; 2081 $_->clear_links_to ($self) for values %cf::MAP;
1544 2082
1545 $self->unlink_save; 2083 $self->unlink_save;
… …
1549my $nuke_counter = "aaaa"; 2087my $nuke_counter = "aaaa";
1550 2088
1551sub nuke { 2089sub nuke {
1552 my ($self) = @_; 2090 my ($self) = @_;
1553 2091
2092 {
2093 my $lock = cf::lock_acquire "map_data:$self->{path}";
2094
2095 delete $cf::MAP{$self->path};
2096
2097 $self->unlink_save;
2098
2099 bless $self, "cf::map";
2100 delete $self->{deny_reset};
1554 $self->{deny_save} = 1; 2101 $self->{deny_save} = 1;
1555 $self->reset_timeout (1); 2102 $self->reset_timeout (1);
1556 $self->rename ("{nuke}/" . ($nuke_counter++)); 2103 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2104
2105 $cf::MAP{$self->path} = $self;
2106 }
2107
1557 $self->reset; # polite request, might not happen 2108 $self->reset; # polite request, might not happen
2109}
2110
2111=item $maps = cf::map::tmp_maps
2112
2113Returns an arrayref with all map paths of currently instantiated and saved
2114maps. May block.
2115
2116=cut
2117
2118sub tmp_maps() {
2119 [
2120 map {
2121 utf8::decode $_;
2122 /\.map$/
2123 ? normalise $_
2124 : ()
2125 } @{ aio_readdir $TMPDIR or [] }
2126 ]
2127}
2128
2129=item $maps = cf::map::random_maps
2130
2131Returns an arrayref with all map paths of currently instantiated and saved
2132random maps. May block.
2133
2134=cut
2135
2136sub random_maps() {
2137 [
2138 map {
2139 utf8::decode $_;
2140 /\.map$/
2141 ? normalise "?random/$_"
2142 : ()
2143 } @{ aio_readdir $RANDOMDIR or [] }
2144 ]
1558} 2145}
1559 2146
1560=item cf::map::unique_maps 2147=item cf::map::unique_maps
1561 2148
1562Returns an arrayref of paths of all shared maps that have 2149Returns an arrayref of paths of all shared maps that have
1563instantiated unique items. May block. 2150instantiated unique items. May block.
1564 2151
1565=cut 2152=cut
1566 2153
1567sub unique_maps() { 2154sub unique_maps() {
1568 my $files = aio_readdir cf::localdir . "/" . cf::uniquedir 2155 [
1569 or return; 2156 map {
1570
1571 my @paths;
1572
1573 for (@$files) {
1574 utf8::decode $_; 2157 utf8::decode $_;
1575 next if /\.pst$/;
1576 next unless /^$PATH_SEP/o;
1577
1578 s/\.map$//; 2158 /\.map$/
1579 push @paths, $_; 2159 ? normalise $_
2160 : ()
2161 } @{ aio_readdir $UNIQUEDIR or [] }
1580 } 2162 ]
1581
1582 \@paths
1583} 2163}
1584 2164
1585package cf; 2165package cf;
1586 2166
1587=back 2167=back
… …
1633 2213
1634 $flags = cf::NDI_BROWN | cf::NDI_UNIQUE unless @_ >= 4; 2214 $flags = cf::NDI_BROWN | cf::NDI_UNIQUE unless @_ >= 4;
1635 2215
1636 if ($self->{record_replies}) { 2216 if ($self->{record_replies}) {
1637 push @{ $self->{record_replies} }, [$npc, $msg, $flags]; 2217 push @{ $self->{record_replies} }, [$npc, $msg, $flags];
2218
1638 } else { 2219 } else {
2220 my $pl = $self->contr;
2221
2222 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2223 my $dialog = $pl->{npc_dialog};
2224 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2225
2226 } else {
1639 $msg = $npc->name . " says: $msg" if $npc; 2227 $msg = $npc->name . " says: $msg" if $npc;
1640 $self->message ($msg, $flags); 2228 $self->message ($msg, $flags);
2229 }
1641 } 2230 }
2231}
2232
2233=item $object->send_msg ($channel, $msg, $color, [extra...])
2234
2235=cut
2236
2237sub cf::object::send_msg {
2238 my $pl = shift->contr
2239 or return;
2240 $pl->send_msg (@_);
1642} 2241}
1643 2242
1644=item $player_object->may ("access") 2243=item $player_object->may ("access")
1645 2244
1646Returns wether the given player is authorized to access resource "access" 2245Returns wether the given player is authorized to access resource "access"
… …
1678=cut 2277=cut
1679 2278
1680sub link_map { 2279sub link_map {
1681 unless ($LINK_MAP) { 2280 unless ($LINK_MAP) {
1682 $LINK_MAP = cf::map::find "{link}" 2281 $LINK_MAP = cf::map::find "{link}"
1683 or do { warn "FATAL: unable to provide {link} map, exiting."; exit 1 }; 2282 or cf::cleanup "FATAL: unable to provide {link} map, exiting.";
1684 $LINK_MAP->load; 2283 $LINK_MAP->load;
1685 } 2284 }
1686 2285
1687 $LINK_MAP 2286 $LINK_MAP
1688} 2287}
… …
1693 $self->deactivate_recursive; 2292 $self->deactivate_recursive;
1694 2293
1695 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2294 return if UNIVERSAL::isa $self->map, "ext::map_link";
1696 2295
1697 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2296 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
1698 if $self->map; 2297 if $self->map && $self->map->{path} ne "{link}";
1699 2298
1700 $self->enter_map ($LINK_MAP || link_map, 20, 20); 2299 $self->enter_map ($LINK_MAP || link_map, 10, 10);
1701} 2300}
1702 2301
1703sub cf::object::player::leave_link { 2302sub cf::object::player::leave_link {
1704 my ($self, $map, $x, $y) = @_; 2303 my ($self, $map, $x, $y) = @_;
2304
2305 return unless $self->contr->active;
1705 2306
1706 my $link_pos = delete $self->{_link_pos}; 2307 my $link_pos = delete $self->{_link_pos};
1707 2308
1708 unless ($map) { 2309 unless ($map) {
1709 # restore original map position 2310 # restore original map position
… …
1723 # use -1 or undef as default coordinates, not 0, 0 2324 # use -1 or undef as default coordinates, not 0, 0
1724 ($x, $y) = ($map->enter_x, $map->enter_y) 2325 ($x, $y) = ($map->enter_x, $map->enter_y)
1725 if $x <=0 && $y <= 0; 2326 if $x <=0 && $y <= 0;
1726 2327
1727 $map->load; 2328 $map->load;
1728 $map->load_diag; 2329 $map->load_neighbours;
1729 2330
1730 return unless $self->contr->active; 2331 return unless $self->contr->active;
1731 $self->activate_recursive; 2332 $self->activate_recursive;
2333
2334 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
1732 $self->enter_map ($map, $x, $y); 2335 $self->enter_map ($map, $x, $y);
1733} 2336}
1734 2337
1735cf::player->attach ( 2338=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
1736 on_logout => sub {
1737 my ($pl) = @_;
1738 2339
1739 # abort map switching before logout 2340Moves the player to the given map-path and coordinates by first freezing
1740 if ($pl->ob->{_link_pos}) { 2341her, loading and preparing them map, calling the provided $check callback
1741 cf::sync_job { 2342that has to return the map if sucecssful, and then unfreezes the player on
1742 $pl->ob->leave_link 2343the new (success) or old (failed) map position. In either case, $done will
1743 }; 2344be called at the end of this process.
1744 }
1745 },
1746 on_login => sub {
1747 my ($pl) = @_;
1748 2345
1749 # try to abort aborted map switching on player login :)
1750 # should happen only on crashes
1751 if ($pl->ob->{_link_pos}) {
1752 $pl->ob->enter_link;
1753 (async {
1754 # we need this sleep as the login has a concurrent enter_exit running
1755 # and this sleep increases chances of the player not ending up in scorn
1756 $pl->ob->reply (undef,
1757 "There was an internal problem at your last logout, "
1758 . "the server will try to bring you to your intended destination in a second.",
1759 cf::NDI_RED);
1760 Coro::Timer::sleep 1;
1761 $pl->ob->leave_link;
1762 })->prio (2);
1763 }
1764 },
1765);
1766
1767=item $player_object->goto ($path, $x, $y)
1768
1769=cut 2346=cut
2347
2348our $GOTOGEN;
1770 2349
1771sub cf::object::player::goto { 2350sub cf::object::player::goto {
1772 my ($self, $path, $x, $y) = @_; 2351 my ($self, $path, $x, $y, $check, $done) = @_;
2352
2353 # do generation counting so two concurrent goto's will be executed in-order
2354 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
1773 2355
1774 $self->enter_link; 2356 $self->enter_link;
1775 2357
1776 (async { 2358 (async {
2359 my $map = eval {
1777 my $map = cf::map::find $path; 2360 my $map = cf::map::find $path;
2361
2362 if ($map) {
1778 $map = $map->customise_for ($self) if $map; 2363 $map = $map->customise_for ($self);
1779 2364 $map = $check->($map) if $check && $map;
1780# warn "entering ", $map->path, " at ($x, $y)\n" 2365 } else {
1781# if $map;
1782
1783 $map or $self->message ("The exit to '" . ($path->visible_name) . "' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 2366 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED);
2367 }
1784 2368
2369 $map
2370 };
2371
2372 if ($@) {
2373 $self->message ("Something went wrong within the server, please report this incident!", cf::NDI_UNIQUE | cf::NDI_RED);
2374 LOG llevError | logBacktrace, Carp::longmess $@;
2375 }
2376
2377 if ($gen == $self->{_goto_generation}) {
2378 delete $self->{_goto_generation};
1785 $self->leave_link ($map, $x, $y); 2379 $self->leave_link ($map, $x, $y);
2380 }
2381
2382 $done->() if $done;
1786 })->prio (1); 2383 })->prio (1);
1787} 2384}
1788 2385
1789=item $player_object->enter_exit ($exit_object) 2386=item $player_object->enter_exit ($exit_object)
1790 2387
… …
1792 2389
1793sub parse_random_map_params { 2390sub parse_random_map_params {
1794 my ($spec) = @_; 2391 my ($spec) = @_;
1795 2392
1796 my $rmp = { # defaults 2393 my $rmp = { # defaults
1797 xsize => 10, 2394 xsize => (cf::rndm 15, 40),
1798 ysize => 10, 2395 ysize => (cf::rndm 15, 40),
2396 symmetry => (cf::rndm 1, cf::SYMMETRY_XY),
2397 #layout => string,
1799 }; 2398 };
1800 2399
1801 for (split /\n/, $spec) { 2400 for (split /\n/, $spec) {
1802 my ($k, $v) = split /\s+/, $_, 2; 2401 my ($k, $v) = split /\s+/, $_, 2;
1803 2402
… …
1807 $rmp 2406 $rmp
1808} 2407}
1809 2408
1810sub prepare_random_map { 2409sub prepare_random_map {
1811 my ($exit) = @_; 2410 my ($exit) = @_;
2411
2412 my $guard = cf::lock_acquire "exit_prepare:$exit";
1812 2413
1813 # all this does is basically replace the /! path by 2414 # all this does is basically replace the /! path by
1814 # a new random map path (?random/...) with a seed 2415 # a new random map path (?random/...) with a seed
1815 # that depends on the exit object 2416 # that depends on the exit object
1816 2417
1817 my $rmp = parse_random_map_params $exit->msg; 2418 my $rmp = parse_random_map_params $exit->msg;
1818 2419
1819 if ($exit->map) { 2420 if ($exit->map) {
1820 $rmp->{region} = $exit->map->region_name; 2421 $rmp->{region} = $exit->region->name;
1821 $rmp->{origin_map} = $exit->map->path; 2422 $rmp->{origin_map} = $exit->map->path;
1822 $rmp->{origin_x} = $exit->x; 2423 $rmp->{origin_x} = $exit->x;
1823 $rmp->{origin_y} = $exit->y; 2424 $rmp->{origin_y} = $exit->y;
1824 } 2425 }
1825 2426
1826 $rmp->{random_seed} ||= $exit->random_seed; 2427 $rmp->{random_seed} ||= $exit->random_seed;
1827 2428
1828 my $data = cf::to_json $rmp; 2429 my $data = cf::to_json $rmp;
1829 my $md5 = Digest::MD5::md5_hex $data; 2430 my $md5 = Digest::MD5::md5_hex $data;
2431 my $meta = "$RANDOMDIR/$md5.meta";
1830 2432
1831 if (my $fh = aio_open "$cf::RANDOM_MAPS/$md5.meta", O_WRONLY | O_CREAT, 0666) { 2433 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
1832 aio_write $fh, 0, (length $data), $data, 0; 2434 aio_write $fh, 0, (length $data), $data, 0;
2435 undef $fh;
2436 aio_rename "$meta~", $meta;
1833 2437
1834 $exit->slaying ("?random/$md5"); 2438 $exit->slaying ("?random/$md5");
1835 $exit->msg (undef); 2439 $exit->msg (undef);
1836 } 2440 }
1837} 2441}
… …
1839sub cf::object::player::enter_exit { 2443sub cf::object::player::enter_exit {
1840 my ($self, $exit) = @_; 2444 my ($self, $exit) = @_;
1841 2445
1842 return unless $self->type == cf::PLAYER; 2446 return unless $self->type == cf::PLAYER;
1843 2447
2448 if ($exit->slaying eq "/!") {
2449 #TODO: this should de-fi-ni-te-ly not be a sync-job
2450 # the problem is that $exit might not survive long enough
2451 # so it needs to be done right now, right here
2452 cf::sync_job { prepare_random_map $exit };
2453 }
2454
2455 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2456 my $hp = $exit->stats->hp;
2457 my $sp = $exit->stats->sp;
2458
1844 $self->enter_link; 2459 $self->enter_link;
2460
2461 # if exit is damned, update players death & WoR home-position
2462 $self->contr->savebed ($slaying, $hp, $sp)
2463 if $exit->flag (FLAG_DAMNED);
1845 2464
1846 (async { 2465 (async {
1847 $self->deactivate_recursive; # just to be sure 2466 $self->deactivate_recursive; # just to be sure
1848 unless (eval { 2467 unless (eval {
1849 prepare_random_map $exit 2468 $self->goto ($slaying, $hp, $sp);
1850 if $exit->slaying eq "/!";
1851
1852 my $path = new_from_path cf::map $exit->slaying, $exit->map && $exit->map->path;
1853 $self->goto ($path, $exit->stats->hp, $exit->stats->sp);
1854 2469
1855 1; 2470 1;
1856 }) { 2471 }) {
1857 $self->message ("Something went wrong deep within the crossfire server. " 2472 $self->message ("Something went wrong deep within the crossfire server. "
1858 . "I'll try to bring you back to the map you were before. " 2473 . "I'll try to bring you back to the map you were before. "
1859 . "Please report this to the dungeon master!", 2474 . "Please report this to the dungeon master!",
1860 cf::NDI_UNIQUE | cf::NDI_RED); 2475 cf::NDI_UNIQUE | cf::NDI_RED);
1861 2476
1862 warn "ERROR in enter_exit: $@"; 2477 warn "ERROR in enter_exit: $@";
1863 $self->leave_link; 2478 $self->leave_link;
1864 } 2479 }
1865 })->prio (1); 2480 })->prio (1);
… …
1878 2493
1879sub cf::client::send_drawinfo { 2494sub cf::client::send_drawinfo {
1880 my ($self, $text, $flags) = @_; 2495 my ($self, $text, $flags) = @_;
1881 2496
1882 utf8::encode $text; 2497 utf8::encode $text;
1883 $self->send_packet (sprintf "drawinfo %d %s", $flags, $text); 2498 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
1884} 2499}
1885 2500
2501=item $client->send_msg ($channel, $msg, $color, [extra...])
2502
2503Send a drawinfo or msg packet to the client, formatting the msg for the
2504client if neccessary. C<$type> should be a string identifying the type of
2505the message, with C<log> being the default. If C<$color> is negative, suppress
2506the message unless the client supports the msg packet.
2507
2508=cut
2509
2510our %CHANNEL = (
2511 "c/identify" => {
2512 id => "identify",
2513 title => "Identify",
2514 reply => undef,
2515 tooltip => "Items recently identified",
2516 },
2517 "c/examine" => {
2518 id => "examine",
2519 title => "Examine",
2520 reply => undef,
2521 tooltip => "Signs and other items you examined",
2522 },
2523);
2524
2525sub cf::client::send_msg {
2526 my ($self, $channel, $msg, $color, @extra) = @_;
2527
2528 $msg = $self->pl->expand_cfpod ($msg);
2529
2530 $color &= cf::NDI_CLIENT_MASK; # just in case...
2531
2532 # check predefined channels, for the benefit of C
2533 $channel = $CHANNEL{$channel} if $CHANNEL{$channel};
2534
2535 if (ref $channel) {
2536 # send meta info to client, if not yet sent
2537 unless (exists $self->{channel}{$channel->{id}}) {
2538 $self->{channel}{$channel->{id}} = $channel;
2539 $self->ext_msg (channel_info => $channel)
2540 if $self->can_msg;
2541 }
2542
2543 $channel = $channel->{id};
2544 }
2545
2546 return unless @extra || length $msg;
2547
2548 if ($self->can_msg) {
2549 # default colour, mask it out
2550 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2551 if $color & cf::NDI_DEF;
2552
2553 $self->send_packet ("msg " . $self->{json_coder}->encode (
2554 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]));
2555 } else {
2556 if ($color >= 0) {
2557 # replace some tags by gcfclient-compatible ones
2558 for ($msg) {
2559 1 while
2560 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2561 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2562 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2563 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2564 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2565 }
2566
2567 $color &= cf::NDI_COLOR_MASK;
2568
2569 utf8::encode $msg;
2570
2571 if (0 && $msg =~ /\[/) {
2572 # COMMAND/INFO
2573 $self->send_packet ("drawextinfo $color 10 8 $msg")
2574 } else {
2575 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2576 $self->send_packet ("drawinfo $color $msg")
2577 }
2578 }
2579 }
2580}
2581
2582=item $client->ext_msg ($type, @msg)
2583
2584Sends an ext event to the client.
2585
2586=cut
2587
2588sub cf::client::ext_msg($$@) {
2589 my ($self, $type, @msg) = @_;
2590
2591 if ($self->extcmd == 2) {
2592 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2593 } elsif ($self->extcmd == 1) { # TODO: remove
2594 push @msg, msgtype => "event_$type";
2595 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2596 }
2597}
2598
2599=item $client->ext_reply ($msgid, @msg)
2600
2601Sends an ext reply to the client.
2602
2603=cut
2604
2605sub cf::client::ext_reply($$@) {
2606 my ($self, $id, @msg) = @_;
2607
2608 if ($self->extcmd == 2) {
2609 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2610 } elsif ($self->extcmd == 1) {
2611 #TODO: version 1, remove
2612 unshift @msg, msgtype => "reply", msgid => $id;
2613 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2614 }
2615}
1886 2616
1887=item $success = $client->query ($flags, "text", \&cb) 2617=item $success = $client->query ($flags, "text", \&cb)
1888 2618
1889Queues a query to the client, calling the given callback with 2619Queues a query to the client, calling the given callback with
1890the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>, 2620the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>,
1891C<cf::CS_QUERY_SINGLECHAR> or C<cf::CS_QUERY_HIDEINPUT> or C<0>. 2621C<cf::CS_QUERY_SINGLECHAR> or C<cf::CS_QUERY_HIDEINPUT> or C<0>.
1892 2622
1893Queries can fail, so check the return code. Or don't, as queries will become 2623Queries can fail, so check the return code. Or don't, as queries will
1894reliable at some point in the future. 2624become reliable at some point in the future.
1895 2625
1896=cut 2626=cut
1897 2627
1898sub cf::client::query { 2628sub cf::client::query {
1899 my ($self, $flags, $text, $cb) = @_; 2629 my ($self, $flags, $text, $cb) = @_;
… …
1907 utf8::encode $text; 2637 utf8::encode $text;
1908 push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb]; 2638 push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb];
1909 2639
1910 $self->send_packet ($self->{query_queue}[0][0]) 2640 $self->send_packet ($self->{query_queue}[0][0])
1911 if @{ $self->{query_queue} } == 1; 2641 if @{ $self->{query_queue} } == 1;
2642
2643 1
1912} 2644}
1913 2645
1914cf::client->attach ( 2646cf::client->attach (
2647 on_connect => sub {
2648 my ($ns) = @_;
2649
2650 $ns->{json_coder} = JSON::XS->new->utf8->max_size (1e6)->convert_blessed;
2651 },
1915 on_reply => sub { 2652 on_reply => sub {
1916 my ($ns, $msg) = @_; 2653 my ($ns, $msg) = @_;
1917 2654
1918 # this weird shuffling is so that direct followup queries 2655 # this weird shuffling is so that direct followup queries
1919 # get handled first 2656 # get handled first
1920 my $queue = delete $ns->{query_queue} 2657 my $queue = delete $ns->{query_queue}
1921 or return; # be conservative, not sure how that can happen, but we saw a crash here 2658 or return; # be conservative, not sure how that can happen, but we saw a crash here
1922 2659
1923 (shift @$queue)->[1]->($msg); 2660 (shift @$queue)->[1]->($msg);
2661 return unless $ns->valid; # temporary(?) workaround for callback destroying socket
1924 2662
1925 push @{ $ns->{query_queue} }, @$queue; 2663 push @{ $ns->{query_queue} }, @$queue;
1926 2664
1927 if (@{ $ns->{query_queue} } == @$queue) { 2665 if (@{ $ns->{query_queue} } == @$queue) {
1928 if (@$queue) { 2666 if (@$queue) {
… …
1930 } else { 2668 } else {
1931 $ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM; 2669 $ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM;
1932 } 2670 }
1933 } 2671 }
1934 }, 2672 },
2673 on_exticmd => sub {
2674 my ($ns, $buf) = @_;
2675
2676 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2677
2678 if (ref $msg) {
2679 my ($type, $reply, @payload) =
2680 "ARRAY" eq ref $msg
2681 ? @$msg
2682 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2683
2684 my @reply;
2685
2686 if (my $cb = $EXTICMD{$type}) {
2687 @reply = $cb->($ns, @payload);
2688 }
2689
2690 $ns->ext_reply ($reply, @reply)
2691 if $reply;
2692
2693 } else {
2694 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2695 }
2696
2697 cf::override;
2698 },
1935); 2699);
1936 2700
1937=item $client->async (\&cb) 2701=item $client->async (\&cb)
1938 2702
1939Create a new coroutine, running the specified callback. The coroutine will 2703Create a new coroutine, running the specified callback. The coroutine will
… …
1980our $safe = new Safe "safe"; 2744our $safe = new Safe "safe";
1981our $safe_hole = new Safe::Hole; 2745our $safe_hole = new Safe::Hole;
1982 2746
1983$SIG{FPE} = 'IGNORE'; 2747$SIG{FPE} = 'IGNORE';
1984 2748
1985$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time)); 2749$safe->permit_only (Opcode::opset qw(
2750 :base_core :base_mem :base_orig :base_math
2751 grepstart grepwhile mapstart mapwhile
2752 sort time
2753));
1986 2754
1987# here we export the classes and methods available to script code 2755# here we export the classes and methods available to script code
1988 2756
1989=pod 2757=pod
1990 2758
1991The following fucntions and emthods are available within a safe environment: 2759The following functions and methods are available within a safe environment:
1992 2760
1993 cf::object contr pay_amount pay_player map 2761 cf::object
2762 contr pay_amount pay_player map x y force_find force_add
2763 insert remove name archname title slaying race decrease_ob_nr
2764
1994 cf::object::player player 2765 cf::object::player
1995 cf::player peaceful 2766 player
1996 cf::map trigger 2767
2768 cf::player
2769 peaceful
2770
2771 cf::map
2772 trigger
1997 2773
1998=cut 2774=cut
1999 2775
2000for ( 2776for (
2001 ["cf::object" => qw(contr pay_amount pay_player map)], 2777 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2778 insert remove inv name archname title slaying race
2779 decrease_ob_nr)],
2002 ["cf::object::player" => qw(player)], 2780 ["cf::object::player" => qw(player)],
2003 ["cf::player" => qw(peaceful)], 2781 ["cf::player" => qw(peaceful)],
2004 ["cf::map" => qw(trigger)], 2782 ["cf::map" => qw(trigger)],
2005) { 2783) {
2006 no strict 'refs'; 2784 no strict 'refs';
… …
2077=back 2855=back
2078 2856
2079=cut 2857=cut
2080 2858
2081############################################################################# 2859#############################################################################
2860# the server's init and main functions
2082 2861
2083=head2 EXTENSION DATABASE SUPPORT 2862sub load_facedata($) {
2863 my ($path) = @_;
2084 2864
2085Crossfire maintains a very simple database for extension use. It can 2865 # HACK to clear player env face cache, we need some signal framework
2086currently store anything that can be serialised using Storable, which 2866 # for this (global event?)
2087excludes objects. 2867 %ext::player_env::MUSIC_FACE_CACHE = ();
2088 2868
2089The parameter C<$family> should best start with the name of the extension 2869 my $enc = JSON::XS->new->utf8->canonical->relaxed;
2090using it, it should be unique.
2091 2870
2092=over 4 2871 warn "loading facedata from $path\n";
2093 2872
2094=item $hashref = cf::db_get $family 2873 my $facedata;
2874 0 < aio_load $path, $facedata
2875 or die "$path: $!";
2095 2876
2096Return a hashref for use by the extension C<$family>, which can be 2877 $facedata = Coro::Storable::thaw $facedata;
2097modified. After modifications, you have to call C<cf::db_dirty> or
2098C<cf::db_sync>.
2099 2878
2100=item $value = cf::db_get $family => $key 2879 $facedata->{version} == 2
2880 or cf::cleanup "$path: version mismatch, cannot proceed.";
2101 2881
2102Returns a single value from the database 2882 # patch in the exptable
2103 2883 $facedata->{resource}{"res/exp_table"} = {
2104=item cf::db_put $family => $hashref 2884 type => FT_RSRC,
2105 2885 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
2106Stores the given family hashref into the database. Updates are delayed, if
2107you want the data to be synced to disk immediately, use C<cf::db_sync>.
2108
2109=item cf::db_put $family => $key => $value
2110
2111Stores the given C<$value> in the family hash. Updates are delayed, if you
2112want the data to be synced to disk immediately, use C<cf::db_sync>.
2113
2114=item cf::db_dirty
2115
2116Marks the database as dirty, to be updated at a later time.
2117
2118=item cf::db_sync
2119
2120Immediately write the database to disk I<if it is dirty>.
2121
2122=cut
2123
2124our $DB;
2125
2126{
2127 my $path = cf::localdir . "/database.pst";
2128
2129 sub db_load() {
2130 $DB = stat $path ? Storable::retrieve $path : { };
2131 }
2132
2133 my $pid;
2134
2135 sub db_save() {
2136 waitpid $pid, 0 if $pid;
2137 if (0 == ($pid = fork)) {
2138 $DB->{_meta}{version} = 1;
2139 Storable::nstore $DB, "$path~";
2140 rename "$path~", $path;
2141 cf::_exit 0 if defined $pid;
2142 }
2143 }
2144
2145 my $dirty;
2146
2147 sub db_sync() {
2148 db_save if $dirty;
2149 undef $dirty;
2150 }
2151
2152 my $idle = Event->idle (min => $TICK * 2.8, max => 10, repeat => 0, data => WF_AUTOCANCEL, cb => sub {
2153 db_sync;
2154 }); 2886 };
2887 cf::cede_to_tick;
2155 2888
2156 sub db_dirty() {
2157 $dirty = 1;
2158 $idle->start;
2159 } 2889 {
2890 my $faces = $facedata->{faceinfo};
2160 2891
2161 sub db_get($;$) { 2892 while (my ($face, $info) = each %$faces) {
2162 @_ >= 2 2893 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2163 ? $DB->{$_[0]}{$_[1]} 2894 cf::face::set_visibility $idx, $info->{visibility};
2164 : ($DB->{$_[0]} ||= { }) 2895 cf::face::set_magicmap $idx, $info->{magicmap};
2165 } 2896 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2897 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2166 2898
2167 sub db_put($$;$) { 2899 cf::cede_to_tick;
2168 if (@_ >= 3) {
2169 $DB->{$_[0]}{$_[1]} = $_[2];
2170 } else {
2171 $DB->{$_[0]} = $_[1];
2172 }
2173 db_dirty;
2174 }
2175
2176 cf::global->attach (
2177 prio => 10000,
2178 on_cleanup => sub {
2179 db_sync;
2180 }, 2900 }
2181 );
2182}
2183 2901
2184############################################################################# 2902 while (my ($face, $info) = each %$faces) {
2185# the server's main() 2903 next unless $info->{smooth};
2904 my $idx = cf::face::find $face
2905 or next;
2906 if (my $smooth = cf::face::find $info->{smooth}) {
2907 cf::face::set_smooth $idx, $smooth;
2908 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2909 } else {
2910 warn "smooth face '$info->{smooth}' not found for face '$face'";
2911 }
2186 2912
2187sub cfg_load { 2913 cf::cede_to_tick;
2914 }
2915 }
2916
2917 {
2918 my $anims = $facedata->{animinfo};
2919
2920 while (my ($anim, $info) = each %$anims) {
2921 cf::anim::set $anim, $info->{frames}, $info->{facings};
2922 cf::cede_to_tick;
2923 }
2924
2925 cf::anim::invalidate_all; # d'oh
2926 }
2927
2928 {
2929 # TODO: for gcfclient pleasure, we should give resources
2930 # that gcfclient doesn't grok a >10000 face index.
2931 my $res = $facedata->{resource};
2932
2933 my $soundconf = delete $res->{"res/sound.conf"};
2934
2935 while (my ($name, $info) = each %$res) {
2936 my $idx = (cf::face::find $name) || cf::face::alloc $name;
2937 my $data;
2938
2939 if ($info->{type} & 1) {
2940 # prepend meta info
2941
2942 my $meta = $enc->encode ({
2943 name => $name,
2944 %{ $info->{meta} || {} },
2945 });
2946
2947 $data = pack "(w/a*)*", $meta, $info->{data};
2948 } else {
2949 $data = $info->{data};
2950 }
2951
2952 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
2953 cf::face::set_type $idx, $info->{type};
2954
2955 cf::cede_to_tick;
2956 }
2957
2958 if ($soundconf) {
2959 $soundconf = $enc->decode (delete $soundconf->{data});
2960
2961 for (0 .. SOUND_CAST_SPELL_0 - 1) {
2962 my $sound = $soundconf->{compat}[$_]
2963 or next;
2964
2965 my $face = cf::face::find "sound/$sound->[1]";
2966 cf::sound::set $sound->[0] => $face;
2967 cf::sound::old_sound_index $_, $face; # gcfclient-compat
2968 }
2969
2970 while (my ($k, $v) = each %{$soundconf->{event}}) {
2971 my $face = cf::face::find "sound/$v";
2972 cf::sound::set $k => $face;
2973 }
2974 }
2975 }
2976
2977 1
2978}
2979
2980register_exticmd fx_want => sub {
2981 my ($ns, $want) = @_;
2982
2983 while (my ($k, $v) = each %$want) {
2984 $ns->fx_want ($k, $v);
2985 }
2986};
2987
2988sub reload_regions {
2989 # HACK to clear player env face cache, we need some signal framework
2990 # for this (global event?)
2991 %ext::player_env::MUSIC_FACE_CACHE = ();
2992
2993 load_resource_file "$MAPDIR/regions"
2994 or die "unable to load regions file\n";
2995
2996 for (cf::region::list) {
2997 $_->{match} = qr/$_->{match}/
2998 if exists $_->{match};
2999 }
3000}
3001
3002sub reload_facedata {
3003 load_facedata "$DATADIR/facedata"
3004 or die "unable to load facedata\n";
3005}
3006
3007sub reload_archetypes {
3008 load_resource_file "$DATADIR/archetypes"
3009 or die "unable to load archetypes\n";
3010 #d# NEED to laod twice to resolve forward references
3011 # this really needs to be done in an extra post-pass
3012 # (which needs to be synchronous, so solve it differently)
3013 load_resource_file "$DATADIR/archetypes"
3014 or die "unable to load archetypes\n";
3015}
3016
3017sub reload_treasures {
3018 load_resource_file "$DATADIR/treasures"
3019 or die "unable to load treasurelists\n";
3020}
3021
3022sub reload_resources {
3023 warn "reloading resource files...\n";
3024
3025 reload_regions;
3026 reload_facedata;
3027 #reload_archetypes;#d#
3028 reload_archetypes;
3029 reload_treasures;
3030
3031 warn "finished reloading resource files\n";
3032}
3033
3034sub init {
3035 reload_resources;
3036}
3037
3038sub reload_config {
2188 open my $fh, "<:utf8", cf::confdir . "/config" 3039 open my $fh, "<:utf8", "$CONFDIR/config"
2189 or return; 3040 or return;
2190 3041
2191 local $/; 3042 local $/;
2192 *CFG = YAML::Syck::Load <$fh>; 3043 *CFG = YAML::Syck::Load <$fh>;
2193 3044
… …
2207 3058
2208sub main { 3059sub main {
2209 # we must not ever block the main coroutine 3060 # we must not ever block the main coroutine
2210 local $Coro::idle = sub { 3061 local $Coro::idle = sub {
2211 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3062 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3063 (async {
2212 async { Event::one_event }; 3064 Event::one_event;
3065 })->prio (Coro::PRIO_MAX);
2213 }; 3066 };
2214 3067
2215 cfg_load; 3068 reload_config;
2216 db_load; 3069 db_init;
2217 load_extensions; 3070 load_extensions;
3071
3072 $TICK_WATCHER->start;
2218 Event::loop; 3073 Event::loop;
2219} 3074}
2220 3075
2221############################################################################# 3076#############################################################################
2222# initialisation and cleanup 3077# initialisation and cleanup
2223 3078
2224# install some emergency cleanup handlers 3079# install some emergency cleanup handlers
2225BEGIN { 3080BEGIN {
2226 for my $signal (qw(INT HUP TERM)) { 3081 for my $signal (qw(INT HUP TERM)) {
2227 Event->signal ( 3082 Event->signal (
3083 reentrant => 0,
2228 data => WF_AUTOCANCEL, 3084 data => WF_AUTOCANCEL,
2229 signal => $signal, 3085 signal => $signal,
3086 prio => 0,
2230 cb => sub { 3087 cb => sub {
2231 cf::cleanup "SIG$signal"; 3088 cf::cleanup "SIG$signal";
2232 }, 3089 },
2233 ); 3090 );
2234 } 3091 }
3092}
3093
3094sub write_runtime {
3095 my $runtime = "$LOCALDIR/runtime";
3096
3097 # first touch the runtime file to show we are still running:
3098 # the fsync below can take a very very long time.
3099
3100 IO::AIO::aio_utime $runtime, undef, undef;
3101
3102 my $guard = cf::lock_acquire "write_runtime";
3103
3104 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644
3105 or return;
3106
3107 my $value = $cf::RUNTIME + 90 + 10;
3108 # 10 is the runtime save interval, for a monotonic clock
3109 # 60 allows for the watchdog to kill the server.
3110
3111 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3112 and return;
3113
3114 # always fsync - this file is important
3115 aio_fsync $fh
3116 and return;
3117
3118 # touch it again to show we are up-to-date
3119 aio_utime $fh, undef, undef;
3120
3121 close $fh
3122 or return;
3123
3124 aio_rename "$runtime~", $runtime
3125 and return;
3126
3127 warn "runtime file written.\n";
3128
3129 1
2235} 3130}
2236 3131
2237sub emergency_save() { 3132sub emergency_save() {
2238 my $freeze_guard = cf::freeze_mainloop; 3133 my $freeze_guard = cf::freeze_mainloop;
2239 3134
… …
2256 my $map = $cf::MAP{$path} or next; 3151 my $map = $cf::MAP{$path} or next;
2257 $map->valid or next; 3152 $map->valid or next;
2258 $map->save; 3153 $map->save;
2259 } 3154 }
2260 warn "end emergency map save\n"; 3155 warn "end emergency map save\n";
3156
3157 warn "begin emergency database checkpoint\n";
3158 BDB::db_env_txn_checkpoint $DB_ENV;
3159 warn "end emergency database checkpoint\n";
2261 }; 3160 };
2262 3161
2263 warn "leave emergency perl save\n"; 3162 warn "leave emergency perl save\n";
2264} 3163}
2265 3164
3165sub post_cleanup {
3166 my ($make_core) = @_;
3167
3168 warn Carp::longmess "post_cleanup backtrace"
3169 if $make_core;
3170}
3171
2266sub reload() { 3172sub do_reload_perl() {
2267 # can/must only be called in main 3173 # can/must only be called in main
2268 if ($Coro::current != $Coro::main) { 3174 if ($Coro::current != $Coro::main) {
2269 warn "can only reload from main coroutine\n"; 3175 warn "can only reload from main coroutine";
2270 return; 3176 return;
2271 } 3177 }
2272 3178
2273 warn "reloading..."; 3179 warn "reloading...";
2274 3180
2275 warn "freezing server"; 3181 warn "entering sync_job";
2276 my $guard = freeze_mainloop; 3182
3183 cf::sync_job {
3184 cf::write_runtime; # external watchdog should not bark
2277 cf::emergency_save; 3185 cf::emergency_save;
3186 cf::write_runtime; # external watchdog should not bark
2278 3187
2279 warn "sync database to disk"; 3188 warn "syncing database to disk";
2280 cf::db_sync; 3189 BDB::db_env_txn_checkpoint $DB_ENV;
2281 IO::AIO::flush;
2282 3190
2283 eval {
2284 # if anything goes wrong in here, we should simply crash as we already saved 3191 # if anything goes wrong in here, we should simply crash as we already saved
2285 3192
2286 warn "cancel all watchers"; 3193 warn "cancelling all WF_AUTOCANCEL watchers";
2287 for (Event::all_watchers) { 3194 for (Event::all_watchers) {
2288 $_->cancel if $_->data & WF_AUTOCANCEL; 3195 $_->cancel if $_->data & WF_AUTOCANCEL;
2289 } 3196 }
2290 3197
3198 warn "flushing outstanding aio requests";
3199 for (;;) {
3200 BDB::flush;
3201 IO::AIO::flush;
3202 Coro::cede;
3203 last unless IO::AIO::nreqs || BDB::nreqs;
3204 warn "iterate...";
3205 }
3206
3207 ++$RELOAD;
3208
2291 warn "cancel all extension coros"; 3209 warn "cancelling all extension coros";
2292 $_->cancel for values %EXT_CORO; 3210 $_->cancel for values %EXT_CORO;
2293 %EXT_CORO = (); 3211 %EXT_CORO = ();
2294 3212
2295 warn "remove commands"; 3213 warn "removing commands";
2296 %COMMAND = (); 3214 %COMMAND = ();
2297 3215
2298 warn "remove ext commands"; 3216 warn "removing ext/exti commands";
2299 %EXTCMD = (); 3217 %EXTCMD = ();
3218 %EXTICMD = ();
2300 3219
2301 warn "unload/nuke all extensions"; 3220 warn "unloading/nuking all extensions";
2302 for my $pkg (@EXTS) { 3221 for my $pkg (@EXTS) {
2303 warn "... unloading $pkg"; 3222 warn "... unloading $pkg";
2304 3223
2305 if (my $cb = $pkg->can ("unload")) { 3224 if (my $cb = $pkg->can ("unload")) {
2306 eval { 3225 eval {
… …
2311 3230
2312 warn "... nuking $pkg"; 3231 warn "... nuking $pkg";
2313 Symbol::delete_package $pkg; 3232 Symbol::delete_package $pkg;
2314 } 3233 }
2315 3234
2316 warn "unload all perl modules loaded from $LIBDIR"; 3235 warn "unloading all perl modules loaded from $LIBDIR";
2317 while (my ($k, $v) = each %INC) { 3236 while (my ($k, $v) = each %INC) {
2318 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 3237 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
2319 3238
2320 warn "removing <$k>"; 3239 warn "... unloading $k";
2321 delete $INC{$k}; 3240 delete $INC{$k};
2322 3241
2323 $k =~ s/\.pm$//; 3242 $k =~ s/\.pm$//;
2324 $k =~ s/\//::/g; 3243 $k =~ s/\//::/g;
2325 3244
… …
2328 } 3247 }
2329 3248
2330 Symbol::delete_package $k; 3249 Symbol::delete_package $k;
2331 } 3250 }
2332 3251
2333 warn "get rid of safe::, as good as possible"; 3252 warn "getting rid of safe::, as good as possible";
2334 Symbol::delete_package "safe::$_" 3253 Symbol::delete_package "safe::$_"
2335 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3254 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
2336 3255
2337 warn "unload cf.pm \"a bit\""; 3256 warn "unloading cf.pm \"a bit\"";
2338 delete $INC{"cf.pm"}; 3257 delete $INC{"cf.pm"};
3258 delete $INC{"cf/pod.pm"};
2339 3259
2340 # don't, removes xs symbols, too, 3260 # don't, removes xs symbols, too,
2341 # and global variables created in xs 3261 # and global variables created in xs
2342 #Symbol::delete_package __PACKAGE__; 3262 #Symbol::delete_package __PACKAGE__;
2343 3263
3264 warn "unload completed, starting to reload now";
3265
2344 warn "reloading cf.pm"; 3266 warn "reloading cf.pm";
2345 require cf; 3267 require cf;
2346 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3268 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2347 3269
2348 warn "load config and database again"; 3270 warn "loading config and database again";
2349 cf::cfg_load; 3271 cf::reload_config;
2350 cf::db_load;
2351 3272
2352 warn "load extensions"; 3273 warn "loading extensions";
2353 cf::load_extensions; 3274 cf::load_extensions;
2354 3275
2355 warn "reattach attachments to objects/players"; 3276 warn "reattaching attachments to objects/players";
2356 _global_reattach; 3277 _global_reattach; # objects, sockets
2357 warn "reattach attachments to maps"; 3278 warn "reattaching attachments to maps";
2358 reattach $_ for values %MAP; 3279 reattach $_ for values %MAP;
2359 }; 3280 warn "reattaching attachments to players";
3281 reattach $_ for values %PLAYER;
2360 3282
2361 if ($@) { 3283 warn "leaving sync_job";
3284
3285 1
3286 } or do {
2362 warn $@; 3287 warn $@;
2363 warn "error while reloading, exiting."; 3288 warn "error while reloading, exiting.";
2364 exit 1; 3289 exit 1;
2365 } 3290 };
2366 3291
2367 warn "reloaded"; 3292 warn "reloaded";
2368}; 3293};
2369 3294
3295our $RELOAD_WATCHER; # used only during reload
3296
3297sub reload_perl() {
3298 # doing reload synchronously and two reloads happen back-to-back,
3299 # coro crashes during coro_state_free->destroy here.
3300
3301 $RELOAD_WATCHER ||= Event->timer (
3302 reentrant => 0,
3303 after => 0,
3304 data => WF_AUTOCANCEL,
3305 cb => sub {
3306 do_reload_perl;
3307 undef $RELOAD_WATCHER;
3308 },
3309 );
3310}
3311
2370register_command "reload" => sub { 3312register_command "reload" => sub {
2371 my ($who, $arg) = @_; 3313 my ($who, $arg) = @_;
2372 3314
2373 if ($who->flag (FLAG_WIZ)) { 3315 if ($who->flag (FLAG_WIZ)) {
2374 $who->message ("start of reload.");
2375 reload;
2376 $who->message ("end of reload."); 3316 $who->message ("reloading server.");
3317 async { reload_perl };
2377 } 3318 }
2378}; 3319};
2379 3320
2380unshift @INC, $LIBDIR; 3321unshift @INC, $LIBDIR;
2381 3322
3323my $bug_warning = 0;
3324
3325our @WAIT_FOR_TICK;
3326our @WAIT_FOR_TICK_BEGIN;
3327
3328sub wait_for_tick {
3329 return unless $TICK_WATCHER->is_active;
3330 return if $Coro::current == $Coro::main;
3331
3332 my $signal = new Coro::Signal;
3333 push @WAIT_FOR_TICK, $signal;
3334 $signal->wait;
3335}
3336
3337sub wait_for_tick_begin {
3338 return unless $TICK_WATCHER->is_active;
3339 return if $Coro::current == $Coro::main;
3340
3341 my $signal = new Coro::Signal;
3342 push @WAIT_FOR_TICK_BEGIN, $signal;
3343 $signal->wait;
3344}
3345
3346 my $min = 1e6;#d#
3347 my $avg = 10;
2382$TICK_WATCHER = Event->timer ( 3348$TICK_WATCHER = Event->timer (
2383 reentrant => 0, 3349 reentrant => 0,
3350 parked => 1,
2384 prio => 0, 3351 prio => 0,
2385 at => $NEXT_TICK || $TICK, 3352 at => $NEXT_TICK || $TICK,
2386 data => WF_AUTOCANCEL, 3353 data => WF_AUTOCANCEL,
2387 cb => sub { 3354 cb => sub {
3355 if ($Coro::current != $Coro::main) {
3356 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3357 unless ++$bug_warning > 10;
3358 return;
3359 }
3360
2388 $NOW = Event::time; 3361 $NOW = $tick_start = Event::time;
2389 3362
2390 cf::server_tick; # one server iteration 3363 cf::server_tick; # one server iteration
3364
3365 0 && sync_job {#d#
3366 for(1..10) {
3367 my $t = Event::time;
3368 my $map = my $map = new_from_path cf::map "/tmp/x.map"
3369 or die;
3370
3371 $map->width (50);
3372 $map->height (50);
3373 $map->alloc;
3374 $map->_load_objects ("/tmp/x.map", 1);
3375 my $t = Event::time - $t;
3376
3377 #next unless $t < 0.0013;#d#
3378 if ($t < $min) {
3379 $min = $t;
3380 }
3381 $avg = $avg * 0.99 + $t * 0.01;
3382 }
3383 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3384 exit 0;
3385 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3386 };
3387
2391 $RUNTIME += $TICK; 3388 $RUNTIME += $TICK;
2392 $NEXT_TICK += $TICK; 3389 $NEXT_TICK += $TICK;
2393 3390
2394 $WAIT_FOR_TICK->broadcast; 3391 if ($NOW >= $NEXT_RUNTIME_WRITE) {
2395 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited; 3392 $NEXT_RUNTIME_WRITE = $NOW + 10;
3393 Coro::async_pool {
3394 write_runtime
3395 or warn "ERROR: unable to write runtime file: $!";
3396 };
3397 }
3398
3399# my $AFTER = Event::time;
3400# warn $AFTER - $NOW;#d#
3401
3402 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3403 $sig->send;
3404 }
3405 while (my $sig = shift @WAIT_FOR_TICK) {
3406 $sig->send;
3407 }
3408
3409 $NOW = Event::time;
2396 3410
2397 # if we are delayed by four ticks or more, skip them all 3411 # if we are delayed by four ticks or more, skip them all
2398 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; 3412 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
2399 3413
2400 $TICK_WATCHER->at ($NEXT_TICK); 3414 $TICK_WATCHER->at ($NEXT_TICK);
2401 $TICK_WATCHER->start; 3415 $TICK_WATCHER->start;
3416
3417 $LOAD = ($NOW - $tick_start) / $TICK;
3418 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3419
3420 _post_tick;
3421
3422
2402 }, 3423 },
2403); 3424);
2404 3425
3426{
2405IO::AIO::max_poll_time $TICK * 0.2; 3427 BDB::max_poll_time $TICK * 0.1;
2406 3428 $BDB_POLL_WATCHER = Event->io (
2407Event->io ( 3429 reentrant => 0,
2408 fd => IO::AIO::poll_fileno, 3430 fd => BDB::poll_fileno,
2409 poll => 'r', 3431 poll => 'r',
2410 prio => 5, 3432 prio => 0,
2411 data => WF_AUTOCANCEL,
2412 cb => \&IO::AIO::poll_cb,
2413);
2414
2415Event->timer (
2416 data => WF_AUTOCANCEL, 3433 data => WF_AUTOCANCEL,
2417 after => 0, 3434 cb => \&BDB::poll_cb,
2418 interval => 10, 3435 );
2419 cb => sub { 3436 BDB::min_parallel 8;
2420 (Coro::unblock_sub { 3437
2421 write_runtime 3438 BDB::set_sync_prepare {
2422 or warn "ERROR: unable to write runtime file: $!"; 3439 my $status;
3440 my $current = $Coro::current;
3441 (
3442 sub {
3443 $status = $!;
3444 $current->ready; undef $current;
3445 },
3446 sub {
3447 Coro::schedule while defined $current;
3448 $! = $status;
3449 },
3450 )
3451 };
3452
3453 unless ($DB_ENV) {
3454 $DB_ENV = BDB::db_env_create;
3455
3456 cf::sync_job {
3457 eval {
3458 BDB::db_env_open
3459 $DB_ENV,
3460 $BDBDIR,
3461 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
3462 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3463 0666;
3464
3465 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3466
3467 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
3468 $DB_ENV->set_lk_detect;
3469 };
3470
3471 cf::cleanup "db_env_open(db): $@" if $@;
2423 })->(); 3472 };
2424 }, 3473 }
2425); 3474}
3475
3476{
3477 IO::AIO::min_parallel 8;
3478
3479 undef $Coro::AIO::WATCHER;
3480 IO::AIO::max_poll_time $TICK * 0.1;
3481 $AIO_POLL_WATCHER = Event->io (
3482 reentrant => 0,
3483 data => WF_AUTOCANCEL,
3484 fd => IO::AIO::poll_fileno,
3485 poll => 'r',
3486 prio => 6,
3487 cb => \&IO::AIO::poll_cb,
3488 );
3489}
3490
3491my $_log_backtrace;
3492
3493sub _log_backtrace {
3494 my ($msg, @addr) = @_;
3495
3496 $msg =~ s/\n//;
3497
3498 # limit the # of concurrent backtraces
3499 if ($_log_backtrace < 2) {
3500 ++$_log_backtrace;
3501 async {
3502 my @bt = fork_call {
3503 @addr = map { sprintf "%x", $_ } @addr;
3504 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3505 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3506 or die "addr2line: $!";
3507
3508 my @funcs;
3509 my @res = <$fh>;
3510 chomp for @res;
3511 while (@res) {
3512 my ($func, $line) = splice @res, 0, 2, ();
3513 push @funcs, "[$func] $line";
3514 }
3515
3516 @funcs
3517 };
3518
3519 LOG llevInfo, "[ABT] $msg\n";
3520 LOG llevInfo, "[ABT] $_\n" for @bt;
3521 --$_log_backtrace;
3522 };
3523 } else {
3524 LOG llevInfo, "[ABT] $msg\n";
3525 LOG llevInfo, "[ABT] [suppressed]\n";
3526 }
3527}
3528
3529# load additional modules
3530use cf::pod;
2426 3531
2427END { cf::emergency_save } 3532END { cf::emergency_save }
2428 3533
24291 35341
2430 3535

Diff Legend

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