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.150 by root, Mon Jan 8 19:25:53 2007 UTC vs.
Revision 1.190 by root, Mon Jan 22 03:44:41 2007 UTC

8use Storable; 8use Storable;
9use Opcode; 9use Opcode;
10use Safe; 10use Safe;
11use Safe::Hole; 11use Safe::Hole;
12 12
13use Coro 3.3 (); 13use Coro 3.4 ();
14use Coro::Event; 14use Coro::Event;
15use Coro::Timer; 15use Coro::Timer;
16use Coro::Signal; 16use Coro::Signal;
17use Coro::Semaphore; 17use Coro::Semaphore;
18use Coro::AIO; 18use Coro::AIO;
19 19
20use Data::Dumper;
20use Digest::MD5; 21use Digest::MD5;
21use Fcntl; 22use Fcntl;
22use IO::AIO 2.32 (); 23use IO::AIO 2.32 ();
23use YAML::Syck (); 24use YAML::Syck ();
24use Time::HiRes; 25use Time::HiRes;
25 26
26use Event; $Event::Eval = 1; # no idea why this is required, but it is 27use Event; $Event::Eval = 1; # no idea why this is required, but it is
27 28
29sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
30
28# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode? 31# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?
29$YAML::Syck::ImplicitUnicode = 1; 32$YAML::Syck::ImplicitUnicode = 1;
30 33
31$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority 34$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
32 35
33sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
34
35our %COMMAND = (); 36our %COMMAND = ();
36our %COMMAND_TIME = (); 37our %COMMAND_TIME = ();
38
39our @EXTS = (); # list of extension package names
37our %EXTCMD = (); 40our %EXTCMD = ();
41our %EXT_CORO = (); # coroutines bound to extensions
42our %EXT_MAP = (); # pluggable maps
38 43
39our @EVENT; 44our @EVENT;
40our $LIBDIR = datadir . "/ext"; 45our $LIBDIR = datadir . "/ext";
41 46
42our $TICK = MAX_TIME * 1e-6; 47our $TICK = MAX_TIME * 1e-6;
43our $TICK_WATCHER; 48our $TICK_WATCHER;
49our $AIO_POLL_WATCHER;
50our $WRITE_RUNTIME_WATCHER;
44our $NEXT_TICK; 51our $NEXT_TICK;
45our $NOW; 52our $NOW;
46 53
47our %CFG; 54our %CFG;
48 55
49our $UPTIME; $UPTIME ||= time; 56our $UPTIME; $UPTIME ||= time;
50our $RUNTIME; 57our $RUNTIME;
51 58
52our %PLAYER; # all users 59our %PLAYER; # all users
53our %MAP; # all maps 60our %MAP; # all maps
54our $LINK_MAP; # the special {link} map 61our $LINK_MAP; # the special {link} map, which is always available
55our $RANDOM_MAPS = cf::localdir . "/random"; 62our $RANDOM_MAPS = cf::localdir . "/random";
56our %EXT_CORO; # coroutines bound to extensions 63
64our $WAIT_FOR_TICK; $WAIT_FOR_TICK ||= new Coro::Signal;
65our $WAIT_FOR_TICK_ONE; $WAIT_FOR_TICK_ONE ||= new Coro::Signal;
66
67# used to convert map paths into valid unix filenames by replacing / by ∕
68our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
57 69
58binmode STDOUT; 70binmode STDOUT;
59binmode STDERR; 71binmode STDERR;
60 72
61# read virtual server time, if available 73# read virtual server time, if available
69mkdir cf::localdir . "/" . cf::playerdir; 81mkdir cf::localdir . "/" . cf::playerdir;
70mkdir cf::localdir . "/" . cf::tmpdir; 82mkdir cf::localdir . "/" . cf::tmpdir;
71mkdir cf::localdir . "/" . cf::uniquedir; 83mkdir cf::localdir . "/" . cf::uniquedir;
72mkdir $RANDOM_MAPS; 84mkdir $RANDOM_MAPS;
73 85
74# a special map that is always available
75our $LINK_MAP;
76our $EMERGENCY_POSITION; 86our $EMERGENCY_POSITION;
77 87
78############################################################################# 88#############################################################################
79 89
80=head2 GLOBAL VARIABLES 90=head2 GLOBAL VARIABLES
105 115
106=item %cf::CFG 116=item %cf::CFG
107 117
108Configuration for the server, loaded from C</etc/crossfire/config>, or 118Configuration for the server, loaded from C</etc/crossfire/config>, or
109from wherever your confdir points to. 119from wherever your confdir points to.
120
121=item $cf::WAIT_FOR_TICK, $cf::WAIT_FOR_TICK_ONE
122
123These are Coro::Signal objects that are C<< ->broadcast >> (WAIT_FOR_TICK)
124or C<< ->send >> (WAIT_FOR_TICK_ONE) on after normal server tick
125processing has been done. Call C<< ->wait >> on them to maximise the
126window of cpu time available, or simply to synchronise to the server tick.
110 127
111=back 128=back
112 129
113=cut 130=cut
114 131
146 163
147$Event::DIED = sub { 164$Event::DIED = sub {
148 warn "error in event callback: @_"; 165 warn "error in event callback: @_";
149}; 166};
150 167
151my %ext_pkg;
152my @exts;
153my @hook;
154
155=head2 UTILITY FUNCTIONS 168=head2 UTILITY FUNCTIONS
156 169
157=over 4 170=over 4
158 171
172=item dumpval $ref
173
159=cut 174=cut
175
176sub dumpval {
177 eval {
178 local $SIG{__DIE__};
179 my $d;
180 if (1) {
181 $d = new Data::Dumper([$_[0]], ["*var"]);
182 $d->Terse(1);
183 $d->Indent(2);
184 $d->Quotekeys(0);
185 $d->Useqq(1);
186 #$d->Bless(...);
187 $d->Seen($_[1]) if @_ > 1;
188 $d = $d->Dump();
189 }
190 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
191 $d
192 } || "[unable to dump $_[0]: '$@']";
193}
160 194
161use JSON::Syck (); # TODO# replace by JSON::PC once working 195use JSON::Syck (); # TODO# replace by JSON::PC once working
162 196
163=item $ref = cf::from_json $json 197=item $ref = cf::from_json $json
164 198
225} 259}
226 260
227sub freeze_mainloop { 261sub freeze_mainloop {
228 return unless $TICK_WATCHER->is_active; 262 return unless $TICK_WATCHER->is_active;
229 263
230 my $guard = Coro::guard { $TICK_WATCHER->start }; 264 my $guard = Coro::guard {
265 $TICK_WATCHER->start;
266 $WRITE_RUNTIME_WATCHER->start;
267 };
268 $WRITE_RUNTIME_WATCHER->stop;
231 $TICK_WATCHER->stop; 269 $TICK_WATCHER->stop;
232 $guard 270 $guard
233} 271}
234 272
235=item cf::async { BLOCK } 273=item cf::async { BLOCK }
287 } 325 }
288} 326}
289 327
290=item $coro = cf::async_ext { BLOCK } 328=item $coro = cf::async_ext { BLOCK }
291 329
292Like async, but this coro is automcatially being canceled when the 330Like async, but this coro is automatically being canceled when the
293extension calling this is being unloaded. 331extension calling this is being unloaded.
294 332
295=cut 333=cut
296 334
297sub async_ext(&) { 335sub async_ext(&) {
311 my $runtime = cf::localdir . "/runtime"; 349 my $runtime = cf::localdir . "/runtime";
312 350
313 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 351 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644
314 or return; 352 or return;
315 353
354 my $value = $cf::RUNTIME + 90 + 10;
316 my $value = $cf::RUNTIME + 1 + 10; # 10 is the runtime save interval, for a monotonic clock 355 # 10 is the runtime save interval, for a monotonic clock
356 # 60 allows for the watchdog to kill the server.
357
317 (aio_write $fh, 0, (length $value), $value, 0) <= 0 358 (aio_write $fh, 0, (length $value), $value, 0) <= 0
318 and return; 359 and return;
319 360
320 aio_fsync $fh 361 aio_fsync $fh
321 and return; 362 and return;
330} 371}
331 372
332=back 373=back
333 374
334=cut 375=cut
335
336#############################################################################
337
338package cf::path;
339
340sub new {
341 my ($class, $path, $base) = @_;
342
343 $path = $path->as_string if ref $path;
344
345 my $self = bless { }, $class;
346
347 # {... are special paths that are not touched
348 # ?xxx/... are special absolute paths
349 # ?random/... random maps
350 # /! non-realised random map exit
351 # /... normal maps
352 # ~/... per-player maps without a specific player (DO NOT USE)
353 # ~user/... per-player map of a specific user
354
355 if ($path =~ /^{/) {
356 # fine as it is
357 } elsif ($path =~ s{^\?random/}{}) {
358 Coro::AIO::aio_load "$cf::RANDOM_MAPS/$path.meta", my $data;
359 $self->{random} = cf::from_json $data;
360 } else {
361 if ($path =~ s{^~([^/]+)?}{}) {
362 $self->{user_rel} = 1;
363
364 if (defined $1) {
365 $self->{user} = $1;
366 } elsif ($base =~ m{^~([^/]+)/}) {
367 $self->{user} = $1;
368 } else {
369 warn "cannot resolve user-relative path without user <$path,$base>\n";
370 }
371 } elsif ($path =~ /^\//) {
372 # already absolute
373 } else {
374 $base =~ s{[^/]+/?$}{};
375 return $class->new ("$base/$path");
376 }
377
378 for ($path) {
379 redo if s{/\.?/}{/};
380 redo if s{/[^/]+/\.\./}{/};
381 }
382 }
383
384 $self->{path} = $path;
385
386 $self
387}
388
389# the name / primary key / in-game path
390sub as_string {
391 my ($self) = @_;
392
393 $self->{user_rel} ? "~$self->{user}$self->{path}"
394 : $self->{random} ? "?random/$self->{path}"
395 : $self->{path}
396}
397
398# the displayed name, this is a one way mapping
399sub visible_name {
400 my ($self) = @_;
401
402# if (my $rmp = $self->{random}) {
403# # todo: be more intelligent about this
404# "?random/$rmp->{origin_map}+$rmp->{origin_x}+$rmp->{origin_y}/$rmp->{dungeon_level}"
405# } else {
406 $self->as_string
407# }
408}
409
410# escape the /'s in the path
411sub _escaped_path {
412 # ∕ is U+2215
413 (my $path = $_[0]{path}) =~ s/\//∕/g;
414 $path
415}
416
417# the original (read-only) location
418sub load_path {
419 my ($self) = @_;
420
421 sprintf "%s/%s/%s", cf::datadir, cf::mapdir, $self->{path}
422}
423
424# the temporary/swap location
425sub save_path {
426 my ($self) = @_;
427
428 $self->{user_rel} ? sprintf "%s/%s/%s/%s", cf::localdir, cf::playerdir, $self->{user}, $self->_escaped_path
429 : $self->{random} ? sprintf "%s/%s", $RANDOM_MAPS, $self->{path}
430 : sprintf "%s/%s/%s", cf::localdir, cf::tmpdir, $self->_escaped_path
431}
432
433# the unique path, might be eq to save_path
434sub uniq_path {
435 my ($self) = @_;
436
437 $self->{user_rel} || $self->{random}
438 ? undef
439 : sprintf "%s/%s/%s", cf::localdir, cf::uniquedir, $self->_escaped_path
440}
441
442# return random map parameters, or undef
443sub random_map_params {
444 my ($self) = @_;
445
446 $self->{random}
447}
448
449# this is somewhat ugly, but style maps do need special treatment
450sub is_style_map {
451 $_[0]{path} =~ m{^/styles/}
452}
453
454package cf;
455 376
456############################################################################# 377#############################################################################
457 378
458=head2 ATTACHABLE OBJECTS 379=head2 ATTACHABLE OBJECTS
459 380
585our @CB_TYPE = (); # registry for type (cf-object class) based events 506our @CB_TYPE = (); # registry for type (cf-object class) based events
586our @CB_MAP = (); 507our @CB_MAP = ();
587 508
588my %attachment; 509my %attachment;
589 510
511sub cf::attachable::thawer_merge {
512 # simply override everything except _meta
513 local $_[0]{_meta};
514 %{$_[0]} = %{$_[1]};
515}
516
590sub _attach_cb($$$$) { 517sub _attach_cb($$$$) {
591 my ($registry, $event, $prio, $cb) = @_; 518 my ($registry, $event, $prio, $cb) = @_;
592 519
593 use sort 'stable'; 520 use sort 'stable';
594 521
765# object support 692# object support
766 693
767sub reattach { 694sub reattach {
768 # basically do the same as instantiate, without calling instantiate 695 # basically do the same as instantiate, without calling instantiate
769 my ($obj) = @_; 696 my ($obj) = @_;
697
698 bless $obj, ref $obj; # re-bless in case extensions have been reloaded
770 699
771 my $registry = $obj->registry; 700 my $registry = $obj->registry;
772 701
773 @$registry = (); 702 @$registry = ();
774 703
906=cut 835=cut
907 836
908sub register_extcmd { 837sub register_extcmd {
909 my ($name, $cb) = @_; 838 my ($name, $cb) = @_;
910 839
911 my $caller = caller;
912 #warn "registering extcmd '$name' to '$caller'";
913
914 $EXTCMD{$name} = [$cb, $caller]; 840 $EXTCMD{$name} = $cb;
915} 841}
916 842
917cf::player->attach ( 843cf::player->attach (
918 on_command => sub { 844 on_command => sub {
919 my ($pl, $name, $params) = @_; 845 my ($pl, $name, $params) = @_;
932 858
933 my $msg = eval { from_json $buf }; 859 my $msg = eval { from_json $buf };
934 860
935 if (ref $msg) { 861 if (ref $msg) {
936 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 862 if (my $cb = $EXTCMD{$msg->{msgtype}}) {
937 if (my %reply = $cb->[0]->($pl, $msg)) { 863 if (my %reply = $cb->($pl, $msg)) {
938 $pl->ext_reply ($msg->{msgid}, %reply); 864 $pl->ext_reply ($msg->{msgid}, %reply);
939 } 865 }
940 } 866 }
941 } else { 867 } else {
942 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 868 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
944 870
945 cf::override; 871 cf::override;
946 }, 872 },
947); 873);
948 874
949sub register {
950 my ($base, $pkg) = @_;
951
952 #TODO
953}
954
955sub load_extension { 875sub load_extension {
956 my ($path) = @_; 876 my ($path) = @_;
957 877
958 $path =~ /([^\/\\]+)\.ext$/ or die "$path"; 878 $path =~ /([^\/\\]+)\.ext$/ or die "$path";
959 my $base = $1; 879 my $base = $1;
960 my $pkg = $1; 880 my $pkg = $1;
961 $pkg =~ s/[^[:word:]]/_/g; 881 $pkg =~ s/[^[:word:]]/_/g;
962 $pkg = "ext::$pkg"; 882 $pkg = "ext::$pkg";
963 883
964 warn "loading '$path' into '$pkg'\n"; 884 warn "... loading '$path' into '$pkg'\n";
965 885
966 open my $fh, "<:utf8", $path 886 open my $fh, "<:utf8", $path
967 or die "$path: $!"; 887 or die "$path: $!";
968 888
969 my $source = 889 my $source =
970 "package $pkg; use strict; use utf8;\n" 890 "package $pkg; use strict; use utf8;\n"
971 . "#line 1 \"$path\"\n{\n" 891 . "#line 1 \"$path\"\n{\n"
972 . (do { local $/; <$fh> }) 892 . (do { local $/; <$fh> })
973 . "\n};\n1"; 893 . "\n};\n1";
974 894
975 eval $source 895 unless (eval $source) {
976 or die $@ ? "$path: $@\n" 896 my $msg = $@ ? "$path: $@\n"
977 : "extension disabled.\n"; 897 : "extension disabled.\n";
978 898 if ($source =~ /^#!.*perl.*#.*MANDATORY/m) { # ugly match
979 push @exts, $pkg; 899 warn $@;
980 $ext_pkg{$base} = $pkg; 900 warn "mandatory extension failed to load, exiting.\n";
981 901 exit 1;
982# no strict 'refs'; 902 }
983# @{"$pkg\::ISA"} = ext::; 903 die $@;
984
985 register $base, $pkg;
986}
987
988sub unload_extension {
989 my ($pkg) = @_;
990
991 warn "removing extension $pkg\n";
992
993 # remove hooks
994 #TODO
995# for my $idx (0 .. $#PLUGIN_EVENT) {
996# delete $hook[$idx]{$pkg};
997# } 904 }
998 905
999 # remove commands 906 push @EXTS, $pkg;
1000 for my $name (keys %COMMAND) {
1001 my @cb = grep $_->[0] ne $pkg, @{ $COMMAND{$name} };
1002
1003 if (@cb) {
1004 $COMMAND{$name} = \@cb;
1005 } else {
1006 delete $COMMAND{$name};
1007 }
1008 }
1009
1010 # remove extcmds
1011 for my $name (grep $EXTCMD{$_}[1] eq $pkg, keys %EXTCMD) {
1012 delete $EXTCMD{$name};
1013 }
1014
1015 if (my $cb = $pkg->can ("unload")) {
1016 eval {
1017 $cb->($pkg);
1018 1
1019 } or warn "$pkg unloaded, but with errors: $@";
1020 }
1021
1022 Symbol::delete_package $pkg;
1023} 907}
1024 908
1025sub load_extensions { 909sub load_extensions {
1026 for my $ext (<$LIBDIR/*.ext>) { 910 for my $ext (<$LIBDIR/*.ext>) {
1027 next unless -r $ext; 911 next unless -r $ext;
1031 } or warn "$ext not loaded: $@"; 915 } or warn "$ext not loaded: $@";
1032 } 916 }
1033} 917}
1034 918
1035############################################################################# 919#############################################################################
1036# load/save/clean perl data associated with a map
1037
1038*cf::mapsupport::on_clean = sub {
1039 my ($map) = @_;
1040
1041 my $path = $map->tmpname;
1042 defined $path or return;
1043
1044 unlink "$path.pst";
1045};
1046
1047cf::map->attach (prio => -10000, package => cf::mapsupport::);
1048
1049#############################################################################
1050# load/save perl data associated with player->ob objects
1051
1052sub all_objects(@) {
1053 @_, map all_objects ($_->inv), @_
1054}
1055
1056# TODO: compatibility cruft, remove when no longer needed
1057cf::player->attach (
1058 on_load => sub {
1059 my ($pl, $path) = @_;
1060
1061 for my $o (all_objects $pl->ob) {
1062 if (my $value = $o->get_ob_key_value ("_perl_data")) {
1063 $o->set_ob_key_value ("_perl_data");
1064
1065 %$o = %{ Storable::thaw pack "H*", $value };
1066 }
1067 }
1068 },
1069);
1070
1071#############################################################################
1072 920
1073=head2 CORE EXTENSIONS 921=head2 CORE EXTENSIONS
1074 922
1075Functions and methods that extend core crossfire objects. 923Functions and methods that extend core crossfire objects.
1076 924
1077=cut 925=cut
1078 926
1079package cf::player; 927package cf::player;
928
929use Coro::AIO;
1080 930
1081=head3 cf::player 931=head3 cf::player
1082 932
1083=over 4 933=over 4
1084 934
1110 960
1111sub exists($) { 961sub exists($) {
1112 my ($login) = @_; 962 my ($login) = @_;
1113 963
1114 $cf::PLAYER{$login} 964 $cf::PLAYER{$login}
1115 or cf::sync_job { !aio_stat $login } 965 or cf::sync_job { !aio_stat path $login }
1116} 966}
1117 967
1118sub find($) { 968sub find($) {
1119 return $cf::PLAYER{$_[0]} || do { 969 return $cf::PLAYER{$_[0]} || do {
1120 my $login = $_[0]; 970 my $login = $_[0];
1121 971
1122 my $guard = cf::lock_acquire "user_find:$login"; 972 my $guard = cf::lock_acquire "user_find:$login";
1123 973
1124 $cf::PLAYER{$login} ||= (load_pl path $login or return); 974 $cf::PLAYER{$_[0]} || do {
975 my $pl = load_pl path $login
976 or return;
977 $cf::PLAYER{$login} = $pl
978 }
1125 }; 979 }
1126} 980}
1127 981
1128sub save($) { 982sub save($) {
1129 my ($pl) = @_; 983 my ($pl) = @_;
1130 984
1133 my $path = path $pl; 987 my $path = path $pl;
1134 my $guard = cf::lock_acquire "user_save:$path"; 988 my $guard = cf::lock_acquire "user_save:$path";
1135 989
1136 return if $pl->{deny_save}; 990 return if $pl->{deny_save};
1137 991
1138 Coro::AIO::aio_mkdir playerdir $pl, 0770; 992 aio_mkdir playerdir $pl, 0770;
1139 $pl->{last_save} = $cf::RUNTIME; 993 $pl->{last_save} = $cf::RUNTIME;
1140 994
1141 $pl->save_pl ($path); 995 $pl->save_pl ($path);
1142 Coro::cede; 996 Coro::cede;
1143} 997}
1152 1006
1153 $cf::PLAYER{$login} = $self; 1007 $cf::PLAYER{$login} = $self;
1154 1008
1155 $self 1009 $self
1156} 1010}
1011
1012=item $pl->quit_character
1013
1014Nukes the player without looking back. If logged in, the connection will
1015be destroyed. May block for a long time.
1016
1017=cut
1157 1018
1158sub quit_character { 1019sub quit_character {
1159 my ($pl) = @_; 1020 my ($pl) = @_;
1160 1021
1161 $pl->{deny_save} = 1; 1022 $pl->{deny_save} = 1;
1166 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1027 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1167 $pl->ns->destroy if $pl->ns; 1028 $pl->ns->destroy if $pl->ns;
1168 1029
1169 my $path = playerdir $pl; 1030 my $path = playerdir $pl;
1170 my $temp = "$path~$cf::RUNTIME~deleting~"; 1031 my $temp = "$path~$cf::RUNTIME~deleting~";
1171 Coro::AIO::aio_rename $path, $temp; 1032 aio_rename $path, $temp;
1172 delete $cf::PLAYER{$pl->ob->name}; 1033 delete $cf::PLAYER{$pl->ob->name};
1173 $pl->destroy; 1034 $pl->destroy;
1174 IO::AIO::aio_rmtree $temp; 1035 IO::AIO::aio_rmtree $temp;
1175} 1036}
1176 1037
1038=item cf::player::list_logins
1039
1040Returns am arrayref of all valid playernames in the system, can take a
1041while and may block, so not sync_job-capable, ever.
1042
1043=cut
1044
1045sub list_logins {
1046 my $dirs = aio_readdir cf::localdir . "/" . cf::playerdir
1047 or return [];
1048
1049 my @logins;
1050
1051 for my $login (@$dirs) {
1052 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next;
1053 aio_read $fh, 0, 512, my $buf, 0 or next;
1054 $buf !~ /^password -------------$/m or next; # official not-valid tag
1055
1056 utf8::decode $login;
1057 push @logins, $login;
1058 }
1059
1060 \@logins
1061}
1062
1063=item $player->maps
1064
1065Returns an arrayref of map paths that are private for this
1066player. May block.
1067
1068=cut
1069
1070sub maps($) {
1071 my ($pl) = @_;
1072
1073 my $files = aio_readdir playerdir $pl
1074 or return;
1075
1076 my @paths;
1077
1078 for (@$files) {
1079 utf8::decode $_;
1080 next if /\.(?:pl|pst)$/;
1081 next unless /^$PATH_SEP/o;
1082
1083 s/\.map$//;
1084 push @paths, "~" . $pl->ob->name . "/" . $_;
1085 }
1086
1087 \@paths
1088}
1089
1177=item $player->ext_reply ($msgid, $msgtype, %msg) 1090=item $player->ext_reply ($msgid, $msgtype, %msg)
1178 1091
1179Sends an ext reply to the player. 1092Sends an ext reply to the player.
1180 1093
1181=cut 1094=cut
1202package cf::map; 1115package cf::map;
1203 1116
1204use Fcntl; 1117use Fcntl;
1205use Coro::AIO; 1118use Coro::AIO;
1206 1119
1120use overload
1121 '""' => \&as_string,
1122 fallback => 1;
1123
1207our $MAX_RESET = 3600; 1124our $MAX_RESET = 3600;
1208our $DEFAULT_RESET = 3000; 1125our $DEFAULT_RESET = 3000;
1209 1126
1210sub generate_random_map { 1127sub generate_random_map {
1211 my ($path, $rmp) = @_; 1128 my ($self, $rmp) = @_;
1212
1213 # mit "rum" bekleckern, nicht 1129 # mit "rum" bekleckern, nicht
1214 cf::map::_create_random_map 1130 $self->_create_random_map (
1215 $path,
1216 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1131 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1217 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1132 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1218 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1133 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1219 $rmp->{exit_on_final_map}, 1134 $rmp->{exit_on_final_map},
1220 $rmp->{xsize}, $rmp->{ysize}, 1135 $rmp->{xsize}, $rmp->{ysize},
1221 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3}, 1136 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1222 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase}, 1137 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1223 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation}, 1138 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1224 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp}, 1139 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1225 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used}, 1140 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1226 (cf::region::find $rmp->{region}) 1141 (cf::region::find $rmp->{region}), $rmp->{custom}
1142 )
1143}
1144
1145=item cf::map->register ($regex, $prio)
1146
1147Register a handler for the map path matching the given regex at the
1148givne priority (higher is better, built-in handlers have priority 0, the
1149default).
1150
1151=cut
1152
1153sub register {
1154 my (undef, $regex, $prio) = @_;
1155 my $pkg = caller;
1156
1157 no strict;
1158 push @{"$pkg\::ISA"}, __PACKAGE__;
1159
1160 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1161}
1162
1163# also paths starting with '/'
1164$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}];
1165
1166sub thawer_merge {
1167 my ($self, $merge) = @_;
1168
1169 # we have to keep some variables in memory intact
1170 local $self->{path};
1171 local $self->{load_path};
1172 local $self->{deny_save};
1173 local $self->{deny_reset};
1174
1175 $self->SUPER::thawer_merge ($merge);
1176}
1177
1178sub normalise {
1179 my ($path, $base) = @_;
1180
1181 # map plan:
1182 #
1183 # /! non-realised random map exit (special hack!)
1184 # {... are special paths that are not being touched
1185 # ?xxx/... are special absolute paths
1186 # ?random/... random maps
1187 # /... normal maps
1188 # ~user/... per-player map of a specific user
1189
1190 $path =~ s/$PATH_SEP/\//go;
1191
1192 # treat it as relative path if it starts with
1193 # something that looks reasonable
1194 if ($path =~ m{^(?:\./|\.\./|\w)}) {
1195 $base or Carp::carp "normalise called with relative path and no base: '$path'";
1196
1197 $base =~ s{[^/]+/?$}{};
1198 $path = "$base/$path";
1199 }
1200
1201 for ($path) {
1202 redo if s{//}{/};
1203 redo if s{/\.?/}{/};
1204 redo if s{/[^/]+/\.\./}{/};
1205 }
1206
1207 $path
1208}
1209
1210sub new_from_path {
1211 my (undef, $path, $base) = @_;
1212
1213 return $path if UNIVERSAL::isa $path, "cf::map"; # already a map object
1214
1215 $path = normalise $path, $base;
1216
1217 for my $pkg (sort { $EXT_MAP{$b}[0] <=> $EXT_MAP{$a}[0] } keys %EXT_MAP) {
1218 if ($path =~ $EXT_MAP{$pkg}[1]) {
1219 my $self = bless cf::map::new, $pkg;
1220 $self->{path} = $path; $self->path ($path);
1221 $self->init; # pass $1 etc.
1222 return $self;
1223 }
1224 }
1225
1226 Carp::carp "unable to resolve path '$path'.";
1227 ()
1228}
1229
1230sub init {
1231 my ($self) = @_;
1232
1233 $self
1234}
1235
1236sub as_string {
1237 my ($self) = @_;
1238
1239 "$self->{path}"
1240}
1241
1242# the displayed name, this is a one way mapping
1243sub visible_name {
1244 &as_string
1245}
1246
1247# the original (read-only) location
1248sub load_path {
1249 my ($self) = @_;
1250
1251 sprintf "%s/%s/%s", cf::datadir, cf::mapdir, $self->{path}
1252}
1253
1254# the temporary/swap location
1255sub save_path {
1256 my ($self) = @_;
1257
1258 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1259 sprintf "%s/%s/%s", cf::localdir, cf::tmpdir, $path
1260}
1261
1262# the unique path, undef == no special unique path
1263sub uniq_path {
1264 my ($self) = @_;
1265
1266 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1267 sprintf "%s/%s/%s", cf::localdir, cf::uniquedir, $path
1227} 1268}
1228 1269
1229# and all this just because we cannot iterate over 1270# and all this just because we cannot iterate over
1230# all maps in C++... 1271# all maps in C++...
1231sub change_all_map_light { 1272sub change_all_map_light {
1233 1274
1234 $_->change_map_light ($change) 1275 $_->change_map_light ($change)
1235 for grep $_->outdoor, values %cf::MAP; 1276 for grep $_->outdoor, values %cf::MAP;
1236} 1277}
1237 1278
1279sub unlink_save {
1280 my ($self) = @_;
1281
1282 utf8::encode (my $save = $self->save_path);
1283 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save;
1284 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink "$save.pst";
1285}
1286
1238sub try_load_header($) { 1287sub load_header_from($) {
1239 my ($path) = @_; 1288 my ($self, $path) = @_;
1240 1289
1241 utf8::encode $path; 1290 utf8::encode $path;
1242 aio_open $path, O_RDONLY, 0 1291 aio_open $path, O_RDONLY, 0
1243 or return; 1292 or return;
1244 1293
1245 my $map = cf::map::new 1294 $self->_load_header ($path)
1246 or return; 1295 or return;
1247 1296
1248 # for better error messages only, will be overwritten 1297 $self->{load_path} = $path;
1249 $map->path ($path);
1250 1298
1251 $map->load_header ($path) 1299 1
1300}
1301
1302sub load_header_orig {
1303 my ($self) = @_;
1304
1305 $self->load_header_from ($self->load_path)
1306}
1307
1308sub load_header_temp {
1309 my ($self) = @_;
1310
1311 $self->load_header_from ($self->save_path)
1312}
1313
1314sub prepare_temp {
1315 my ($self) = @_;
1316
1317 $self->last_access ((delete $self->{last_access})
1318 || $cf::RUNTIME); #d#
1319 # safety
1320 $self->{instantiate_time} = $cf::RUNTIME
1321 if $self->{instantiate_time} > $cf::RUNTIME;
1322}
1323
1324sub prepare_orig {
1325 my ($self) = @_;
1326
1327 $self->{load_original} = 1;
1328 $self->{instantiate_time} = $cf::RUNTIME;
1329 $self->last_access ($cf::RUNTIME);
1330 $self->instantiate;
1331}
1332
1333sub load_header {
1334 my ($self) = @_;
1335
1336 if ($self->load_header_temp) {
1337 $self->prepare_temp;
1338 } else {
1339 $self->load_header_orig
1252 or return; 1340 or return;
1341 $self->prepare_orig;
1342 }
1253 1343
1254 $map->{load_path} = $path; 1344 1
1255
1256 $map
1257} 1345}
1258 1346
1259sub find; 1347sub find;
1260sub find { 1348sub find {
1261 my ($path, $origin) = @_; 1349 my ($path, $origin) = @_;
1262 1350
1263 #warn "find<$path,$origin>\n";#d#
1264
1265 $path = new cf::path $path, $origin && $origin->path; 1351 $path = normalise $path, $origin && $origin->path;
1266 my $key = $path->as_string;
1267 1352
1268 cf::lock_wait "map_find:$key"; 1353 cf::lock_wait "map_find:$path";
1269 1354
1270 $cf::MAP{$key} || do { 1355 $cf::MAP{$path} || do {
1271 my $guard = cf::lock_acquire "map_find:$key"; 1356 my $guard = cf::lock_acquire "map_find:$path";
1272 1357 my $map = new_from_path cf::map $path
1273 # do it the slow way
1274 my $map = try_load_header $path->save_path;
1275
1276 Coro::cede;
1277
1278 if ($map) {
1279 $map->last_access ((delete $map->{last_access})
1280 || $cf::RUNTIME); #d#
1281 # safety
1282 $map->{instantiate_time} = $cf::RUNTIME
1283 if $map->{instantiate_time} > $cf::RUNTIME;
1284 } else {
1285 if (my $rmp = $path->random_map_params) {
1286 $map = generate_random_map $key, $rmp;
1287 } else {
1288 $map = try_load_header $path->load_path;
1289 }
1290
1291 $map or return; 1358 or return;
1292 1359
1293 $map->{load_original} = 1;
1294 $map->{instantiate_time} = $cf::RUNTIME;
1295 $map->last_access ($cf::RUNTIME);
1296 $map->instantiate;
1297
1298 # per-player maps become, after loading, normal maps
1299 $map->per_player (0) if $path->{user_rel};
1300 }
1301
1302 $map->path ($key);
1303 $map->{path} = $path;
1304 $map->{last_save} = $cf::RUNTIME; 1360 $map->{last_save} = $cf::RUNTIME;
1305 1361
1306 Coro::cede; 1362 $map->load_header
1363 or return;
1307 1364
1308 if ($map->should_reset) { 1365 if ($map->should_reset) {
1366 # doing this can freeze the server in a sync job, obviously
1367 #$cf::WAIT_FOR_TICK->wait;
1309 $map->reset; 1368 $map->reset;
1310 undef $guard; 1369 undef $guard;
1311 $map = find $path 1370 $map = find $path
1312 or return; 1371 or return;
1313 } 1372 }
1314 1373
1315 $cf::MAP{$key} = $map 1374 $cf::MAP{$path} = $map
1316 } 1375 }
1317} 1376}
1377
1378sub pre_load { }
1379sub post_load { }
1318 1380
1319sub load { 1381sub load {
1320 my ($self) = @_; 1382 my ($self) = @_;
1321 1383
1322 my $path = $self->{path}; 1384 my $path = $self->{path};
1323 my $guard = cf::lock_acquire "map_load:" . $path->as_string; 1385 my $guard = cf::lock_acquire "map_load:$path";
1324 1386
1325 return if $self->in_memory != cf::MAP_SWAPPED; 1387 return if $self->in_memory != cf::MAP_SWAPPED;
1326 1388
1327 $self->in_memory (cf::MAP_LOADING); 1389 $self->in_memory (cf::MAP_LOADING);
1328 1390
1329 $self->alloc; 1391 $self->alloc;
1392
1393 $self->pre_load;
1394
1330 $self->load_objects ($self->{load_path}, 1) 1395 $self->_load_objects ($self->{load_path}, 1)
1331 or return; 1396 or return;
1332 1397
1333 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1398 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1334 if delete $self->{load_original}; 1399 if delete $self->{load_original};
1335 1400
1336 if (my $uniq = $path->uniq_path) { 1401 if (my $uniq = $self->uniq_path) {
1337 utf8::encode $uniq; 1402 utf8::encode $uniq;
1338 if (aio_open $uniq, O_RDONLY, 0) { 1403 if (aio_open $uniq, O_RDONLY, 0) {
1339 $self->clear_unique_items; 1404 $self->clear_unique_items;
1340 $self->load_objects ($uniq, 0); 1405 $self->_load_objects ($uniq, 0);
1341 } 1406 }
1342 } 1407 }
1343 1408
1344 Coro::cede; 1409 Coro::cede;
1345 1410
1346 # now do the right thing for maps 1411 # now do the right thing for maps
1347 $self->link_multipart_objects; 1412 $self->link_multipart_objects;
1348 1413
1349 if ($self->{path}->is_style_map) { 1414 unless ($self->{deny_activate}) {
1350 $self->{deny_save} = 1; 1415 $self->decay_objects;
1351 $self->{deny_reset} = 1;
1352 } else {
1353 $self->fix_auto_apply; 1416 $self->fix_auto_apply;
1354 $self->decay_objects;
1355 $self->update_buttons; 1417 $self->update_buttons;
1418 Coro::cede;
1356 $self->set_darkness_map; 1419 $self->set_darkness_map;
1357 $self->difficulty ($self->estimate_difficulty) 1420 $self->difficulty ($self->estimate_difficulty)
1358 unless $self->difficulty; 1421 unless $self->difficulty;
1422 Coro::cede;
1359 $self->activate; 1423 $self->activate;
1360 } 1424 }
1361 1425
1362 Coro::cede; 1426 $self->post_load;
1363 1427
1364 $self->in_memory (cf::MAP_IN_MEMORY); 1428 $self->in_memory (cf::MAP_IN_MEMORY);
1429}
1430
1431sub customise_for {
1432 my ($self, $ob) = @_;
1433
1434 return find "~" . $ob->name . "/" . $self->{path}
1435 if $self->per_player;
1436
1437 $self
1438}
1439
1440# find and load all maps in the 3x3 area around a map
1441sub load_diag {
1442 my ($map) = @_;
1443
1444 my @diag; # diagonal neighbours
1445
1446 for (0 .. 3) {
1447 my $neigh = $map->tile_path ($_)
1448 or next;
1449 $neigh = find $neigh, $map
1450 or next;
1451 $neigh->load;
1452
1453 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh],
1454 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1455 }
1456
1457 for (@diag) {
1458 my $neigh = find @$_
1459 or next;
1460 $neigh->load;
1461 }
1365} 1462}
1366 1463
1367sub find_sync { 1464sub find_sync {
1368 my ($path, $origin) = @_; 1465 my ($path, $origin) = @_;
1369 1466
1370 cf::sync_job { cf::map::find $path, $origin } 1467 cf::sync_job { find $path, $origin }
1371} 1468}
1372 1469
1373sub do_load_sync { 1470sub do_load_sync {
1374 my ($map) = @_; 1471 my ($map) = @_;
1375 1472
1376 cf::sync_job { $map->load }; 1473 cf::sync_job { $map->load };
1377} 1474}
1378 1475
1476our %MAP_PREFETCH;
1477our $MAP_PREFETCHER = undef;
1478
1479sub find_async {
1480 my ($path, $origin) = @_;
1481
1482 $path = normalise $path, $origin && $origin->{path};
1483
1484 if (my $map = $cf::MAP{$path}) {
1485 return $map if $map->in_memory == cf::MAP_IN_MEMORY;
1486 }
1487
1488 undef $MAP_PREFETCH{$path};
1489 $MAP_PREFETCHER ||= cf::async {
1490 while (%MAP_PREFETCH) {
1491 for my $path (keys %MAP_PREFETCH) {
1492 my $map = find $path
1493 or next;
1494 $map->load;
1495
1496 delete $MAP_PREFETCH{$path};
1497 }
1498 }
1499 undef $MAP_PREFETCHER;
1500 };
1501 $MAP_PREFETCHER->prio (6);
1502
1503 ()
1504}
1505
1379sub save { 1506sub save {
1380 my ($self) = @_; 1507 my ($self) = @_;
1381 1508
1382 my $lock = cf::lock_acquire "map_data:" . $self->path; 1509 my $lock = cf::lock_acquire "map_data:" . $self->path;
1383 1510
1384 $self->{last_save} = $cf::RUNTIME; 1511 $self->{last_save} = $cf::RUNTIME;
1385 1512
1386 return unless $self->dirty; 1513 return unless $self->dirty;
1387 1514
1388 my $save = $self->{path}->save_path; utf8::encode $save; 1515 my $save = $self->save_path; utf8::encode $save;
1389 my $uniq = $self->{path}->uniq_path; utf8::encode $uniq; 1516 my $uniq = $self->uniq_path; utf8::encode $uniq;
1390 1517
1391 $self->{load_path} = $save; 1518 $self->{load_path} = $save;
1392 1519
1393 return if $self->{deny_save}; 1520 return if $self->{deny_save};
1394 1521
1397 cf::async { 1524 cf::async {
1398 $_->contr->save for $self->players; 1525 $_->contr->save for $self->players;
1399 }; 1526 };
1400 1527
1401 if ($uniq) { 1528 if ($uniq) {
1402 $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 1529 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
1403 $self->save_objects ($uniq, cf::IO_UNIQUES); 1530 $self->_save_objects ($uniq, cf::IO_UNIQUES);
1404 } else { 1531 } else {
1405 $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 1532 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
1406 } 1533 }
1407} 1534}
1408 1535
1409sub swap_out { 1536sub swap_out {
1410 my ($self) = @_; 1537 my ($self) = @_;
1424 1551
1425sub reset_at { 1552sub reset_at {
1426 my ($self) = @_; 1553 my ($self) = @_;
1427 1554
1428 # TODO: safety, remove and allow resettable per-player maps 1555 # TODO: safety, remove and allow resettable per-player maps
1429 return 1e99 if $self->{path}{user_rel}; 1556 return 1e99 if $self->isa ("ext::map_per_player");#d#
1430 return 1e99 if $self->{deny_reset}; 1557 return 1e99 if $self->{deny_reset};
1431 1558
1432 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access; 1559 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
1433 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET; 1560 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
1434 1561
1439 my ($self) = @_; 1566 my ($self) = @_;
1440 1567
1441 $self->reset_at <= $cf::RUNTIME 1568 $self->reset_at <= $cf::RUNTIME
1442} 1569}
1443 1570
1444sub unlink_save {
1445 my ($self) = @_;
1446
1447 utf8::encode (my $save = $self->{path}->save_path);
1448 aioreq_pri 3; IO::AIO::aio_unlink $save;
1449 aioreq_pri 3; IO::AIO::aio_unlink "$save.pst";
1450}
1451
1452sub rename {
1453 my ($self, $new_path) = @_;
1454
1455 $self->unlink_save;
1456
1457 delete $cf::MAP{$self->path};
1458 $self->{path} = new cf::path $new_path;
1459 $self->path ($self->{path}->as_string);
1460 $cf::MAP{$self->path} = $self;
1461
1462 $self->save;
1463}
1464
1465sub reset { 1571sub reset {
1466 my ($self) = @_; 1572 my ($self) = @_;
1467 1573
1468 my $lock = cf::lock_acquire "map_data:" . $self->path; 1574 my $lock = cf::lock_acquire "map_data:$self->{path}";
1469 1575
1470 return if $self->players; 1576 return if $self->players;
1471 return if $self->{path}{user_rel};#d# 1577 return if $self->isa ("ext::map_per_player");#d#
1472 1578
1473 warn "resetting map ", $self->path;#d# 1579 warn "resetting map ", $self->path;#d#
1474 1580
1475 delete $cf::MAP{$self->path}; 1581 delete $cf::MAP{$self->path};
1582
1583 $self->in_memory (cf::MAP_SWAPPED);
1584 $self->clear;
1476 1585
1477 $_->clear_links_to ($self) for values %cf::MAP; 1586 $_->clear_links_to ($self) for values %cf::MAP;
1478 1587
1479 $self->unlink_save; 1588 $self->unlink_save;
1480 $self->destroy; 1589 $self->destroy;
1483my $nuke_counter = "aaaa"; 1592my $nuke_counter = "aaaa";
1484 1593
1485sub nuke { 1594sub nuke {
1486 my ($self) = @_; 1595 my ($self) = @_;
1487 1596
1597 delete $cf::MAP{$self->path};
1598
1599 $self->unlink_save;
1600
1601 bless $self, "cf::map";
1602 delete $self->{deny_reset};
1488 $self->{deny_save} = 1; 1603 $self->{deny_save} = 1;
1489 $self->reset_timeout (1); 1604 $self->reset_timeout (1);
1490 $self->rename ("{nuke}/" . ($nuke_counter++)); 1605 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
1606
1607 $cf::MAP{$self->path} = $self;
1608
1491 $self->reset; # polite request, might not happen 1609 $self->reset; # polite request, might not happen
1492} 1610}
1493 1611
1494sub customise_for { 1612=item cf::map::unique_maps
1495 my ($map, $ob) = @_;
1496 1613
1497 if ($map->per_player) { 1614Returns an arrayref of paths of all shared maps that have
1498 return cf::map::find "~" . $ob->name . "/" . $map->{path}{path}; 1615instantiated unique items. May block.
1499 }
1500 1616
1501 $map 1617=cut
1502}
1503 1618
1504sub emergency_save { 1619sub unique_maps() {
1505 my $freeze_guard = cf::freeze_mainloop; 1620 my $files = aio_readdir cf::localdir . "/" . cf::uniquedir
1621 or return;
1506 1622
1507 warn "enter emergency perl save\n"; 1623 my @paths;
1508 1624
1509 cf::sync_job { 1625 for (@$files) {
1510 warn "begin emergency player save\n"; 1626 utf8::decode $_;
1511 $_->save for values %cf::PLAYER; 1627 next if /\.pst$/;
1512 warn "end emergency player save\n"; 1628 next unless /^$PATH_SEP/o;
1513 1629
1514 warn "begin emergency map save\n"; 1630 s/\.map$//;
1515 $_->save for values %cf::MAP; 1631 push @paths, $_;
1516 warn "end emergency map save\n";
1517 }; 1632 }
1518 1633
1519 warn "leave emergency perl save\n"; 1634 \@paths
1520} 1635}
1521 1636
1522package cf; 1637package cf;
1523 1638
1524=back 1639=back
1525 1640
1641=head3 cf::object
1642
1643=cut
1644
1645package cf::object;
1646
1647=over 4
1648
1649=item $ob->inv_recursive
1650
1651Returns the inventory of the object _and_ their inventories, recursively.
1652
1653=cut
1654
1655sub inv_recursive_;
1656sub inv_recursive_ {
1657 map { $_, inv_recursive_ $_->inv } @_
1658}
1659
1660sub inv_recursive {
1661 inv_recursive_ inv $_[0]
1662}
1663
1664package cf;
1665
1666=back
1526 1667
1527=head3 cf::object::player 1668=head3 cf::object::player
1528 1669
1529=over 4 1670=over 4
1530 1671
1570 1711
1571=item $player_object->enter_link 1712=item $player_object->enter_link
1572 1713
1573Freezes the player and moves him/her to a special map (C<{link}>). 1714Freezes the player and moves him/her to a special map (C<{link}>).
1574 1715
1575The player should be reaosnably safe there for short amounts of time. You 1716The player should be reasonably safe there for short amounts of time. You
1576I<MUST> call C<leave_link> as soon as possible, though. 1717I<MUST> call C<leave_link> as soon as possible, though.
1577 1718
1719Will never block.
1720
1578=item $player_object->leave_link ($map, $x, $y) 1721=item $player_object->leave_link ($map, $x, $y)
1579 1722
1580Moves the player out of the specila link map onto the given map. If the 1723Moves the player out of the special C<{link}> map onto the specified
1581map is not valid (or omitted), the player will be moved back to the 1724map. If the map is not valid (or omitted), the player will be moved back
1582location he/she was before the call to C<enter_link>, or, if that fails, 1725to the location he/she was before the call to C<enter_link>, or, if that
1583to the emergency map position. 1726fails, to the emergency map position.
1584 1727
1585Might block. 1728Might block.
1586 1729
1587=cut 1730=cut
1731
1732sub link_map {
1733 unless ($LINK_MAP) {
1734 $LINK_MAP = cf::map::find "{link}"
1735 or do { warn "FATAL: unable to provide {link} map, exiting."; exit 1 };
1736 $LINK_MAP->load;
1737 }
1738
1739 $LINK_MAP
1740}
1588 1741
1589sub cf::object::player::enter_link { 1742sub cf::object::player::enter_link {
1590 my ($self) = @_; 1743 my ($self) = @_;
1591 1744
1592 $self->deactivate_recursive; 1745 $self->deactivate_recursive;
1593 1746
1594 return if $self->map == $LINK_MAP; 1747 return if UNIVERSAL::isa $self->map, "ext::map_link";
1595 1748
1596 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 1749 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
1597 if $self->map; 1750 if $self->map;
1598 1751
1599 $self->enter_map ($LINK_MAP, 20, 20); 1752 $self->enter_map ($LINK_MAP || link_map, 20, 20);
1600} 1753}
1601 1754
1602sub cf::object::player::leave_link { 1755sub cf::object::player::leave_link {
1603 my ($self, $map, $x, $y) = @_; 1756 my ($self, $map, $x, $y) = @_;
1604 1757
1622 # use -1 or undef as default coordinates, not 0, 0 1775 # use -1 or undef as default coordinates, not 0, 0
1623 ($x, $y) = ($map->enter_x, $map->enter_y) 1776 ($x, $y) = ($map->enter_x, $map->enter_y)
1624 if $x <=0 && $y <= 0; 1777 if $x <=0 && $y <= 0;
1625 1778
1626 $map->load; 1779 $map->load;
1780 $map->load_diag;
1627 1781
1628 return unless $self->contr->active; 1782 return unless $self->contr->active;
1629 $self->activate_recursive; 1783 $self->activate_recursive;
1630 $self->enter_map ($map, $x, $y); 1784 $self->enter_map ($map, $x, $y);
1631} 1785}
1670 my ($self, $path, $x, $y) = @_; 1824 my ($self, $path, $x, $y) = @_;
1671 1825
1672 $self->enter_link; 1826 $self->enter_link;
1673 1827
1674 (async { 1828 (async {
1675 $path = new cf::path $path;
1676
1677 my $map = cf::map::find $path->as_string; 1829 my $map = cf::map::find $path;
1678 $map = $map->customise_for ($self) if $map; 1830 $map = $map->customise_for ($self) if $map;
1679 1831
1680# warn "entering ", $map->path, " at ($x, $y)\n" 1832# warn "entering ", $map->path, " at ($x, $y)\n"
1681# if $map; 1833# if $map;
1682 1834
1683 $map or $map->cluck ("oy");#d#
1684 $map or $self->message ("The exit to '" . ($path->visible_name) . "' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 1835 $map or $self->message ("The exit to '" . ($path->visible_name) . "' is closed", cf::NDI_UNIQUE | cf::NDI_RED);
1685 1836
1686 $self->leave_link ($map, $x, $y); 1837 $self->leave_link ($map, $x, $y);
1687 })->prio (1); 1838 })->prio (1);
1688} 1839}
1693 1844
1694sub parse_random_map_params { 1845sub parse_random_map_params {
1695 my ($spec) = @_; 1846 my ($spec) = @_;
1696 1847
1697 my $rmp = { # defaults 1848 my $rmp = { # defaults
1698 xsize => 10, 1849 xsize => (cf::rndm 15, 40),
1699 ysize => 10, 1850 ysize => (cf::rndm 15, 40),
1851 symmetry => (cf::rndm 1, cf::SYMMETRY_XY),
1852 #layout => string,
1700 }; 1853 };
1701 1854
1702 for (split /\n/, $spec) { 1855 for (split /\n/, $spec) {
1703 my ($k, $v) = split /\s+/, $_, 2; 1856 my ($k, $v) = split /\s+/, $_, 2;
1704 1857
1708 $rmp 1861 $rmp
1709} 1862}
1710 1863
1711sub prepare_random_map { 1864sub prepare_random_map {
1712 my ($exit) = @_; 1865 my ($exit) = @_;
1866
1867 my $guard = cf::lock_acquire "exit_prepare:$exit";
1713 1868
1714 # all this does is basically replace the /! path by 1869 # all this does is basically replace the /! path by
1715 # a new random map path (?random/...) with a seed 1870 # a new random map path (?random/...) with a seed
1716 # that depends on the exit object 1871 # that depends on the exit object
1717 1872
1726 1881
1727 $rmp->{random_seed} ||= $exit->random_seed; 1882 $rmp->{random_seed} ||= $exit->random_seed;
1728 1883
1729 my $data = cf::to_json $rmp; 1884 my $data = cf::to_json $rmp;
1730 my $md5 = Digest::MD5::md5_hex $data; 1885 my $md5 = Digest::MD5::md5_hex $data;
1886 my $meta = "$cf::RANDOM_MAPS/$md5.meta";
1731 1887
1732 if (my $fh = aio_open "$cf::RANDOM_MAPS/$md5.meta", O_WRONLY | O_CREAT, 0666) { 1888 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
1733 aio_write $fh, 0, (length $data), $data, 0; 1889 aio_write $fh, 0, (length $data), $data, 0;
1890 undef $fh;
1891 aio_rename "$meta~", $meta;
1734 1892
1735 $exit->slaying ("?random/$md5"); 1893 $exit->slaying ("?random/$md5");
1736 $exit->msg (undef); 1894 $exit->msg (undef);
1737 } 1895 }
1738} 1896}
1748 $self->deactivate_recursive; # just to be sure 1906 $self->deactivate_recursive; # just to be sure
1749 unless (eval { 1907 unless (eval {
1750 prepare_random_map $exit 1908 prepare_random_map $exit
1751 if $exit->slaying eq "/!"; 1909 if $exit->slaying eq "/!";
1752 1910
1753 my $path = new cf::path $exit->slaying, $exit->map && $exit->map->path; 1911 my $path = new_from_path cf::map $exit->slaying, $exit->map && $exit->map->path;
1754 $self->goto ($path, $exit->stats->hp, $exit->stats->sp); 1912 $self->goto ($path, $exit->stats->hp, $exit->stats->sp);
1755 1913
1756 1; 1914 1;
1757 }) { 1915 }) {
1758 $self->message ("Something went wrong deep within the crossfire server. " 1916 $self->message ("Something went wrong deep within the crossfire server. "
1759 . "I'll try to bring you back to the map you were before. " 1917 . "I'll try to bring you back to the map you were before. "
1760 . "Please report this to the dungeon master", 1918 . "Please report this to the dungeon master!",
1761 cf::NDI_UNIQUE | cf::NDI_RED); 1919 cf::NDI_UNIQUE | cf::NDI_RED);
1762 1920
1763 warn "ERROR in enter_exit: $@"; 1921 warn "ERROR in enter_exit: $@";
1764 $self->leave_link; 1922 $self->leave_link;
1765 } 1923 }
2048 sub db_sync() { 2206 sub db_sync() {
2049 db_save if $dirty; 2207 db_save if $dirty;
2050 undef $dirty; 2208 undef $dirty;
2051 } 2209 }
2052 2210
2053 my $idle = Event->idle (min => $TICK * 2.8, max => 10, repeat => 0, data => WF_AUTOCANCEL, cb => sub { 2211 my $idle = Event->idle (
2054 db_sync; 2212 reentrant => 0,
2213 min => 10,
2214 max => 20,
2215 repeat => 0,
2216 data => WF_AUTOCANCEL,
2217 cb => \&db_sync,
2055 }); 2218 );
2056 2219
2057 sub db_dirty() { 2220 sub db_dirty() {
2058 $dirty = 1; 2221 $dirty = 1;
2059 $idle->start; 2222 $idle->start;
2060 } 2223 }
2108 2271
2109sub main { 2272sub main {
2110 # we must not ever block the main coroutine 2273 # we must not ever block the main coroutine
2111 local $Coro::idle = sub { 2274 local $Coro::idle = sub {
2112 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 2275 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
2276 (async {
2113 async { Event::one_event }; 2277 Event::one_event;
2278 })->prio (Coro::PRIO_MAX);
2114 }; 2279 };
2115 2280
2116 cfg_load; 2281 cfg_load;
2117 db_load; 2282 db_load;
2118 load_extensions; 2283 load_extensions;
2284
2285 $TICK_WATCHER->start;
2119 Event::loop; 2286 Event::loop;
2120} 2287}
2121 2288
2122############################################################################# 2289#############################################################################
2123# initialisation 2290# initialisation and cleanup
2291
2292# install some emergency cleanup handlers
2293BEGIN {
2294 for my $signal (qw(INT HUP TERM)) {
2295 Event->signal (
2296 reentrant => 0,
2297 data => WF_AUTOCANCEL,
2298 signal => $signal,
2299 cb => sub {
2300 cf::cleanup "SIG$signal";
2301 },
2302 );
2303 }
2304}
2305
2306sub emergency_save() {
2307 my $freeze_guard = cf::freeze_mainloop;
2308
2309 warn "enter emergency perl save\n";
2310
2311 cf::sync_job {
2312 # use a peculiar iteration method to avoid tripping on perl
2313 # refcount bugs in for. also avoids problems with players
2314 # and maps saved/destroyed asynchronously.
2315 warn "begin emergency player save\n";
2316 for my $login (keys %cf::PLAYER) {
2317 my $pl = $cf::PLAYER{$login} or next;
2318 $pl->valid or next;
2319 $pl->save;
2320 }
2321 warn "end emergency player save\n";
2322
2323 warn "begin emergency map save\n";
2324 for my $path (keys %cf::MAP) {
2325 my $map = $cf::MAP{$path} or next;
2326 $map->valid or next;
2327 $map->save;
2328 }
2329 warn "end emergency map save\n";
2330 };
2331
2332 warn "leave emergency perl save\n";
2333}
2124 2334
2125sub reload() { 2335sub reload() {
2126 # can/must only be called in main 2336 # can/must only be called in main
2127 if ($Coro::current != $Coro::main) { 2337 if ($Coro::current != $Coro::main) {
2128 warn "can only reload from main coroutine\n"; 2338 warn "can only reload from main coroutine";
2129 return; 2339 return;
2130 } 2340 }
2131 2341
2132 warn "reloading..."; 2342 warn "reloading...";
2133 2343
2134 my $guard = freeze_mainloop; 2344 warn "cancelling server ticker";
2345 $TICK_WATCHER->cancel;
2346
2135 cf::emergency_save; 2347 cf::emergency_save;
2136 2348
2137 eval { 2349 eval {
2138 # if anything goes wrong in here, we should simply crash as we already saved 2350 # if anything goes wrong in here, we should simply crash as we already saved
2139 2351
2140 # cancel all watchers 2352 warn "syncing database to disk";
2353 cf::db_sync;
2354
2355 warn "cancelling all WF_AUTOCANCEL watchers";
2141 for (Event::all_watchers) { 2356 for (Event::all_watchers) {
2142 $_->cancel if $_->data & WF_AUTOCANCEL; 2357 $_->cancel if $_->data & WF_AUTOCANCEL;
2143 } 2358 }
2144 2359
2360 warn "flushing outstanding aio requests";
2361 for (;;) {
2362 IO::AIO::flush;
2363 Coro::cede;
2364 last unless IO::AIO::nreqs;
2365 warn "iterate...";
2366 }
2367
2145 # cancel all extension coros 2368 warn "cancelling all extension coros";
2146 $_->cancel for values %EXT_CORO; 2369 $_->cancel for values %EXT_CORO;
2147 %EXT_CORO = (); 2370 %EXT_CORO = ();
2148 2371
2149 # unload all extensions 2372 warn "removing commands";
2150 for (@exts) { 2373 %COMMAND = ();
2374
2375 warn "removing ext commands";
2376 %EXTCMD = ();
2377
2378 warn "unloading/nuking all extensions";
2379 for my $pkg (@EXTS) {
2151 warn "unloading <$_>"; 2380 warn "... unloading $pkg";
2152 unload_extension $_; 2381
2382 if (my $cb = $pkg->can ("unload")) {
2383 eval {
2384 $cb->($pkg);
2385 1
2386 } or warn "$pkg unloaded, but with errors: $@";
2153 } 2387 }
2154 2388
2389 warn "... nuking $pkg";
2390 Symbol::delete_package $pkg;
2391 }
2392
2155 # unload all modules loaded from $LIBDIR 2393 warn "unloading all perl modules loaded from $LIBDIR";
2156 while (my ($k, $v) = each %INC) { 2394 while (my ($k, $v) = each %INC) {
2157 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 2395 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
2158 2396
2159 warn "removing <$k>"; 2397 warn "... unloading $k";
2160 delete $INC{$k}; 2398 delete $INC{$k};
2161 2399
2162 $k =~ s/\.pm$//; 2400 $k =~ s/\.pm$//;
2163 $k =~ s/\//::/g; 2401 $k =~ s/\//::/g;
2164 2402
2167 } 2405 }
2168 2406
2169 Symbol::delete_package $k; 2407 Symbol::delete_package $k;
2170 } 2408 }
2171 2409
2172 # sync database to disk
2173 cf::db_sync;
2174 IO::AIO::flush;
2175
2176 # get rid of safe::, as good as possible 2410 warn "getting rid of safe::, as good as possible";
2177 Symbol::delete_package "safe::$_" 2411 Symbol::delete_package "safe::$_"
2178 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 2412 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
2179 2413
2180 # remove register_script_function callbacks
2181 # TODO
2182
2183 # unload cf.pm "a bit" 2414 warn "unloading cf.pm \"a bit\"";
2184 delete $INC{"cf.pm"}; 2415 delete $INC{"cf.pm"};
2185 2416
2186 # don't, removes xs symbols, too, 2417 # don't, removes xs symbols, too,
2187 # and global variables created in xs 2418 # and global variables created in xs
2188 #Symbol::delete_package __PACKAGE__; 2419 #Symbol::delete_package __PACKAGE__;
2189 2420
2190 # reload cf.pm 2421 warn "unload completed, starting to reload now";
2422
2191 warn "reloading cf.pm"; 2423 warn "reloading cf.pm";
2192 require cf; 2424 require cf;
2193 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 2425 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2194 2426
2195 # load config and database again 2427 warn "loading config and database again";
2196 cf::cfg_load; 2428 cf::cfg_load;
2197 cf::db_load; 2429 cf::db_load;
2198 2430
2199 # load extensions
2200 warn "load extensions"; 2431 warn "loading extensions";
2201 cf::load_extensions; 2432 cf::load_extensions;
2202 2433
2203 # reattach attachments to objects 2434 warn "reattaching attachments to objects/players";
2204 warn "reattach";
2205 _global_reattach; 2435 _global_reattach;
2436 warn "reattaching attachments to maps";
2206 reattach $_ for values %MAP; 2437 reattach $_ for values %MAP;
2438
2439 warn "restarting server ticker";
2440
2441 $TICK_WATCHER->start;
2207 }; 2442 };
2208 2443
2209 if ($@) { 2444 if ($@) {
2210 warn $@; 2445 warn $@;
2211 warn "error while reloading, exiting."; 2446 warn "error while reloading, exiting.";
2212 exit 1; 2447 exit 1;
2213 } 2448 }
2214 2449
2215 warn "reloaded successfully"; 2450 warn "reloaded";
2216}; 2451};
2217 2452
2218############################################################################# 2453our $RELOAD_WATCHER; # used only during reload
2219
2220unless ($LINK_MAP) {
2221 $LINK_MAP = cf::map::new;
2222
2223 $LINK_MAP->width (41);
2224 $LINK_MAP->height (41);
2225 $LINK_MAP->alloc;
2226 $LINK_MAP->path ("{link}");
2227 $LINK_MAP->{path} = bless { path => "{link}" }, "cf::path";
2228 $LINK_MAP->in_memory (MAP_IN_MEMORY);
2229
2230 # dirty hack because... archetypes are not yet loaded
2231 Event->timer (
2232 after => 10,
2233 cb => sub {
2234 $_[0]->w->cancel;
2235
2236 # provide some exits "home"
2237 my $exit = cf::object::new "exit";
2238
2239 $exit->slaying ($EMERGENCY_POSITION->[0]);
2240 $exit->stats->hp ($EMERGENCY_POSITION->[1]);
2241 $exit->stats->sp ($EMERGENCY_POSITION->[2]);
2242
2243 $LINK_MAP->insert ($exit->clone, 19, 19);
2244 $LINK_MAP->insert ($exit->clone, 19, 20);
2245 $LINK_MAP->insert ($exit->clone, 19, 21);
2246 $LINK_MAP->insert ($exit->clone, 20, 19);
2247 $LINK_MAP->insert ($exit->clone, 20, 21);
2248 $LINK_MAP->insert ($exit->clone, 21, 19);
2249 $LINK_MAP->insert ($exit->clone, 21, 20);
2250 $LINK_MAP->insert ($exit->clone, 21, 21);
2251
2252 $exit->destroy;
2253 });
2254
2255 $LINK_MAP->{deny_save} = 1;
2256 $LINK_MAP->{deny_reset} = 1;
2257
2258 $cf::MAP{$LINK_MAP->path} = $LINK_MAP;
2259}
2260
2261register "<global>", __PACKAGE__;
2262 2454
2263register_command "reload" => sub { 2455register_command "reload" => sub {
2264 my ($who, $arg) = @_; 2456 my ($who, $arg) = @_;
2265 2457
2266 if ($who->flag (FLAG_WIZ)) { 2458 if ($who->flag (FLAG_WIZ)) {
2267 $who->message ("start of reload."); 2459 $who->message ("reloading server.");
2460
2461 # doing reload synchronously and two reloads happen back-to-back,
2462 # coro crashes during coro_state_free->destroy here.
2463
2464 $RELOAD_WATCHER ||= Event->timer (
2465 reentrant => 0,
2466 after => 0,
2467 data => WF_AUTOCANCEL,
2468 cb => sub {
2268 reload; 2469 reload;
2269 $who->message ("end of reload."); 2470 undef $RELOAD_WATCHER;
2471 },
2472 );
2270 } 2473 }
2271}; 2474};
2272 2475
2273unshift @INC, $LIBDIR; 2476unshift @INC, $LIBDIR;
2477
2478my $bug_warning = 0;
2274 2479
2275$TICK_WATCHER = Event->timer ( 2480$TICK_WATCHER = Event->timer (
2276 reentrant => 0, 2481 reentrant => 0,
2482 parked => 1,
2277 prio => 0, 2483 prio => -1,
2278 at => $NEXT_TICK || $TICK, 2484 at => $NEXT_TICK || $TICK,
2279 data => WF_AUTOCANCEL, 2485 data => WF_AUTOCANCEL,
2280 cb => sub { 2486 cb => sub {
2487 if ($Coro::current != $Coro::main) {
2488 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
2489 unless ++$bug_warning > 10;
2490 return;
2491 }
2492
2493 $NOW = Event::time;
2494
2281 cf::server_tick; # one server iteration 2495 cf::server_tick; # one server iteration
2282 $RUNTIME += $TICK; 2496 $RUNTIME += $TICK;
2283 $NEXT_TICK += $TICK; 2497 $NEXT_TICK += $TICK;
2498
2499 $WAIT_FOR_TICK->broadcast;
2500 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited;
2501
2502 my $AFTER = Event::time;
2503 warn $AFTER - $NOW;#d#
2284 2504
2285 # if we are delayed by four ticks or more, skip them all 2505 # if we are delayed by four ticks or more, skip them all
2286 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; 2506 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4;
2287 2507
2288 $TICK_WATCHER->at ($NEXT_TICK); 2508 $TICK_WATCHER->at ($NEXT_TICK);
2290 }, 2510 },
2291); 2511);
2292 2512
2293IO::AIO::max_poll_time $TICK * 0.2; 2513IO::AIO::max_poll_time $TICK * 0.2;
2294 2514
2295Event->io ( 2515undef $Coro::AIO::WATCHER;
2516$AIO_POLL_WATCHER = Event->io (
2517 reentrant => 0,
2296 fd => IO::AIO::poll_fileno, 2518 fd => IO::AIO::poll_fileno,
2297 poll => 'r', 2519 poll => 'r',
2298 prio => 5, 2520 prio => 6,
2299 data => WF_AUTOCANCEL, 2521 data => WF_AUTOCANCEL,
2300 cb => \&IO::AIO::poll_cb, 2522 cb => \&IO::AIO::poll_cb,
2301); 2523);
2302 2524
2303Event->timer ( 2525$WRITE_RUNTIME_WATCHER = Event->timer (
2526 reentrant => 0,
2304 data => WF_AUTOCANCEL, 2527 data => WF_AUTOCANCEL,
2305 after => 0, 2528 after => 1,
2306 interval => 10, 2529 interval => 10,
2307 cb => sub { 2530 prio => 6, # keep it lowest so it acts like a watchdog
2308 (Coro::unblock_sub { 2531 cb => Coro::unblock_sub {
2309 write_runtime 2532 write_runtime
2310 or warn "ERROR: unable to write runtime file: $!"; 2533 or warn "ERROR: unable to write runtime file: $!";
2311 })->();
2312 }, 2534 },
2313); 2535);
2314 2536
2315END { cf::emergency_save } 2537END { cf::emergency_save }
2316 2538

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines