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.115 by root, Mon Jan 1 16:50:10 2007 UTC vs.
Revision 1.123 by root, Tue Jan 2 19:18:33 2007 UTC

… …
179=cut 179=cut
180 180
181sub to_json($) { 181sub to_json($) {
182 $JSON::Syck::ImplicitUnicode = 0; # work around JSON::Syck bugs 182 $JSON::Syck::ImplicitUnicode = 0; # work around JSON::Syck bugs
183 JSON::Syck::Dump $_[0] 183 JSON::Syck::Dump $_[0]
184}
185
186=item my $guard = cf::guard { BLOCK }
187
188Run the given callback when the guard object gets destroyed (useful for
189coroutine cancellations).
190
191You can call C<< ->cancel >> on the guard object to stop the block from
192being executed.
193
194=cut
195
196sub guard(&) {
197 bless \(my $cb = $_[0]), cf::guard::;
198}
199
200sub cf::guard::cancel {
201 ${$_[0]} = sub { };
202}
203
204sub cf::guard::DESTROY {
205 ${$_[0]}->();
206}
207
208=item cf::lock_wait $string
209
210Wait until the given lock is available. See cf::lock_acquire.
211
212=item my $lock = cf::lock_acquire $string
213
214Wait until the given lock is available and then acquires it and returns
215a guard object. If the guard object gets destroyed (goes out of scope,
216for example when the coroutine gets canceled), the lock is automatically
217returned.
218
219Lock names should begin with a unique identifier (for example, find_map
220uses map_find and load_map uses map_load).
221
222=cut
223
224our %LOCK;
225
226sub lock_wait($) {
227 my ($key) = @_;
228
229 # wait for lock, if any
230 while ($LOCK{$key}) {
231 push @{ $LOCK{$key} }, $Coro::current;
232 Coro::schedule;
233 }
234}
235
236sub lock_acquire($) {
237 my ($key) = @_;
238
239 # wait, to be sure we are not locked
240 lock_wait $key;
241
242 $LOCK{$key} = [];
243
244 cf::guard {
245 # wake up all waiters, to be on the safe side
246 $_->ready for @{ delete $LOCK{$key} };
247 }
184} 248}
185 249
186=item cf::sync_job { BLOCK } 250=item cf::sync_job { BLOCK }
187 251
188The design of crossfire+ requires that the main coro ($Coro::main) is 252The design of crossfire+ requires that the main coro ($Coro::main) is
… …
817 (aio_load "$filename.pst", $av) >= 0 881 (aio_load "$filename.pst", $av) >= 0
818 or return; 882 or return;
819 $av = eval { (Storable::thaw $av)->{objs} }; 883 $av = eval { (Storable::thaw $av)->{objs} };
820 } 884 }
821 885
886 warn sprintf "loading %s (%d)\n",
887 $filename, length $data, scalar @{$av || []};#d#
822 return ($data, $av); 888 return ($data, $av);
823} 889}
824 890
825############################################################################# 891#############################################################################
826# command handling &c 892# command handling &c
… …
1087# and all this just because we cannot iterate over 1153# and all this just because we cannot iterate over
1088# all maps in C++... 1154# all maps in C++...
1089sub change_all_map_light { 1155sub change_all_map_light {
1090 my ($change) = @_; 1156 my ($change) = @_;
1091 1157
1092 $_->change_map_light ($change) for values %cf::MAP; 1158 $_->change_map_light ($change)
1159 for grep $_->outdoor, values %cf::MAP;
1093} 1160}
1094 1161
1095sub try_load_header($) { 1162sub try_load_header($) {
1096 my ($path) = @_; 1163 my ($path) = @_;
1097 1164
… …
1116 #warn "find_map<$path,$origin>\n";#d# 1183 #warn "find_map<$path,$origin>\n";#d#
1117 1184
1118 $path = new cf::path $path, $origin && $origin->path; 1185 $path = new cf::path $path, $origin && $origin->path;
1119 my $key = $path->as_string; 1186 my $key = $path->as_string;
1120 1187
1188 cf::lock_wait "map_find:$key";
1189
1121 $cf::MAP{$key} || do { 1190 $cf::MAP{$key} || do {
1191 my $guard = cf::lock_acquire "map_find:$key";
1192
1122 # do it the slow way 1193 # do it the slow way
1123 my $map = try_load_header $path->save_path; 1194 my $map = try_load_header $path->save_path;
1124 1195
1125 if ($map) { 1196 if ($map) {
1126 # safety 1197 # safety
… …
1143 $map->per_player (0) if $path->{user_rel}; 1214 $map->per_player (0) if $path->{user_rel};
1144 } 1215 }
1145 1216
1146 $map->path ($key); 1217 $map->path ($key);
1147 $map->{path} = $path; 1218 $map->{path} = $path;
1219 $map->{last_save} = $cf::RUNTIME;
1148 $map->last_access ($cf::RUNTIME); 1220 $map->last_access ($cf::RUNTIME);
1149 1221
1150 if ($map->should_reset) { 1222 if ($map->should_reset) {
1151 $map->reset; 1223 $map->reset;
1224 undef $guard;
1152 $map = find_map $path; 1225 $map = find_map $path;
1153 } 1226 }
1154 1227
1155 $cf::MAP{$key} = $map 1228 $cf::MAP{$key} = $map
1156 } 1229 }
1157} 1230}
1158 1231
1159sub load { 1232sub load {
1160 my ($self) = @_; 1233 my ($self) = @_;
1161 1234
1235 my $path = $self->{path};
1236 my $guard = cf::lock_acquire "map_load:" . $path->as_string;
1237
1162 return if $self->in_memory != cf::MAP_SWAPPED; 1238 return if $self->in_memory != cf::MAP_SWAPPED;
1163 1239
1164 $self->in_memory (cf::MAP_LOADING); 1240 $self->in_memory (cf::MAP_LOADING);
1165
1166 my $path = $self->{path};
1167 1241
1168 $self->alloc; 1242 $self->alloc;
1169 $self->load_objects ($self->{load_path}, 1) 1243 $self->load_objects ($self->{load_path}, 1)
1170 or return; 1244 or return;
1171 1245
… …
1213} 1287}
1214 1288
1215sub save { 1289sub save {
1216 my ($self) = @_; 1290 my ($self) = @_;
1217 1291
1292 $self->{last_save} = $cf::RUNTIME;
1293
1294 return unless $self->dirty;
1295
1218 my $save = $self->{path}->save_path; utf8::encode $save; 1296 my $save = $self->{path}->save_path; utf8::encode $save;
1219 my $uniq = $self->{path}->uniq_path; utf8::encode $uniq; 1297 my $uniq = $self->{path}->uniq_path; utf8::encode $uniq;
1220
1221 $self->{last_save} = $cf::RUNTIME;
1222
1223 return unless $self->dirty;
1224 1298
1225 $self->{load_path} = $save; 1299 $self->{load_path} = $save;
1226 1300
1227 return if $self->{deny_save}; 1301 return if $self->{deny_save};
1228 1302
… …
1404=cut 1478=cut
1405 1479
1406sub cf::object::player::enter_link { 1480sub cf::object::player::enter_link {
1407 my ($self) = @_; 1481 my ($self) = @_;
1408 1482
1483 $self->deactivate_recursive;
1484
1409 return if $self->map == $LINK_MAP; 1485 return if $self->map == $LINK_MAP;
1410 1486
1411 $self->{_link_pos} = [$self->map->{path}, $self->x, $self->y] 1487 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
1412 if $self->map; 1488 if $self->map;
1413 1489
1414 $self->enter_map ($LINK_MAP, 20, 20); 1490 $self->enter_map ($LINK_MAP, 20, 20);
1415 $self->deactivate_recursive;
1416} 1491}
1417 1492
1418sub cf::object::player::leave_link { 1493sub cf::object::player::leave_link {
1419 my ($self, $map, $x, $y) = @_; 1494 my ($self, $map, $x, $y) = @_;
1420 1495
… …
1443 1518
1444 $self->activate_recursive; 1519 $self->activate_recursive;
1445 $self->enter_map ($map, $x, $y); 1520 $self->enter_map ($map, $x, $y);
1446} 1521}
1447 1522
1523cf::player->attach (
1524 on_logout => sub {
1525 my ($pl) = @_;
1526
1527 # abort map switching before logout
1528 if ($pl->ob->{_link_pos}) {
1529 cf::sync_job {
1530 $pl->ob->leave_link
1531 };
1532 }
1533 },
1534 on_login => sub {
1535 my ($pl) = @_;
1536
1537 # try to abort aborted map switching on player login :)
1538 # should happen only on crashes
1539 if ($pl->ob->{_link_pos}) {
1540 $pl->ob->enter_link;
1541 Coro::async {
1542 # we need this sleep as the login has a concurrent enter_exit running
1543 # and this sleep increases chances of the player not ending up in scorn
1544 Coro::Timer::sleep 1;
1545 $pl->ob->leave_link;
1546 };
1547 }
1548 },
1549);
1550
1448=item $player_object->goto_map ($map, $x, $y) 1551=item $player_object->goto_map ($path, $x, $y)
1449 1552
1450=cut 1553=cut
1451 1554
1452sub cf::object::player::goto_map { 1555sub cf::object::player::goto_map {
1453 my ($self, $path, $x, $y) = @_; 1556 my ($self, $path, $x, $y) = @_;
… …
1458 $path = new cf::path $path; 1561 $path = new cf::path $path;
1459 1562
1460 my $map = cf::map::find_map $path->as_string; 1563 my $map = cf::map::find_map $path->as_string;
1461 $map = $map->customise_for ($self) if $map; 1564 $map = $map->customise_for ($self) if $map;
1462 1565
1463 warn "entering ", $map->path, " at ($x, $y)\n" 1566# warn "entering ", $map->path, " at ($x, $y)\n"
1464 if $map; 1567# if $map;
1465 1568
1466 $map or $self->message ("The exit is closed", cf::NDI_UNIQUE | cf::NDI_RED); 1569 $map or $self->message ("The exit is closed", cf::NDI_UNIQUE | cf::NDI_RED);
1467 1570
1468 $self->leave_link ($map, $x, $y); 1571 $self->leave_link ($map, $x, $y);
1469 })->prio (1); 1572 })->prio (1);
… …
1812 1915
1813{ 1916{
1814 my $path = cf::localdir . "/database.pst"; 1917 my $path = cf::localdir . "/database.pst";
1815 1918
1816 sub db_load() { 1919 sub db_load() {
1817 warn "loading database $path\n";#d# remove later
1818 $DB = stat $path ? Storable::retrieve $path : { }; 1920 $DB = stat $path ? Storable::retrieve $path : { };
1819 } 1921 }
1820 1922
1821 my $pid; 1923 my $pid;
1822 1924
1823 sub db_save() { 1925 sub db_save() {
1824 warn "saving database $path\n";#d# remove later
1825 waitpid $pid, 0 if $pid; 1926 waitpid $pid, 0 if $pid;
1826 if (0 == ($pid = fork)) { 1927 if (0 == ($pid = fork)) {
1827 $DB->{_meta}{version} = 1; 1928 $DB->{_meta}{version} = 1;
1828 Storable::nstore $DB, "$path~"; 1929 Storable::nstore $DB, "$path~";
1829 rename "$path~", $path; 1930 rename "$path~", $path;

Diff Legend

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